From 9d5f9e12e2bb9e87804459e943a4e3484d5c1f1a Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Thu, 24 Jun 2010 04:11:57 +0100 Subject: fix case for volume attributes --- nova/endpoint/cloud.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'nova/endpoint') 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): -- cgit