some cleanup. VSA flag status changes. returned some files

3 files changed, 12 insertions, 10 deletions

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 56a5850f6..6fc74c92a 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -902,7 +902,6 @@ class CloudController(object):
         image_name = kwargs.get('image_name')
         availability_zone = kwargs.get('placement', {}).get(
                                                 'AvailabilityZone')
-        #storage = ast.literal_eval(kwargs.get('storage', '[]'))
         storage = kwargs.get('storage', [])
         shared = kwargs.get('shared', False)
 
diff --git a/nova/api/openstack/contrib/drive_types.py b/nova/api/openstack/contrib/drive_types.py
index 590eaaec0..6454fd81f 100644
--- a/nova/api/openstack/contrib/drive_types.py
+++ b/nova/api/openstack/contrib/drive_types.py
@@ -1,6 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright (c) 2011 Zadara Storage Inc.
+# Copyright (c) 2011 OpenStack LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -118,7 +119,6 @@ class DriveTypeController(object):
             drive_types.delete(context, id)
         except exception.NotFound:
             return faults.Fault(exc.HTTPNotFound())
-        # return exc.HTTPAccepted()
 
 
 class Drive_types(extensions.ExtensionDescriptor):
diff --git a/nova/api/openstack/contrib/virtual_storage_arrays.py b/nova/api/openstack/contrib/virtual_storage_arrays.py
index 6139b494e..68a00fd7d 100644
--- a/nova/api/openstack/contrib/virtual_storage_arrays.py
+++ b/nova/api/openstack/contrib/virtual_storage_arrays.py
@@ -1,6 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright (c) 2011 Zadara Storage Inc.
+# Copyright (c) 2011 OpenStack LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -153,7 +154,6 @@ class VsaController(object):
             self.vsa_api.delete(context, vsa_id=id)
         except exception.NotFound:
             return faults.Fault(exc.HTTPNotFound())
-        # return exc.HTTPAccepted()
 
 
 class VsaVolumeDriveController(volumes.VolumeController):
@@ -193,6 +193,7 @@ class VsaVolumeDriveController(volumes.VolumeController):
 
         d = translation(context, vol)
         d['vsaId'] = vol[self.direction]
+        d['name'] = vol['name']
         return d
 
     def _check_volume_ownership(self, context, vsa_id, id):
@@ -265,15 +266,17 @@ class VsaVolumeDriveController(volumes.VolumeController):
             return faults.Fault(exc.HTTPBadRequest())
 
         vol = body[self.object]
-        updatable_fields = ['display_name',
-                            'display_description',
-                            'status',
-                            'provider_location',
-                            'provider_auth']
+        updatable_fields = [{'displayName': 'display_name'},
+                            {'displayDescription': 'display_description'},
+                            {'status': 'status'},
+                            {'providerLocation': 'provider_location'},
+                            {'providerAuth': 'provider_auth'}]
         changes = {}
         for field in updatable_fields:
-            if field in vol:
-                changes[field] = vol[field]
+            key = field.keys()[0]
+            val = field[key]
+            if key in vol:
+                changes[val] = vol[key]
 
         obj = self.object
         LOG.audit(_("Update %(obj)s with id: %(id)s, changes: %(changes)s"),