diff options
| author | Ken Pepple <ken.pepple@gmail.com> | 2011-08-24 16:01:48 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-08-24 16:01:48 +0000 |
| commit | 9d7ece3f7cee968123850b1092d8ea78580c7eb1 (patch) | |
| tree | 9fe857a7d83b0a9997a107283f4bdd118ba77606 /nova/ipv6 | |
| parent | c8920f480233546d8a57265da66de7821c32ac7e (diff) | |
| parent | d4b09b85ad20bd0b83bc48d7bd1e0c6754b2649b (diff) | |
| download | nova-9d7ece3f7cee968123850b1092d8ea78580c7eb1.tar.gz nova-9d7ece3f7cee968123850b1092d8ea78580c7eb1.tar.xz nova-9d7ece3f7cee968123850b1092d8ea78580c7eb1.zip | |
add rainy day test to to_global
fixed to_global to catch correct error from incorrect mac addresses
Diffstat (limited to 'nova/ipv6')
| -rw-r--r-- | nova/ipv6/rfc2462.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/ipv6/rfc2462.py b/nova/ipv6/rfc2462.py index 0074efe98..acf42d201 100644 --- a/nova/ipv6/rfc2462.py +++ b/nova/ipv6/rfc2462.py @@ -30,8 +30,10 @@ def to_global(prefix, mac, project_id): maskIP = netaddr.IPNetwork(prefix).ip return (mac64_addr ^ netaddr.IPAddress('::0200:0:0:0') | maskIP).\ format() - except TypeError: + 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): |