x/quark
Code Issues Proposed changes

Fix arbitrary max length of CIDR of mac range validation

Browse Source 
Noticed prefix length twelve was used in Melange ORD production database.
Validate with cerberus (Matt Dietz) that 10 was an arbitrary number.
This commit is contained in:
jmeridth
2013-08-07 20:19:43 +00:00
parent 7f4c1c7cdc
commit 41baef9087
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
quark/plugin_modules/mac_address_ranges.py
View File

@@ -32,7 +32,7 @@ def _to_mac_range(val):
prefix = prefix.replace(':', '')
prefix = prefix.replace('-', '')
prefix_length = len(prefix)
if prefix_length < 6 or prefix_length > 10:
if prefix_length < 6 or prefix_length > 12:
raise quark_exceptions.InvalidMacAddressRange(cidr=val)
diff = 12 - len(prefix)

10
quark/tests/plugin_modules/test_mac_address_ranges.py
View File

@@ -98,6 +98,14 @@ class TestQuarkCreateMacAddressRanges(test_quark_plugin.TestQuarkPlugin):
self.assertEqual(first_mac, "aa:bb:cc:0:0:0")
self.assertEqual(last_mac, "aa:bb:cd:0:0:0")
def test_to_mac_range_unix_cidr_format_normal_length(self):
cidr, first, last = mac_address_ranges._to_mac_range("aabbcc000000/29")
first_mac = str(netaddr.EUI(first, dialect=netaddr.mac_unix))
last_mac = str(netaddr.EUI(last, dialect=netaddr.mac_unix))
self.assertEqual(cidr, "AA:BB:CC:00:00:00/29")
self.assertEqual(first_mac, "aa:bb:cc:0:0:0")
self.assertEqual(last_mac, "aa:bb:cc:8:0:0")
def test_to_mac_prefix_too_short_fails(self):
with self.assertRaises(quark_exceptions.InvalidMacAddressRange):
cidr, first, last = mac_address_ranges._to_mac_range("AA-BB")
@@ -105,7 +113,7 @@ class TestQuarkCreateMacAddressRanges(test_quark_plugin.TestQuarkPlugin):
def test_to_mac_prefix_too_long_fails(self):
with self.assertRaises(quark_exceptions.InvalidMacAddressRange):
cidr, first, last = mac_address_ranges._to_mac_range(
"AA-BB-CC-DD-EE-F0")
"AA-BB-CC-DD-EE-F0-00")
def test_to_mac_prefix_is_garbage_fails(self):
with self.assertRaises(quark_exceptions.InvalidMacAddressRange):