rename port attribute variable to SECURITYGROUPS from SECURITYGROUP

This patch renames the port attribute variable to the plural form since
multiple security groups can be associated with a port. This patch does
not change the security groups api and also does not change the
configuration section name to be SECURITYGROUPS.
Fixes bug 1095885

Change-Id: I1a4df337b48da0ef9c94d74b04c0b86333ce2f0c

diff --git a/quantum/db/securitygroups_db.py b/quantum/db/securitygroups_db.py
index 7678699789abf98819a0182b769599c3e2ebb867..d31b40daab0bd91716936b68432e7cde2d28f82e 100644 (file)
--- a/quantum/db/securitygroups_db.py
+++ b/quantum/db/securitygroups_db.py
@@ -23,7 +23,6 @@ from sqlalchemy.orm import exc
 from sqlalchemy.orm import scoped_session
 
 from quantum.api.v2 import attributes as attr
-from quantum.common import utils
 from quantum.db import model_base
 from quantum.db import models_v2
 from quantum.extensions import securitygroup as ext_sg
@@ -408,9 +407,9 @@ class SecurityGroupDbMixin(ext_sg.SecurityGroupPluginBase):
         security_group_id = self._get_port_security_group_bindings(
             context, filters, fields)
 
-        port[ext_sg.SECURITYGROUP] = []
+        port[ext_sg.SECURITYGROUPS] = []
         for security_group_id in security_group_id:
-            port[ext_sg.SECURITYGROUP].append(
+            port[ext_sg.SECURITYGROUPS].append(
                 security_group_id['security_group_id'])
         return port
 
@@ -448,14 +447,14 @@ class SecurityGroupDbMixin(ext_sg.SecurityGroupPluginBase):
 
     def _validate_security_groups_on_port(self, context, port):
         p = port['port']
-        if not attr.is_attr_set(p.get(ext_sg.SECURITYGROUP)):
+        if not attr.is_attr_set(p.get(ext_sg.SECURITYGROUPS)):
             return
         if p.get('device_owner') and p['device_owner'].startswith('network:'):
             raise ext_sg.SecurityGroupInvalidDeviceOwner()
 
         valid_groups = self.get_security_groups(context, fields={'id': None})
         valid_groups_set = set([x['id'] for x in valid_groups])
-        req_sg_set = set(p[ext_sg.SECURITYGROUP])
+        req_sg_set = set(p[ext_sg.SECURITYGROUPS])
         invalid_sg_set = req_sg_set - valid_groups_set
         if invalid_sg_set:
             msg = ' '.join(str(x) for x in invalid_sg_set)
@@ -469,8 +468,8 @@ class SecurityGroupDbMixin(ext_sg.SecurityGroupPluginBase):
         tenant_id = self._get_tenant_id_for_create(context,
                                                    port['port'])
         default_sg = self._ensure_default_security_group(context, tenant_id)
-        if attr.is_attr_set(port['port'].get(ext_sg.SECURITYGROUP)):
-            sgids = port['port'].get(ext_sg.SECURITYGROUP)
+        if attr.is_attr_set(port['port'].get(ext_sg.SECURITYGROUPS)):
+            sgids = port['port'].get(ext_sg.SECURITYGROUPS)
         else:
             sgids = [default_sg]
-        port['port'][ext_sg.SECURITYGROUP] = sgids
+        port['port'][ext_sg.SECURITYGROUPS] = sgids

diff --git a/quantum/extensions/securitygroup.py b/quantum/extensions/securitygroup.py
index ed6a151788b38f95fe450fb4da4c6e96a09804db..424a3ca866f2c483ef35de868b3979d193d632e1 100644 (file)
--- a/quantum/extensions/securitygroup.py
+++ b/quantum/extensions/securitygroup.py
@@ -207,12 +207,12 @@ RESOURCE_ATTRIBUTE_MAP = {
 }
 
 
-SECURITYGROUP = 'security_groups'
+SECURITYGROUPS = 'security_groups'
 EXTENDED_ATTRIBUTES_2_0 = {
-    'ports': {SECURITYGROUP: {'allow_post': True,
-                              'allow_put': True,
-                              'is_visible': True,
-                              'default': attr.ATTR_NOT_SPECIFIED}}}
+    'ports': {SECURITYGROUPS: {'allow_post': True,
+                               'allow_put': True,
+                               'is_visible': True,
+                               'default': attr.ATTR_NOT_SPECIFIED}}}
 security_group_quota_opts = [
     cfg.IntOpt('quota_security_group',
                default=10,

diff --git a/quantum/plugins/linuxbridge/lb_quantum_plugin.py b/quantum/plugins/linuxbridge/lb_quantum_plugin.py
index fb7b53a7cfb06d3cf26e3ebcb22b25c353943c35..4267d9ac019347ed15bfbd9821e715f03f5ce075 100644 (file)
--- a/quantum/plugins/linuxbridge/lb_quantum_plugin.py
+++ b/quantum/plugins/linuxbridge/lb_quantum_plugin.py
@@ -453,7 +453,7 @@ class LinuxBridgePluginV2(db_base_plugin_v2.QuantumDbPluginV2,
         with session.begin(subtransactions=True):
             self._ensure_default_security_group_on_port(context, port)
             self._validate_security_groups_on_port(context, port)
-            sgids = port['port'].get(ext_sg.SECURITYGROUP)
+            sgids = port['port'].get(ext_sg.SECURITYGROUPS)
             port = super(LinuxBridgePluginV2,
                          self).create_port(context, port)
             self._process_port_create_security_group(
@@ -463,7 +463,7 @@ class LinuxBridgePluginV2(db_base_plugin_v2.QuantumDbPluginV2,
             self.notifier.security_groups_provider_updated(context)
         else:
             self.notifier.security_groups_member_updated(
-                context, port.get(ext_sg.SECURITYGROUP))
+                context, port.get(ext_sg.SECURITYGROUPS))
         return self._extend_port_dict_binding(context, port)
 
     def update_port(self, context, id, port):
@@ -473,12 +473,12 @@ class LinuxBridgePluginV2(db_base_plugin_v2.QuantumDbPluginV2,
         port_updated = False
         with session.begin(subtransactions=True):
             # delete the port binding and read it with the new rules
-            if ext_sg.SECURITYGROUP in port['port']:
+            if ext_sg.SECURITYGROUPS in port['port']:
                 self._delete_port_security_group_bindings(context, id)
                 self._process_port_create_security_group(
                     context,
                     id,
-                    port['port'][ext_sg.SECURITYGROUP])
+                    port['port'][ext_sg.SECURITYGROUPS])
                 port_updated = True
 
             port = super(LinuxBridgePluginV2, self).update_port(
@@ -490,10 +490,10 @@ class LinuxBridgePluginV2(db_base_plugin_v2.QuantumDbPluginV2,
 
         if (original_port['fixed_ips'] != port['fixed_ips'] or
             not utils.compare_elements(
-                original_port.get(ext_sg.SECURITYGROUP),
-                port.get(ext_sg.SECURITYGROUP))):
+                original_port.get(ext_sg.SECURITYGROUPS),
+                port.get(ext_sg.SECURITYGROUPS))):
             self.notifier.security_groups_member_updated(
-                context, port.get(ext_sg.SECURITYGROUP))
+                context, port.get(ext_sg.SECURITYGROUPS))
 
         if port_updated:
             self._notify_port_updated(context, port)
@@ -513,7 +513,7 @@ class LinuxBridgePluginV2(db_base_plugin_v2.QuantumDbPluginV2,
             self._delete_port_security_group_bindings(context, id)
             super(LinuxBridgePluginV2, self).delete_port(context, id)
             self.notifier.security_groups_member_updated(
-                context, port.get(ext_sg.SECURITYGROUP))
+                context, port.get(ext_sg.SECURITYGROUPS))
 
     def _notify_port_updated(self, context, port):
         binding = db.get_network_binding(context.session,

diff --git a/quantum/tests/unit/linuxbridge/test_lb_security_group.py b/quantum/tests/unit/linuxbridge/test_lb_security_group.py
index ea7c660eedb651c4d474400e6b714975749481b9..9ac5e75b95f0ab646dbea10cf5aabfc8b1f96604 100644 (file)
--- a/quantum/tests/unit/linuxbridge/test_lb_security_group.py
+++ b/quantum/tests/unit/linuxbridge/test_lb_security_group.py
@@ -88,13 +88,13 @@ class TestLinuxBridgeSecurityGroups(LinuxBridgeSecurityGroupsTestCase,
 
                     data = {'port': {'fixed_ips': port['port']['fixed_ips'],
                                      'name': port['port']['name'],
-                                     ext_sg.SECURITYGROUP:
+                                     ext_sg.SECURITYGROUPS:
                                      [security_group_id]}}
 
                     req = self.new_update_request('ports', data,
                                                   port['port']['id'])
                     res = self.deserialize('json', req.get_response(self.api))
-                    self.assertEquals(res['port'][ext_sg.SECURITYGROUP][0],
+                    self.assertEquals(res['port'][ext_sg.SECURITYGROUPS][0],
                                       security_group_id)
                     self._delete('ports', port['port']['id'])
                     self.notifier.assert_has_calls(
@@ -115,7 +115,7 @@ class TestLinuxBridgeSecurityGroupsDB(LinuxBridgeSecurityGroupsTestCase):
                     fixed_ips = port['port']['fixed_ips']
                     data = {'port': {'fixed_ips': fixed_ips,
                                      'name': port['port']['name'],
-                                     ext_sg.SECURITYGROUP:
+                                     ext_sg.SECURITYGROUPS:
                                      [security_group_id]}}
 
                     req = self.new_update_request('ports', data,
@@ -126,7 +126,7 @@ class TestLinuxBridgeSecurityGroupsDB(LinuxBridgeSecurityGroupsTestCase):
                     port_dict = lb_db.get_port_from_device(device_id)
                     self.assertEqual(port_id, port_dict['id'])
                     self.assertEqual([security_group_id],
-                                     port_dict[ext_sg.SECURITYGROUP])
+                                     port_dict[ext_sg.SECURITYGROUPS])
                     self.assertEqual([], port_dict['security_group_rules'])
                     self.assertEqual([fixed_ips[0]['ip_address']],
                                      port_dict['fixed_ips'])

diff --git a/quantum/tests/unit/test_extension_security_group.py b/quantum/tests/unit/test_extension_security_group.py
index cc925815f1cfda14579af854cffb7f8152a38967..e82961352028debe8d97d514dfac206cf74b5d56 100644 (file)
--- a/quantum/tests/unit/test_extension_security_group.py
+++ b/quantum/tests/unit/test_extension_security_group.py
@@ -166,12 +166,12 @@ class SecurityGroupTestPlugin(db_base_plugin_v2.QuantumDbPluginV2,
     def create_port(self, context, port):
         tenant_id = self._get_tenant_id_for_create(context, port['port'])
         default_sg = self._ensure_default_security_group(context, tenant_id)
-        if not port['port'].get(ext_sg.SECURITYGROUP):
-            port['port'][ext_sg.SECURITYGROUP] = [default_sg]
+        if not port['port'].get(ext_sg.SECURITYGROUPS):
+            port['port'][ext_sg.SECURITYGROUPS] = [default_sg]
         self._validate_security_groups_on_port(context, port)
         session = context.session
         with session.begin(subtransactions=True):
-            sgids = port['port'].get(ext_sg.SECURITYGROUP)
+            sgids = port['port'].get(ext_sg.SECURITYGROUPS)
             port = super(SecurityGroupTestPlugin, self).create_port(context,
                                                                     port)
             self._process_port_create_security_group(context, port['id'],
@@ -182,13 +182,12 @@ class SecurityGroupTestPlugin(db_base_plugin_v2.QuantumDbPluginV2,
     def update_port(self, context, id, port):
         session = context.session
         with session.begin(subtransactions=True):
-            if ext_sg.SECURITYGROUP in port['port']:
+            if ext_sg.SECURITYGROUPS in port['port']:
                 self._validate_security_groups_on_port(context, port)
                 # delete the port binding and read it with the new rules
                 self._delete_port_security_group_bindings(context, id)
-                self._process_port_create_security_group(context, id,
-                                                         port['port'].get(
-                                                         ext_sg.SECURITYGROUP))
+                self._process_port_create_security_group(
+                    context, id, port['port'].get(ext_sg.SECURITYGROUPS))
             port = super(SecurityGroupTestPlugin, self).update_port(
                 context, id, port)
             self._extend_port_dict_security_group(context, port)
@@ -574,13 +573,13 @@ class TestSecurityGroups(SecurityGroupDBTestCase):
 
                     data = {'port': {'fixed_ips': port['port']['fixed_ips'],
                                      'name': port['port']['name'],
-                                     ext_sg.SECURITYGROUP:
+                                     ext_sg.SECURITYGROUPS:
                                      [sg['security_group']['id']]}}
 
                     req = self.new_update_request('ports', data,
                                                   port['port']['id'])
                     res = self.deserialize('json', req.get_response(self.api))
-                    self.assertEqual(res['port'][ext_sg.SECURITYGROUP][0],
+                    self.assertEqual(res['port'][ext_sg.SECURITYGROUPS][0],
                                      sg['security_group']['id'])
 
                     # Test update port without security group
@@ -590,7 +589,7 @@ class TestSecurityGroups(SecurityGroupDBTestCase):
                     req = self.new_update_request('ports', data,
                                                   port['port']['id'])
                     res = self.deserialize('json', req.get_response(self.api))
-                    self.assertEqual(res['port'][ext_sg.SECURITYGROUP][0],
+                    self.assertEqual(res['port'][ext_sg.SECURITYGROUPS][0],
                                      sg['security_group']['id'])
 
                     self._delete('ports', port['port']['id'])
@@ -606,7 +605,7 @@ class TestSecurityGroups(SecurityGroupDBTestCase):
                                              sg2['security_group']['id']])
                         port = self.deserialize('json', res)
                         self.assertEqual(len(
-                            port['port'][ext_sg.SECURITYGROUP]), 2)
+                            port['port'][ext_sg.SECURITYGROUPS]), 2)
                         self._delete('ports', port['port']['id'])
 
     def test_update_port_remove_security_group(self):
@@ -625,7 +624,7 @@ class TestSecurityGroups(SecurityGroupDBTestCase):
                     req = self.new_update_request('ports', data,
                                                   port['port']['id'])
                     res = self.deserialize('json', req.get_response(self.api))
-                    self.assertEqual(res['port'].get(ext_sg.SECURITYGROUP),
+                    self.assertEqual(res['port'].get(ext_sg.SECURITYGROUPS),
                                      [])
                     self._delete('ports', port['port']['id'])
 
@@ -646,7 +645,7 @@ class TestSecurityGroups(SecurityGroupDBTestCase):
                                             security_groups=(
                                             [sg['security_group']['id']]))
                     port = self.deserialize('json', res)
-                    self.assertEqual(port['port'][ext_sg.SECURITYGROUP][0],
+                    self.assertEqual(port['port'][ext_sg.SECURITYGROUPS][0],
                                      sg['security_group']['id'])
                     # try to delete security group that's in use
                     res = self._delete('security-groups',