openstack/nova
Code Issues Proposed changes

added exception catch for bad prefix and matching test

Browse Source
This commit is contained in:
Ken Pepple
2011-08-21 17:55:54 -07:00
parent 43e2ca531f
commit 326cfda8cc
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/ipv6/account_identifier.py
View File

@@ -36,6 +36,8 @@ def to_global(prefix, mac, project_id):
return (project_hash ^ static_num ^ mac_addr | maskIP).format()
except netaddr.AddrFormatError:
raise TypeError(_('Bad mac for to_global_ipv6: %s') % mac)
except TypeError:
raise TypeError(_('Bad prefix for to_global_ipv6: %s') % prefix)
def to_mac(ipv6_address):

7
nova/tests/test_ipv6.py
View File

@@ -60,3 +60,10 @@ class IPv6AccountIdentiferTestCase(test.TestCase):
bad_mac = '02:16:3e:33:44:5X'
self.assertRaises(TypeError, ipv6.to_global,
'2001:db8::', bad_mac, 'test')
def test_to_global_with_bad_prefix(self):
bad_prefix = '78'
self.assertRaises(TypeError, ipv6.to_global,
bad_prefix,
'2001:db8::a94a:8fe5:ff33:4455',
'test')