diff options
| -rw-r--r-- | nova/test.py | 10 | ||||
| -rw-r--r-- | nova/tests/api/ec2/test_cloud.py | 1 | ||||
| -rw-r--r-- | nova/tests/integrated/test_api_samples.py | 1 | ||||
| -rw-r--r-- | nova/tests/network/test_manager.py | 2 | ||||
| -rw-r--r-- | nova/tests/virt/libvirt/test_libvirt.py | 1 | ||||
| -rw-r--r-- | nova/tests/virt/xenapi/test_xenapi.py | 1 |
6 files changed, 13 insertions, 3 deletions
diff --git a/nova/test.py b/nova/test.py index 6dad0784a..9a6874007 100644 --- a/nova/test.py +++ b/nova/test.py @@ -87,7 +87,6 @@ class Database(fixtures.Fixture): if os.path.exists(testdb): return db_migrate.db_sync() - self.post_migrations() if sql_connection == "sqlite://": conn = self.engine.connect() self._DB = "".join(line for line in conn.connection.iterdump()) @@ -107,8 +106,13 @@ class Database(fixtures.Fixture): shutil.copyfile(paths.state_path_rel(self.sqlite_clean_db), paths.state_path_rel(self.sqlite_db)) - def post_migrations(self): - """Any addition steps that are needed outside of the migrations.""" + +class SampleNetworks(fixtures.Fixture): + + """Create sample networks in the database.""" + + def setUp(self): + super(SampleNetworks, self).setUp() ctxt = context.get_admin_context() network = network_manager.VlanManager() bridge_interface = CONF.flat_interface or CONF.vlan_interface diff --git a/nova/tests/api/ec2/test_cloud.py b/nova/tests/api/ec2/test_cloud.py index e58d260fb..e9ff10be0 100644 --- a/nova/tests/api/ec2/test_cloud.py +++ b/nova/tests/api/ec2/test_cloud.py @@ -107,6 +107,7 @@ def get_instances_with_cached_ips(orig_func, *args, **kwargs): class CloudTestCase(test.TestCase): def setUp(self): super(CloudTestCase, self).setUp() + self.useFixture(test.SampleNetworks()) ec2utils.reset_cache() self.flags(compute_driver='nova.virt.fake.FakeDriver', volume_api_class='nova.tests.fake_volume.API') diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py index 9b678ddd3..3d020269c 100644 --- a/nova/tests/integrated/test_api_samples.py +++ b/nova/tests/integrated/test_api_samples.py @@ -93,6 +93,7 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase): ext = [self.extension_name] if self.extension_name else [] self.flags(osapi_compute_extension=ext + extends) super(ApiSampleTestBase, self).setUp() + self.useFixture(test.SampleNetworks()) fake_network.stub_compute_with_ips(self.stubs) self.generate_samples = os.getenv('GENERATE_SAMPLES') is not None diff --git a/nova/tests/network/test_manager.py b/nova/tests/network/test_manager.py index b8f75233a..d534e7857 100644 --- a/nova/tests/network/test_manager.py +++ b/nova/tests/network/test_manager.py @@ -519,6 +519,7 @@ class FlatNetworkTestCase(test.TestCase): class VlanNetworkTestCase(test.TestCase): def setUp(self): super(VlanNetworkTestCase, self).setUp() + self.useFixture(test.SampleNetworks()) self.network = network_manager.VlanManager(host=HOST) self.network.db = db self.context = context.RequestContext('testuser', 'testproject', @@ -1929,6 +1930,7 @@ class TestFloatingIPManager(floating_ips.FloatingIP, class AllocateTestCase(test.TestCase): def setUp(self): super(AllocateTestCase, self).setUp() + self.useFixture(test.SampleNetworks()) self.conductor = self.start_service( 'conductor', manager=CONF.conductor.manager) self.compute = self.start_service('compute') diff --git a/nova/tests/virt/libvirt/test_libvirt.py b/nova/tests/virt/libvirt/test_libvirt.py index f72c37cd1..93b2f5464 100644 --- a/nova/tests/virt/libvirt/test_libvirt.py +++ b/nova/tests/virt/libvirt/test_libvirt.py @@ -281,6 +281,7 @@ class LibvirtConnTestCase(test.TestCase): def setUp(self): super(LibvirtConnTestCase, self).setUp() + self.useFixture(test.SampleNetworks()) self.flags(fake_call=True) self.user_id = 'fake' self.project_id = 'fake' diff --git a/nova/tests/virt/xenapi/test_xenapi.py b/nova/tests/virt/xenapi/test_xenapi.py index af2d97f67..56a041047 100644 --- a/nova/tests/virt/xenapi/test_xenapi.py +++ b/nova/tests/virt/xenapi/test_xenapi.py @@ -308,6 +308,7 @@ class XenAPIVMTestCase(stubs.XenAPITestBase): """Unit tests for VM operations.""" def setUp(self): super(XenAPIVMTestCase, self).setUp() + self.useFixture(test.SampleNetworks()) self.network = importutils.import_object(CONF.network_manager) self.flags(disable_process_locking=True, instance_name_template='%d', |