diff options
| author | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2011-05-11 15:12:12 +0000 |
|---|---|---|
| committer | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2011-05-11 15:12:12 +0000 |
| commit | 43fa5afac9e5af74e2e3977a5dafd9640d064cf1 (patch) | |
| tree | ac8daf40051e4c97fc3445ad54f9478d423c3bfe /nova/tests | |
| parent | 21f18f77e7d729107742fa9157b531ce56f3272a (diff) | |
Abstract out IPv6 address generation to pluggable backends
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/network/base.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nova/tests/network/base.py b/nova/tests/network/base.py index 988a1de72..5de1255cd 100644 --- a/nova/tests/network/base.py +++ b/nova/tests/network/base.py @@ -28,6 +28,7 @@ from nova import flags from nova import log as logging from nova import test from nova import utils +from nova import ipv6 from nova.auth import manager FLAGS = flags.FLAGS @@ -117,15 +118,14 @@ class NetworkTestCase(test.TestCase): context.get_admin_context(), instance_ref['id']) self.assertEqual(instance_ref['mac_address'], - utils.to_mac(address_v6)) + ipv6.to_mac(address_v6)) instance_ref2 = db.fixed_ip_get_instance_v6( context.get_admin_context(), address_v6) self.assertEqual(instance_ref['id'], instance_ref2['id']) self.assertEqual(address_v6, - utils.to_global_ipv6( - network_ref['cidr_v6'], - instance_ref['mac_address'])) + ipv6.to_global(network_ref['cidr_v6'], + instance_ref['mac_address'])) self._deallocate_address(0, address) db.instance_destroy(context.get_admin_context(), instance_ref['id']) |