diff options
| author | Ken Pepple <ken.pepple@gmail.com> | 2011-08-21 17:55:54 -0700 |
|---|---|---|
| committer | Ken Pepple <ken.pepple@gmail.com> | 2011-08-21 17:55:54 -0700 |
| commit | 326cfda8cc50f5db083e9df381d3109e0302605d (patch) | |
| tree | fd1bc9cf2930f1884d77ba8a1c0c69d8088d381e | |
| parent | 43e2ca531f0fdea5173b7f237627fc3543caf13b (diff) | |
| download | nova-326cfda8cc50f5db083e9df381d3109e0302605d.tar.gz nova-326cfda8cc50f5db083e9df381d3109e0302605d.tar.xz nova-326cfda8cc50f5db083e9df381d3109e0302605d.zip | |
added exception catch for bad prefix and matching test
| -rw-r--r-- | nova/ipv6/account_identifier.py | 2 | ||||
| -rw-r--r-- | nova/tests/test_ipv6.py | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/nova/ipv6/account_identifier.py b/nova/ipv6/account_identifier.py index 02b653925..4ca7b5983 100644 --- a/nova/ipv6/account_identifier.py +++ b/nova/ipv6/account_identifier.py @@ -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): diff --git a/nova/tests/test_ipv6.py b/nova/tests/test_ipv6.py index 6afc7e3f9..f9c2517a7 100644 --- a/nova/tests/test_ipv6.py +++ b/nova/tests/test_ipv6.py @@ -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') |