nova-net: Remove explicit 'USE_NEUTRON = True'
These are no longer necessary since this is the default. Change-Id: I4e2e12b15a0ce8acb0f09d9940543ab6d44190a9 Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
This commit is contained in:
parent
300b677a3d
commit
60f8c50b6f
|
@ -22,7 +22,6 @@ from nova.tests.functional.api_sample_tests import test_servers
|
|||
class EvacuateJsonTest(test_servers.ServersSampleBase):
|
||||
ADMIN_API = True
|
||||
sample_dir = "os-evacuate"
|
||||
USE_NEUTRON = True
|
||||
|
||||
def _test_evacuate(self, req_subs, server_req, server_resp,
|
||||
expected_resp_code):
|
||||
|
|
|
@ -38,7 +38,6 @@ def fake_get_compute(context, host):
|
|||
|
||||
class MigrateServerSamplesJsonTest(test_servers.ServersSampleBase):
|
||||
sample_dir = "os-migrate-server"
|
||||
USE_NEUTRON = True
|
||||
|
||||
def setUp(self):
|
||||
"""setUp Method for MigrateServer api samples extension
|
||||
|
@ -153,7 +152,6 @@ class MigrateServerSamplesJsonTestV256(test_servers.ServersSampleBase):
|
|||
sample_dir = "os-migrate-server"
|
||||
microversion = '2.56'
|
||||
scenarios = [('v2_56', {'api_major_version': 'v2.1'})]
|
||||
USE_NEUTRON = True
|
||||
|
||||
def setUp(self):
|
||||
"""setUp Method for MigrateServer api samples extension
|
||||
|
@ -193,7 +191,6 @@ class MigrateServerSamplesJsonTestV268(test_servers.ServersSampleBase):
|
|||
sample_dir = "os-migrate-server"
|
||||
microversion = '2.68'
|
||||
scenarios = [('v2_68', {'api_major_version': 'v2.1'})]
|
||||
USE_NEUTRON = True
|
||||
|
||||
def setUp(self):
|
||||
"""setUp Method for MigrateServer api samples extension
|
||||
|
|
|
@ -21,7 +21,6 @@ from nova.tests.functional import integrated_helpers
|
|||
class MultinicSampleJsonTest(integrated_helpers.InstanceHelperMixin,
|
||||
api_sample_base.ApiSampleTestBaseV21):
|
||||
ADMIN_API = True
|
||||
USE_NEUTRON = True
|
||||
sample_dir = "os-multinic"
|
||||
|
||||
def setUp(self):
|
||||
|
|
|
@ -82,7 +82,6 @@ def fake_get_rule(self, context, id):
|
|||
|
||||
class SecurityGroupsJsonTest(test_servers.ServersSampleBase):
|
||||
sample_dir = 'os-security-groups'
|
||||
USE_NEUTRON = True
|
||||
|
||||
def setUp(self):
|
||||
super(SecurityGroupsJsonTest, self).setUp()
|
||||
|
|
|
@ -30,7 +30,6 @@ class ServerMigrationsSampleJsonTest(test_servers.ServersSampleBase):
|
|||
sample_dir = 'server-migrations'
|
||||
scenarios = [('v2_22', {'api_major_version': 'v2.1'})]
|
||||
microversion = '2.22'
|
||||
USE_NEUTRON = True
|
||||
|
||||
def setUp(self):
|
||||
"""setUp method for server usage."""
|
||||
|
@ -168,7 +167,6 @@ class ServerMigrationsSampleJsonTestV2_24(test_servers.ServersSampleBase):
|
|||
microversion = '2.24'
|
||||
sample_dir = "server-migrations"
|
||||
scenarios = [('v2_24', {'api_major_version': 'v2.1'})]
|
||||
USE_NEUTRON = True
|
||||
|
||||
def setUp(self):
|
||||
"""setUp method for server usage."""
|
||||
|
@ -235,7 +233,6 @@ class ServerMigrationsSampleJsonTestV2_65(ServerMigrationsSampleJsonTestV2_24):
|
|||
ADMIN_API = True
|
||||
microversion = '2.65'
|
||||
scenarios = [('v2_65', {'api_major_version': 'v2.1'})]
|
||||
USE_NEUTRON = True
|
||||
|
||||
@mock.patch.object(conductor_manager.ComputeTaskManager, '_live_migrate')
|
||||
def test_live_migrate_abort_migration_queued(self, _live_migrate):
|
||||
|
|
|
@ -53,7 +53,6 @@ class UnshelveJson277Test(test_servers.ServersSampleBase):
|
|||
sample_dir = "os-shelve"
|
||||
microversion = '2.77'
|
||||
scenarios = [('v2_77', {'api_major_version': 'v2.1'})]
|
||||
USE_NEUTRON = True
|
||||
|
||||
def _test_server_action(self, uuid, template, action, subs=None):
|
||||
subs = subs or {}
|
||||
|
|
|
@ -42,7 +42,6 @@ class LiveMigrationCinderFailure(integrated_helpers._IntegratedTestBase,
|
|||
integrated_helpers.InstanceHelperMixin):
|
||||
api_major_version = 'v2.1'
|
||||
microversion = 'latest'
|
||||
USE_NEUTRON = True
|
||||
|
||||
def setUp(self):
|
||||
super(LiveMigrationCinderFailure, self).setUp()
|
||||
|
|
|
@ -55,11 +55,10 @@ def _verify_list_fulfillment(context, instance_uuid):
|
|||
|
||||
|
||||
class VirtualInterfaceListMigrationTestCase(
|
||||
integrated_helpers._IntegratedTestBase,
|
||||
integrated_helpers.InstanceHelperMixin):
|
||||
integrated_helpers._IntegratedTestBase,
|
||||
integrated_helpers.InstanceHelperMixin):
|
||||
|
||||
ADMIN_API = True
|
||||
USE_NEUTRON = True
|
||||
api_major_version = 'v2.1'
|
||||
|
||||
_image_ref_parameter = 'imageRef'
|
||||
|
|
|
@ -31,7 +31,6 @@ class ResizeEvacuateTestCase(integrated_helpers._IntegratedTestBase,
|
|||
# Set variables used in the parent class.
|
||||
REQUIRES_LOCKING = False
|
||||
ADMIN_API = True
|
||||
USE_NEUTRON = True
|
||||
_image_ref_parameter = 'imageRef'
|
||||
_flavor_ref_parameter = 'flavorRef'
|
||||
api_major_version = 'v2.1'
|
||||
|
|
|
@ -31,7 +31,6 @@ class MultiCellEvacuateTestCase(integrated_helpers._IntegratedTestBase,
|
|||
NUMBER_OF_CELLS = 2
|
||||
REQUIRES_LOCKING = False
|
||||
ADMIN_API = True
|
||||
USE_NEUTRON = True
|
||||
_image_ref_parameter = 'imageRef'
|
||||
_flavor_ref_parameter = 'flavorRef'
|
||||
api_major_version = 'v2.1'
|
||||
|
|
|
@ -24,7 +24,6 @@ class TestMultiattachVolumes(integrated_helpers._IntegratedTestBase,
|
|||
to represent a multiattach volume.
|
||||
"""
|
||||
# These are all used in _IntegratedTestBase.
|
||||
USE_NEUTRON = True
|
||||
api_major_version = 'v2.1'
|
||||
microversion = '2.60'
|
||||
_image_ref_parameter = 'imageRef'
|
||||
|
|
|
@ -1379,7 +1379,6 @@ class TestNovaManagePlacementSyncAggregates(
|
|||
|
||||
class TestDBArchiveDeletedRows(integrated_helpers._IntegratedTestBase):
|
||||
"""Functional tests for the "nova-manage db archive_deleted_rows" CLI."""
|
||||
USE_NEUTRON = True
|
||||
api_major_version = 'v2.1'
|
||||
_image_ref_parameter = 'imageRef'
|
||||
_flavor_ref_parameter = 'flavorRef'
|
||||
|
|
|
@ -69,8 +69,6 @@ class ServersTestBase(integrated_helpers._IntegratedTestBase):
|
|||
_return_resv_id_parameter = 'return_reservation_id'
|
||||
_min_count_parameter = 'min_count'
|
||||
|
||||
USE_NEUTRON = True
|
||||
|
||||
def setUp(self):
|
||||
self.computes = {}
|
||||
super(ServersTestBase, self).setUp()
|
||||
|
|
Loading…
Reference in New Issue