diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-06-24 04:11:57 +0100 |
|---|---|---|
| committer | andy <github@anarkystic.com> | 2010-06-24 04:11:57 +0100 |
| commit | 9d5f9e12e2bb9e87804459e943a4e3484d5c1f1a (patch) | |
| tree | 1ba30317dc75498fc83aa66a8a001698f9641966 | |
| parent | 090186c12f3b6985fea6e01e23c3366bf130e5ea (diff) | |
| download | nova-9d5f9e12e2bb9e87804459e943a4e3484d5c1f1a.tar.gz nova-9d5f9e12e2bb9e87804459e943a4e3484d5c1f1a.tar.xz nova-9d5f9e12e2bb9e87804459e943a4e3484d5c1f1a.zip | |
fix case for volume attributes
| -rw-r--r-- | nova/endpoint/cloud.py | 12 | ||||
| -rw-r--r-- | nova/volume/storage.py | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py index 434fc5a5f..5c30d6002 100644 --- a/nova/endpoint/cloud.py +++ b/nova/endpoint/cloud.py @@ -263,8 +263,8 @@ class CloudController(object): volume.get('instance_id', ''), volume.get('mountpoint', '')) if volume['status'] == 'attached': - v['attachmentSet'] = [{'attachTime': volume['attachTime'], - 'deleteOnTermination': volume['deleteOnTermination'], + v['attachmentSet'] = [{'attachTime': volume['attach_time'], + 'deleteOnTermination': volume['delete_on_termination'], 'device' : volume['mountpoint'], 'instanceId' : volume['instance_id'], 'status' : 'attached', @@ -329,11 +329,11 @@ class CloudController(object): "args" : {"volume_id": volume_id, "instance_id" : instance_id, "mountpoint" : device}}) - return defer.succeed({'attachTime' : volume['attachTime'], + return defer.succeed({'attachTime' : volume['attach_time'], 'device' : volume['mountpoint'], 'instanceId' : instance_id, 'requestId' : context.request_id, - 'status' : volume['attachStatus'], + 'status' : volume['attach_status'], 'volumeId' : volume_id}) @@ -356,11 +356,11 @@ class CloudController(object): # If the instance doesn't exist anymore, # then we need to call detach blind volume.finish_detach() - return defer.succeed({'attachTime' : volume['attachTime'], + return defer.succeed({'attachTime' : volume['attach_time'], 'device' : volume['mountpoint'], 'instanceId' : instance_id, 'requestId' : context.request_id, - 'status' : volume['attachStatus'], + 'status' : volume['attach_status'], 'volumeId' : volume_id}) def _convert_to_set(self, lst, label): diff --git a/nova/volume/storage.py b/nova/volume/storage.py index 7da5afe20..85ba85138 100644 --- a/nova/volume/storage.py +++ b/nova/volume/storage.py @@ -186,26 +186,26 @@ class Volume(datastore.RedisModel): self['instance_id'] = instance_id self['mountpoint'] = mountpoint self['status'] = "in-use" - self['attachStatus'] = "attaching" - self['attachTime'] = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime()) - self['deleteOnTermination'] = 'False' + self['attach_status'] = "attaching" + self['attach_time'] = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime()) + self['delete_on_termination'] = 'False' self.save() def finish_attach(self): """ """ - self['attachStatus'] = "attached" + self['attach_status'] = "attached" self.save() def start_detach(self): """ """ - self['attachStatus'] = "detaching" + self['attach_status'] = "detaching" self.save() def finish_detach(self): self['instance_id'] = None self['mountpoint'] = None self['status'] = "available" - self['attachStatus'] = "detached" + self['attach_status'] = "detached" self.save() def destroy(self): |