openstack-attic/melange
Code Issues Proposed changes

Merge "Fixes LP925656"

Browse Source
This commit is contained in:
Jenkins 2012-02-07 05:38:20 +00:00 committed by Gerrit Code Review
commit 20f8c55630
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/apidoc.rst
View File

@ -1441,7 +1441,7 @@ Error - 404 Not Found [When network for a given network_id and tenant_id is not
"gateway": "fe::1",
"id": "7ab2f803-a5d7-4d77-bb42-1eb1e8732e93",
"ip_routes": [],
"netmask": "ffff:ffff:ffff:ffff:ffff:ffff::"
"netmask": "96"
},
"version": 6
}

5
melange/ipam/models.py
View File

@ -261,7 +261,10 @@ class IpBlock(ModelBase):
@property
def netmask(self):
return str(netaddr.IPNetwork(self.cidr).netmask)
if self.is_ipv6():
return str(netaddr.IPNetwork(self.cidr).prefixlen)
else:
return str(netaddr.IPNetwork(self.cidr).netmask)
def is_ipv6(self):
return netaddr.IPNetwork(self.cidr).version == 6

2
melange/tests/unit/test_ipam_models.py
View File

@ -192,7 +192,7 @@ class TestIpBlock(tests.BaseTest):
self.assertEqual(v4_block.broadcast, "10.0.0.255")
self.assertEqual(v4_block.netmask, "255.255.255.0")
self.assertEqual(v6_block.broadcast, "fe::ffff:ffff:ffff:ffff")
self.assertEqual(v6_block.netmask, "ffff:ffff:ffff:ffff::")
self.assertEqual(v6_block.netmask, "64")
def test_valid_cidr(self):
factory = factory_models.PrivateIpBlockFactory