Merge "Force security_group_id uuid validation of sg rules" into stable/yoga

Author: Zuul

neutron/extensions/securitygroup.py

@@ -245,7 +245,9 @@ def _validate_name_not_default(data, max_len=db_const.NAME_FIELD_SIZE):
                'primary_key': True},
         'security_group_id': {'allow_post': True, 'allow_put': False,
                               'is_visible': True, 'required_by_policy': True,
-                              'is_sort_key': True, 'is_filter': True},
+                              'is_sort_key': True, 'is_filter': True,
+                              'validate': {
+                                  'type:string': db_const.UUID_FIELD_SIZE}},
         'remote_group_id': {'allow_post': True, 'allow_put': False,
                             'default': None, 'is_visible': True,
                             'is_sort_key': True, 'is_filter': True},

neutron/tests/unit/extensions/test_securitygroup.py

@@ -2087,6 +2087,15 @@ def test_create_security_group_rule_with_invalid_tcp_or_udp_protocol(self):
         self.deserialize(self.fmt, res)
         self.assertEqual(webob.exc.HTTPBadRequest.code, res.status_int)
 
+    def test_create_security_group_rule_with_non_uuid_security_group_id(self):
+        security_group_id = 0
+        rule = self._build_security_group_rule(
+            security_group_id, 'ingress',
+            const.PROTO_NAME_TCP, '22', '22')
+        res = self._create_security_group_rule(self.fmt, rule)
+        self.deserialize(self.fmt, res)
+        self.assertEqual(webob.exc.HTTPBadRequest.code, res.status_int)
+
     def test_create_port_with_non_uuid(self):
         with self.network() as n:
             with self.subnet(n):