diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-16 05:53:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-16 05:53:43 +0000 |
| commit | 2b238e822ce33697e1dd13e9035bf668c51588fc (patch) | |
| tree | cbfd4ee40137d7d8d71328f71e4363624005a930 /nova/tests/network/test_manager.py | |
| parent | fe7065fa54c4be939f8e6a4fe97e7cf6db21fb76 (diff) | |
| parent | 44c648f205941d5491a527cef47113a963ad69ca (diff) | |
| download | nova-2b238e822ce33697e1dd13e9035bf668c51588fc.tar.gz | |
Merge "Optimize get_instance_nw_info and remove ipam"
Diffstat (limited to 'nova/tests/network/test_manager.py')
| -rw-r--r-- | nova/tests/network/test_manager.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/nova/tests/network/test_manager.py b/nova/tests/network/test_manager.py index fa5c7829d2..dfd9d8f924 100644 --- a/nova/tests/network/test_manager.py +++ b/nova/tests/network/test_manager.py @@ -223,7 +223,7 @@ class FlatNetworkTestCase(test.TestCase): 'should_create_vlan': False, 'should_create_bridge': False, 'ip': '192.168.%d.%03d' % (nid, nid + 99), - 'ip_v6': '2001:db8:0:1::%x' % nid, + 'ip_v6': '2001:db8:0:1:dcad:beff:feef:%x' % nid, 'netmask': '255.255.255.0', 'netmask_v6': 64, 'physical_network': None, @@ -1919,10 +1919,9 @@ class CommonNetworkTestCase(test.TestCase): def test_get_instance_nw_info_client_exceptions(self): manager = network_manager.NetworkManager() self.mox.StubOutWithMock(manager.db, - 'virtual_interface_get_by_instance') - manager.db.virtual_interface_get_by_instance( - self.context, FAKEUUID, - use_slave=False).AndRaise(exception.InstanceNotFound( + 'fixed_ip_get_by_instance') + manager.db.fixed_ip_get_by_instance( + self.context, FAKEUUID).AndRaise(exception.InstanceNotFound( instance_id=FAKEUUID)) self.mox.ReplayAll() self.assertRaises(messaging.ExpectedException, |