Fixing issue in view builders concerning attachment identifiers

diff --git a/quantum/api/views/attachments.py b/quantum/api/views/attachments.py
index 955495889652b2cfc2d2dd3a1a270b9a0dcfed07..31351a1e0f78c6503fd878729a87bee88d181bc2 100644 (file)
--- a/quantum/api/views/attachments.py
+++ b/quantum/api/views/attachments.py
@@ -31,7 +31,7 @@ class ViewBuilder(object):
 
     def build(self, attachment_data):
         """Generic method used to generate an attachment entity."""
-        if attachment_data['attachment-id']:
-            return dict(attachment=dict(id=attachment_data['attachment-id']))
+        if attachment_data['attachment']:
+            return dict(attachment=dict(id=attachment_data['attachment']))
         else:
             return dict(attachment={})

diff --git a/quantum/api/views/networks.py b/quantum/api/views/networks.py
index 5efb425eafdeda81bf5e1c93f0f05eb60e0b34c8..4b2e77df282cb9fd4f8c3dd79e1ccf4f65675b2a 100644 (file)
--- a/quantum/api/views/networks.py
+++ b/quantum/api/views/networks.py
@@ -54,6 +54,6 @@ class ViewBuilder(object):
         """Return details about a specific logical port."""
         port_dict = dict(id=port_data['port-id'],
                          state=port_data['port-state'])
-        if port_data['attachment-id']:
-            port_dict['attachment'] = dict(id=port_data['attachment-id'])
+        if port_data['attachment']:
+            port_dict['attachment'] = dict(id=port_data['attachment'])
         return port_dict

diff --git a/quantum/api/views/ports.py b/quantum/api/views/ports.py
index f7b75e41aea44dd818f567f55893acfe14de7e06..164726eb3c6367d918a79f491ad55c445ae30f3f 100644 (file)
--- a/quantum/api/views/ports.py
+++ b/quantum/api/views/ports.py
@@ -34,6 +34,6 @@ class ViewBuilder(object):
         port = dict(port=dict(id=port_data['port-id']))
         if port_details:
             port['port']['state'] = port_data['port-state']
-        if att_details and port_data['attachment-id']:
-            port['port']['attachment'] = dict(id=port_data['attachment-id'])
+        if att_details and port_data['attachment']:
+            port['port']['attachment'] = dict(id=port_data['attachment'])
         return port

diff --git a/quantum/plugins/SamplePlugin.py b/quantum/plugins/SamplePlugin.py
index 1924c115913e5ddd66af9449ec7274f3e0b164b6..27dba1f3a22e4b3c305e656b83c67f482a56d60d 100644 (file)
--- a/quantum/plugins/SamplePlugin.py
+++ b/quantum/plugins/SamplePlugin.py
@@ -352,7 +352,7 @@ class FakePlugin(object):
         LOG.debug("FakePlugin.get_port_details() called")
         port = self._get_port(tenant_id, net_id, port_id)
         return {'port-id': str(port.uuid),
-                'attachment-id': port.interface_id,
+                'attachment': port.interface_id,
                 'port-state': port.state}
 
     def create_port(self, tenant_id, net_id, port_state=None):