fixed method signature of modify_rules

fixed unit_test for ipv6
This commit is contained in:
Nachi Ueno
2011-01-13 09:10:44 +09:00
parent 1752fd2b35
commit 4899e8bc49

View File

@@ -99,23 +99,24 @@ class NetworkTestCase(test.TestCase):
def test_private_ipv6(self):
"""Make sure ipv6 is OK"""
if FLAGS.use_ipv6:
instance_ref = self._create_instance(1)
instance_ref = self._create_instance(0)
address = self._create_address(0, instance_ref['id'])
network_ref = db.project_get_network(
self.context,
context.get_admin_context(),
self.context.project_id)
address_v6 = db.instance_get_fixed_address_v6(
self.context,
instance_ref['id'])
context.get_admin_context(),
instance_ref['id'])
self.assertEqual(instance_ref['mac_address'],
utils.to_mac(address_v6))
instance_ref2 = db.fixed_ip_get_instance_v6(
self.context,
address_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']))
network_ref['cidr_v6'],
instance_ref['mac_address']))
def test_public_network_association(self):
"""Makes sure that we can allocaate a public ip"""