Merge "Support uncompressed ipv6 address and abbreviated ipv4 address"

neutron/api/v2/attributes.py

@@ -267,11 +267,10 @@ def _validate_subnet(data, valid_values=None):
     msg = None
     try:
         net = netaddr.IPNetwork(_validate_no_whitespace(data))
-        cidr = str(net.cidr)
+        if ('/' not in data or net.network != net.ip):
-        if (cidr != data):
             msg = _("'%(data)s' isn't a recognized IP subnet cidr,"
                     " '%(cidr)s' is recommended") % {"data": data,
-                                                     "cidr": cidr}
+                                                     "cidr": net.cidr}
         else:
             return
     except Exception:

neutron/tests/unit/test_attributes.py

@@ -397,6 +397,36 @@ class TestAttributes(base.BaseTestCase):
                                           None)
         self.assertIsNone(msg)
 
+        # Valid - uncompressed ipv6 address
+        cidr = "fe80:0:0:0:0:0:0:0/128"
+        msg = attributes._validate_subnet(cidr,
+                                          None)
+        self.assertIsNone(msg)
+
+        # Valid - ipv6 address with multiple consecutive zero
+        cidr = "2001:0db8:0:0:1::1/128"
+        msg = attributes._validate_subnet(cidr,
+                                          None)
+        self.assertIsNone(msg)
+
+        # Valid - ipv6 address with multiple consecutive zero
+        cidr = "2001:0db8::1:0:0:1/128"
+        msg = attributes._validate_subnet(cidr,
+                                          None)
+        self.assertIsNone(msg)
+
+        # Valid - ipv6 address with multiple consecutive zero
+        cidr = "2001::0:1:0:0:1100/120"
+        msg = attributes._validate_subnet(cidr,
+                                          None)
+        self.assertIsNone(msg)
+
+        # Valid - abbreviated ipv4 address
+        cidr = "10/24"
+        msg = attributes._validate_subnet(cidr,
+                                          None)
+        self.assertIsNone(msg)
+
         # Invalid - IPv4 missing mask
         cidr = "10.0.2.0"
         msg = attributes._validate_subnet(cidr,

neutron/tests/unit/test_extension_firewall.py

@@ -531,10 +531,7 @@ class TestFirewallAttributeValidators(base.BaseTestCase):
         # Valid - IPv6 with final octets
         cidr = "fe80::0/24"
         msg = firewall._validate_ip_or_subnet_or_none(cidr, None)
-        self.assertEqual(msg, ("'%s' is not a valid IP address and "
+        self.assertIsNone(msg)
-                               "'%s' isn't a recognized IP subnet cidr,"
-                               " 'fe80::/24' is recommended") % (cidr,
-                                                                 cidr))
 
         cidr = "fe80::"
         msg = firewall._validate_ip_or_subnet_or_none(cidr, None)