diff options
| author | Stephen Finucane <sfinucan@redhat.com> | 2019-12-16 09:57:34 +0000 |
|---|---|---|
| committer | Stephen Finucane <sfinucan@redhat.com> | 2020-01-08 13:54:12 +0000 |
| commit | df001770938afdad61f4579498d4153450554788 (patch) | |
| tree | efd27b5a37b79610ede81d64b7b3e1e8fb03bedc /nova/tests/unit/test_metadata.py | |
| parent | 656c18eaf290a3b6ddf743c953f5cdf1d3fb2f05 (diff) | |
| download | nova-df001770938afdad61f4579498d4153450554788.tar.gz | |
nova-net: Remove final references to nova-network
Strip out everything matching '(is|use)_neutron', except the tests for
nova-network code and two other places that these tests rely on. Along
the way, remove a whole load of apparently unnecessary mocking that
clearly wasn't caught when we switched over the bulk of testing to use
the neutron network driver.
Change-Id: Ifa9c5c468400261a5e1f66b72c575845173a4f8f
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
Diffstat (limited to 'nova/tests/unit/test_metadata.py')
| -rw-r--r-- | nova/tests/unit/test_metadata.py | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/nova/tests/unit/test_metadata.py b/nova/tests/unit/test_metadata.py index 6b5a5d8adf..dc0d9ba3ec 100644 --- a/nova/tests/unit/test_metadata.py +++ b/nova/tests/unit/test_metadata.py @@ -22,10 +22,10 @@ import hmac import os import re -try: - import cPickle as pickle -except ImportError: +try: # python 2 import pickle +except ImportError: # python 3 + import cPickle as pickle from keystoneauth1 import exceptions as ks_exceptions from keystoneauth1 import session @@ -268,7 +268,6 @@ class MetadataTestCase(test.TestCase): self.instance = fake_inst_obj(self.context) self.keypair = fake_keypair_obj(self.instance.key_name, self.instance.key_data) - fake_network.stub_out_nw_api_get_instance_nw_info(self) fakes.stub_out_secgroup_api(self) def test_can_pickle_metadata(self): @@ -524,8 +523,7 @@ class MetadataTestCase(test.TestCase): mock_get.assert_called_once_with(network_info_from_api) def test_local_ipv4(self): - nw_info = fake_network.fake_get_instance_nw_info(self, - num_networks=2) + nw_info = fake_network.fake_get_instance_nw_info(self) expected_local = "192.168.1.100" md = fake_InstanceMetadata(self, self.instance, network_info=nw_info, address="fake") @@ -533,8 +531,7 @@ class MetadataTestCase(test.TestCase): self.assertEqual(expected_local, data['meta-data']['local-ipv4']) def test_local_ipv4_from_nw_info(self): - nw_info = fake_network.fake_get_instance_nw_info(self, - num_networks=2) + nw_info = fake_network.fake_get_instance_nw_info(self) expected_local = "192.168.1.100" md = fake_InstanceMetadata(self, self.instance, network_info=nw_info) @@ -620,7 +617,6 @@ class OpenStackMetadataTestCase(test.TestCase): super(OpenStackMetadataTestCase, self).setUp() self.context = context.RequestContext('fake', 'fake') self.instance = fake_inst_obj(self.context) - fake_network.stub_out_nw_api_get_instance_nw_info(self) def test_empty_device_metadata(self): fakes.stub_out_key_pair_funcs(self) @@ -1043,7 +1039,6 @@ class MetadataHandlerTestCase(test.TestCase): def setUp(self): super(MetadataHandlerTestCase, self).setUp() - fake_network.stub_out_nw_api_get_instance_nw_info(self) self.context = context.RequestContext('fake', 'fake') self.instance = fake_inst_obj(self.context) self.mdinst = fake_InstanceMetadata(self, self.instance, @@ -1676,7 +1671,6 @@ class MetadataHandlerTestCase(test.TestCase): class MetadataPasswordTestCase(test.TestCase): def setUp(self): super(MetadataPasswordTestCase, self).setUp() - fake_network.stub_out_nw_api_get_instance_nw_info(self) self.context = context.RequestContext('fake', 'fake') self.instance = fake_inst_obj(self.context) self.mdinst = fake_InstanceMetadata(self, self.instance, |