Volumes API now uses underscores for attrs

* Fixes bug 943053

Change-Id: I7066e963b4377a4a1f8a3c259e6273e6a0ca073f

2 files changed, 27 insertions, 27 deletions

diff --git a/nova/api/openstack/volume/snapshots.py b/nova/api/openstack/volume/snapshots.py
index abfdd602e..317608a5e 100644
--- a/nova/api/openstack/volume/snapshots.py
+++ b/nova/api/openstack/volume/snapshots.py
@@ -48,13 +48,13 @@ def _translate_snapshot_summary_view(context, vol):
 
     # TODO(bcwaldon): remove str cast once we use uuids
     d['id'] = str(vol['id'])
-    d['volumeId'] = str(vol['volume_id'])
+    d['volume_id'] = str(vol['volume_id'])
     d['status'] = vol['status']
     # NOTE(gagupta): We map volume_size as the snapshot size
     d['size'] = vol['volume_size']
-    d['createdAt'] = vol['created_at']
-    d['displayName'] = vol['display_name']
-    d['displayDescription'] = vol['display_description']
+    d['created_at'] = vol['created_at']
+    d['display_name'] = vol['display_name']
+    d['display_description'] = vol['display_description']
     return d
 
 
@@ -62,10 +62,10 @@ def make_snapshot(elem):
     elem.set('id')
     elem.set('status')
     elem.set('size')
-    elem.set('createdAt')
-    elem.set('displayName')
-    elem.set('displayDescription')
-    elem.set('volumeId')
+    elem.set('created_at')
+    elem.set('display_name')
+    elem.set('display_description')
+    elem.set('volume_id')
 
 
 class SnapshotTemplate(xmlutil.TemplateBuilder):
diff --git a/nova/api/openstack/volume/volumes.py b/nova/api/openstack/volume/volumes.py
index edad3286a..7789bc1aa 100644
--- a/nova/api/openstack/volume/volumes.py
+++ b/nova/api/openstack/volume/volumes.py
@@ -54,9 +54,9 @@ def _translate_attachment_summary_view(_context, vol):
     # NOTE(justinsb): We use the volume id as the id of the attachment object
     d['id'] = volume_id
 
-    d['volumeId'] = volume_id
+    d['volume_id'] = volume_id
     if vol.get('instance'):
-        d['serverId'] = vol['instance']['uuid']
+        d['server_id'] = vol['instance']['uuid']
     if vol.get('mountpoint'):
         d['device'] = vol['mountpoint']
 
@@ -81,27 +81,27 @@ def _translate_volume_summary_view(context, vol):
     d['id'] = str(vol['id'])
     d['status'] = vol['status']
     d['size'] = vol['size']
-    d['availabilityZone'] = vol['availability_zone']
-    d['createdAt'] = vol['created_at']
+    d['availability_zone'] = vol['availability_zone']
+    d['created_at'] = vol['created_at']
 
     d['attachments'] = []
     if vol['attach_status'] == 'attached':
         attachment = _translate_attachment_detail_view(context, vol)
         d['attachments'].append(attachment)
 
-    d['displayName'] = vol['display_name']
-    d['displayDescription'] = vol['display_description']
+    d['display_name'] = vol['display_name']
+    d['display_description'] = vol['display_description']
 
     if vol['volume_type_id'] and vol.get('volume_type'):
-        d['volumeType'] = vol['volume_type']['name']
+        d['volume_type'] = vol['volume_type']['name']
     else:
         # TODO(bcwaldon): remove str cast once we use uuids
-        d['volumeType'] = str(vol['volume_type_id'])
+        d['volume_type'] = str(vol['volume_type_id'])
 
-    d['snapshotId'] = vol['snapshot_id']
+    d['snapshot_id'] = vol['snapshot_id']
     # TODO(bcwaldon): remove str cast once we use uuids
-    if d['snapshotId'] is not None:
-        d['snapshotId'] = str(d['snapshotId'])
+    if d['snapshot_id'] is not None:
+        d['snapshot_id'] = str(d['snapshot_id'])
 
     LOG.audit(_("vol=%s"), vol, context=context)
 
@@ -118,8 +118,8 @@ def _translate_volume_summary_view(context, vol):
 
 def make_attachment(elem):
     elem.set('id')
-    elem.set('serverId')
-    elem.set('volumeId')
+    elem.set('server_id')
+    elem.set('volume_id')
     elem.set('device')
 
 
@@ -127,12 +127,12 @@ def make_volume(elem):
     elem.set('id')
     elem.set('status')
     elem.set('size')
-    elem.set('availabilityZone')
-    elem.set('createdAt')
-    elem.set('displayName')
-    elem.set('displayDescription')
-    elem.set('volumeType')
-    elem.set('snapshotId')
+    elem.set('availability_zone')
+    elem.set('created_at')
+    elem.set('display_name')
+    elem.set('display_description')
+    elem.set('volume_type')
+    elem.set('snapshot_id')
 
     attachments = xmlutil.SubTemplateElement(elem, 'attachments')
     attachment = xmlutil.SubTemplateElement(attachments, 'attachment',