Commit 11ed201d authored by Christos Stavrakakis's avatar Christos Stavrakakis
Browse files

cyclades: Rename 'snf-volume-%d' to 'snf-vol-%d'

parent d3283dbd
......@@ -1041,7 +1041,7 @@ class Volume(models.Model):
@property
def backend_volume_uuid(self):
return u"%svolume-%d" % (settings.BACKEND_PREFIX_ID, self.id)
return u"%svol-%d" % (settings.BACKEND_PREFIX_ID, self.id)
@property
def backend_disk_uuid(self):
......
......@@ -94,7 +94,7 @@ def id_from_disk_name(name):
"""
if not str(name).startswith(settings.BACKEND_PREFIX_ID):
raise ValueError("Invalid Disk name: %s" % name)
ns = str(name).replace(settings.BACKEND_PREFIX_ID + 'volume-', "", 1)
ns = str(name).replace(settings.BACKEND_PREFIX_ID + 'vol-', "", 1)
if not ns.isdigit():
raise ValueError("Invalid Disk name: %s" % name)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment