Merge "Fix 500 error on invalid security-group-rule creation for NVP"

diff --cc neutron/common/constants.py
Simple merge

diff --cc neutron/plugins/nicira/NeutronPlugin.py
Simple merge

diff --cc neutron/tests/unit/nicira/test_nicira_plugin.py
index 99500c24110e1af49f4cf41c7010937c63318a5f,493def9d7d55a4cb060f4d0a7eb28b37110fcfc1..f2dc40a6edd3d8557ae34de6520044dc848f0f7d
--- 1/neutron/tests/unit/nicira/test_nicira_plugin.py
--- 2/neutron/tests/unit/nicira/test_nicira_plugin.py
+++ b/neutron/tests/unit/nicira/test_nicira_plugin.py
@@@ -370,29 -359,22 +370,44 @@@ class TestNiciraSecurityGroup(ext_sg.Te
              # Assert Neutron name is not truncated
              self.assertEqual(sg['security_group']['name'], name)
  
+     def test_create_security_group_rule_bad_input(self):
+         name = 'foo security group'
+         description = 'foo description'
+         with self.security_group(name, description) as sg:
+             security_group_id = sg['security_group']['id']
+             protocol = 200
+             min_range = 32
+             max_range = 4343
+             rule = self._build_security_group_rule(
+                 security_group_id, 'ingress', protocol,
+                 min_range, max_range)
+             res = self._create_security_group_rule(self.fmt, rule)
+             self.deserialize(self.fmt, res)
+             self.assertEqual(res.status_int, 400)
+ 
  
 +class TestNiciraL3ExtensionManager(object):
 +
 +    def get_resources(self):
 +        # Simulate extension of L3 attribute map
 +        # First apply attribute extensions
 +        for key in l3.RESOURCE_ATTRIBUTE_MAP.keys():
 +            l3.RESOURCE_ATTRIBUTE_MAP[key].update(
 +                l3_ext_gw_mode.EXTENDED_ATTRIBUTES_2_0.get(key, {}))
 +            l3.RESOURCE_ATTRIBUTE_MAP[key].update(
 +                dist_router.EXTENDED_ATTRIBUTES_2_0.get(key, {}))
 +        # Finally add l3 resources to the global attribute map
 +        attributes.RESOURCE_ATTRIBUTE_MAP.update(
 +            l3.RESOURCE_ATTRIBUTE_MAP)
 +        return l3.L3.get_resources()
 +
 +    def get_actions(self):
 +        return []
 +
 +    def get_request_extensions(self):
 +        return []
 +
 +
  class TestNiciraL3NatTestCase(test_l3_plugin.L3NatDBTestCase,
                                NiciraPluginV2TestCase):