openstack/nova
Code Issues Proposed changes

nova-net: Remove final references to nova-net from functional tests

Browse Source 
Most of this is just removal of unnecessary 'use_neutron=True' conf
overrides. The sole exception is the conversion of the metadata API
tests, which turned out to be far less effort to convert than I
expected.

Change-Id: I5114bf13e7df95ed02be70f29d453116387d4f9c
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
This commit is contained in:
Stephen Finucane 2019-11-27 09:58:22 +00:00
parent 5dcfd0750f
commit 9142a97f24
6 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nova/tests/functional/notification_sample_tests/test_compute_task.py
View File

@ -20,7 +20,6 @@ class TestComputeTaskNotificationSample(
notification_sample_base.NotificationSampleTestBase): notification_sample_base.NotificationSampleTestBase):
def setUp(self): def setUp(self):
self.flags(use_neutron=True)
super(TestComputeTaskNotificationSample, self).setUp() super(TestComputeTaskNotificationSample, self).setUp()
self.neutron = fixtures.NeutronFixture(self) self.neutron = fixtures.NeutronFixture(self)
self.useFixture(self.neutron) self.useFixture(self.neutron)

2
nova/tests/functional/notification_sample_tests/test_instance.py
View File

@ -28,7 +28,6 @@ class TestInstanceNotificationSampleWithMultipleCompute(
def setUp(self): def setUp(self):
self.flags(compute_driver='fake.FakeLiveMigrateDriver') self.flags(compute_driver='fake.FakeLiveMigrateDriver')
self.flags(use_neutron=True)
self.flags(bdms_in_notifications='True', group='notifications') self.flags(bdms_in_notifications='True', group='notifications')
super(TestInstanceNotificationSampleWithMultipleCompute, self).setUp() super(TestInstanceNotificationSampleWithMultipleCompute, self).setUp()
self.neutron = fixtures.NeutronFixture(self) self.neutron = fixtures.NeutronFixture(self)
@ -333,7 +332,6 @@ class TestInstanceNotificationSample(
notification_sample_base.NotificationSampleTestBase): notification_sample_base.NotificationSampleTestBase):
def setUp(self): def setUp(self):
self.flags(use_neutron=True)
self.flags(bdms_in_notifications='True', group='notifications') self.flags(bdms_in_notifications='True', group='notifications')
super(TestInstanceNotificationSample, self).setUp() super(TestInstanceNotificationSample, self).setUp()
self.neutron = fixtures.NeutronFixture(self) self.neutron = fixtures.NeutronFixture(self)

1
nova/tests/functional/notification_sample_tests/test_server_group.py
View File

@ -19,7 +19,6 @@ class TestServerGroupNotificationSample(
notification_sample_base.NotificationSampleTestBase): notification_sample_base.NotificationSampleTestBase):
def setUp(self): def setUp(self):
self.flags(use_neutron=True)
super(TestServerGroupNotificationSample, self).setUp() super(TestServerGroupNotificationSample, self).setUp()
self.neutron = fixtures.NeutronFixture(self) self.neutron = fixtures.NeutronFixture(self)
self.useFixture(self.neutron) self.useFixture(self.neutron)

1
nova/tests/functional/notification_sample_tests/test_volume.py
View File

@ -23,7 +23,6 @@ class TestVolumeUsageNotificationSample(
notification_sample_base.NotificationSampleTestBase): notification_sample_base.NotificationSampleTestBase):
def setUp(self): def setUp(self):
self.flags(use_neutron=True)
self.flags(volume_usage_poll_interval=60) self.flags(volume_usage_poll_interval=60)
super(TestVolumeUsageNotificationSample, self).setUp() super(TestVolumeUsageNotificationSample, self).setUp()
self.neutron = fixtures.NeutronFixture(self) self.neutron = fixtures.NeutronFixture(self)

1
nova/tests/functional/regressions/test_bug_1702454.py
View File

@ -45,7 +45,6 @@ class SchedulerOnlyChecksTargetTest(test.TestCase,
self.useFixture(policy_fixture.RealPolicyFixture()) self.useFixture(policy_fixture.RealPolicyFixture())
# The NeutronFixture is needed to stub out validate_networks in API. # The NeutronFixture is needed to stub out validate_networks in API.
self.flags(use_neutron=True)
self.useFixture(nova_fixtures.NeutronFixture(self)) self.useFixture(nova_fixtures.NeutronFixture(self))
# We need the computes reporting into placement for the filter # We need the computes reporting into placement for the filter

10
nova/tests/functional/test_metadata.py
View File

@ -62,18 +62,16 @@ class MetadataTest(test.TestCase):
project_id='fake', hostname='test') project_id='fake', hostname='test')
instance.create() instance.create()
# NOTE(mikal): We could create a network and a fixed IP here, but it # The NeutronFixture is needed to provide the fixed IP for the metadata
# turns out to be heaps of fiddly boiler plate code, so let's just # service
# fake it and hope mriedem doesn't notice. self.useFixture(nova_fixtures.NeutronFixture(self))
# TODO(mriedem): Make this all work with the Neutron fixture.
self.flags(use_neutron=False)
def fake_get_fixed_ip_by_address(self, ctxt, address): def fake_get_fixed_ip_by_address(self, ctxt, address):
return {'instance_uuid': instance.uuid} return {'instance_uuid': instance.uuid}
self.useFixture( self.useFixture(
fixtures.MonkeyPatch( fixtures.MonkeyPatch(
'nova.network.api.API.get_fixed_ip_by_address', 'nova.network.neutronv2.api.API.get_fixed_ip_by_address',
fake_get_fixed_ip_by_address)) fake_get_fixed_ip_by_address))
def fake_get_ec2_ip_info(nw_info): def fake_get_ec2_ip_info(nw_info):