diff options
Diffstat (limited to 'snaps/openstack/utils/tests')
| -rw-r--r-- | snaps/openstack/utils/tests/heat_utils_tests.py | 9 | ||||
| -rw-r--r-- | snaps/openstack/utils/tests/neutron_utils_tests.py | 63 | ||||
| -rw-r--r-- | snaps/openstack/utils/tests/nova_utils_tests.py | 23 | ||||
| -rw-r--r-- | snaps/openstack/utils/tests/settings_utils_tests.py | 2 |
4 files changed, 61 insertions, 36 deletions
diff --git a/snaps/openstack/utils/tests/heat_utils_tests.py b/snaps/openstack/utils/tests/heat_utils_tests.py index 67fbdec..ee95a63 100644 --- a/snaps/openstack/utils/tests/heat_utils_tests.py +++ b/snaps/openstack/utils/tests/heat_utils_tests.py @@ -187,7 +187,7 @@ class HeatUtilsCreateSimpleStackTests(OSComponentTestCase): nova = nova_utils.nova_client(self.os_creds) servers = heat_utils.get_stack_servers( - self.heat_client, nova, neutron, self.stack1) + self.heat_client, nova, neutron, self.stack1, self.project_id) self.assertIsNotNone(servers) self.assertEqual(1, len(servers)) self.assertEqual(self.vm_inst_name, servers[0].name) @@ -311,10 +311,11 @@ class HeatUtilsCreateComplexStackTests(OSComponentTestCase): neutron = neutron_utils.neutron_client(self.os_creds) glance = glance_utils.glance_client(self.os_creds) servers = heat_utils.get_stack_servers( - self.heat_client, nova, neutron, self.stack) + self.heat_client, nova, neutron, self.stack, + self.project_id) for server in servers: vm_settings = settings_utils.create_vm_inst_config( - nova, neutron, server) + nova, neutron, server, self.project_id) img_settings = settings_utils.determine_image_config( glance, server, [self.image_creator1.image_settings, @@ -383,7 +384,7 @@ class HeatUtilsCreateComplexStackTests(OSComponentTestCase): glance = glance_utils.glance_client(self.os_creds) servers = heat_utils.get_stack_servers( - self.heat_client, nova, neutron, self.stack) + self.heat_client, nova, neutron, self.stack, self.project_id) self.assertIsNotNone(servers) self.assertEqual(2, len(servers)) diff --git a/snaps/openstack/utils/tests/neutron_utils_tests.py b/snaps/openstack/utils/tests/neutron_utils_tests.py index 4dfff87..22c6a33 100644 --- a/snaps/openstack/utils/tests/neutron_utils_tests.py +++ b/snaps/openstack/utils/tests/neutron_utils_tests.py @@ -109,7 +109,8 @@ class NeutronUtilsNetworkTests(OSComponentTestCase): self.assertEqual(self.net_config.network_settings.name, self.network.name) self.assertTrue(validate_network( - self.neutron, self.net_config.network_settings.name, True)) + self.neutron, self.net_config.network_settings.name, True, + self.project_id)) self.assertEqual(len(self.net_config.network_settings.subnet_settings), len(self.network.subnets)) @@ -167,7 +168,8 @@ class NeutronUtilsSubnetTests(OSComponentTestCase): self.assertEqual(self.net_config.network_settings.name, self.network.name) self.assertTrue(validate_network( - self.neutron, self.net_config.network_settings.name, True)) + self.neutron, self.net_config.network_settings.name, True, + self.project_id)) subnet_setting = self.net_config.network_settings.subnet_settings[0] self.assertTrue(validate_subnet( @@ -193,7 +195,8 @@ class NeutronUtilsSubnetTests(OSComponentTestCase): self.assertEqual(self.net_config.network_settings.name, self.network.name) self.assertTrue(validate_network( - self.neutron, self.net_config.network_settings.name, True)) + self.neutron, self.net_config.network_settings.name, True, + self.project_id)) with self.assertRaises(Exception): SubnetConfig(cidr=self.net_config.subnet_cidr) @@ -208,7 +211,8 @@ class NeutronUtilsSubnetTests(OSComponentTestCase): self.assertEqual(self.net_config.network_settings.name, self.network.name) self.assertTrue(validate_network( - self.neutron, self.net_config.network_settings.name, True)) + self.neutron, self.net_config.network_settings.name, True, + self.project_id)) subnet_setting = self.net_config.network_settings.subnet_settings[0] self.assertTrue(validate_subnet( @@ -525,7 +529,8 @@ class NeutronUtilsRouterTests(OSComponentTestCase): Tests the neutron_utils.create_router() """ self.router = neutron_utils.create_router( - self.neutron, self.os_creds, self.net_config.router_settings) + self.neutron, self.os_creds, self.net_config.router_settings, + self.project_id) validate_router(self.neutron, self.net_config.router_settings.name, True) @@ -541,7 +546,8 @@ class NeutronUtilsRouterTests(OSComponentTestCase): self.net_config.router_settings.name, self.ext_net_name) self.router = neutron_utils.create_router( - self.neutron, self.os_creds, self.net_config.router_settings) + self.neutron, self.os_creds, self.net_config.router_settings, + self.project_id) validate_router(self.neutron, self.net_config.router_settings.name, True) @@ -558,14 +564,16 @@ class NeutronUtilsRouterTests(OSComponentTestCase): self.assertEqual(self.net_config.network_settings.name, self.network.name) self.assertTrue(validate_network( - self.neutron, self.net_config.network_settings.name, True)) + self.neutron, self.net_config.network_settings.name, True, + self.project_id)) subnet_setting = self.net_config.network_settings.subnet_settings[0] self.assertTrue(validate_subnet( self.neutron, subnet_setting.name, subnet_setting.cidr, True)) self.router = neutron_utils.create_router( - self.neutron, self.os_creds, self.net_config.router_settings) + self.neutron, self.os_creds, self.net_config.router_settings, + self.project_id) validate_router(self.neutron, self.net_config.router_settings.name, True) @@ -584,7 +592,8 @@ class NeutronUtilsRouterTests(OSComponentTestCase): self.assertEqual(self.net_config.network_settings.name, self.network.name) self.assertTrue(validate_network( - self.neutron, self.net_config.network_settings.name, True)) + self.neutron, self.net_config.network_settings.name, True, + self.project_id)) subnet_setting = self.net_config.network_settings.subnet_settings[0] self.assertTrue(validate_subnet( @@ -604,10 +613,12 @@ class NeutronUtilsRouterTests(OSComponentTestCase): self.assertEqual(self.net_config.network_settings.name, self.network.name) self.assertTrue(validate_network( - self.neutron, self.net_config.network_settings.name, True)) + self.neutron, self.net_config.network_settings.name, True, + self.project_id)) self.router = neutron_utils.create_router( - self.neutron, self.os_creds, self.net_config.router_settings) + self.neutron, self.os_creds, self.net_config.router_settings, + self.project_id) validate_router(self.neutron, self.net_config.router_settings.name, True) @@ -625,10 +636,12 @@ class NeutronUtilsRouterTests(OSComponentTestCase): self.assertEqual(self.net_config.network_settings.name, self.network.name) self.assertTrue(validate_network( - self.neutron, self.net_config.network_settings.name, True)) + self.neutron, self.net_config.network_settings.name, True, + self.project_id)) self.router = neutron_utils.create_router( - self.neutron, self.os_creds, self.net_config.router_settings) + self.neutron, self.os_creds, self.net_config.router_settings, + self.project_id) validate_router(self.neutron, self.net_config.router_settings.name, True) @@ -648,7 +661,8 @@ class NeutronUtilsRouterTests(OSComponentTestCase): self.assertEqual(self.net_config.network_settings.name, self.network.name) self.assertTrue(validate_network( - self.neutron, self.net_config.network_settings.name, True)) + self.neutron, self.net_config.network_settings.name, True, + self.project_id)) subnet_setting = self.net_config.network_settings.subnet_settings[0] self.assertTrue(validate_subnet( @@ -672,7 +686,8 @@ class NeutronUtilsRouterTests(OSComponentTestCase): self.assertEqual(self.net_config.network_settings.name, self.network.name) self.assertTrue(validate_network( - self.neutron, self.net_config.network_settings.name, True)) + self.neutron, self.net_config.network_settings.name, True, + self.project_id)) subnet_setting = self.net_config.network_settings.subnet_settings[0] self.assertTrue(validate_subnet(self.neutron, subnet_setting.name, @@ -696,7 +711,8 @@ class NeutronUtilsRouterTests(OSComponentTestCase): self.assertEqual(self.net_config.network_settings.name, self.network.name) self.assertTrue(validate_network( - self.neutron, self.net_config.network_settings.name, True)) + self.neutron, self.net_config.network_settings.name, True, + self.project_id)) subnet_setting = self.net_config.network_settings.subnet_settings[0] self.assertTrue(validate_subnet( @@ -740,7 +756,8 @@ class NeutronUtilsRouterTests(OSComponentTestCase): self.assertEqual(self.net_config.network_settings.name, self.network.name) self.assertTrue(validate_network( - self.neutron, self.net_config.network_settings.name, True)) + self.neutron, self.net_config.network_settings.name, True, + self.project_id)) subnet_setting = self.net_config.network_settings.subnet_settings[0] self.assertTrue(validate_subnet( @@ -766,7 +783,8 @@ class NeutronUtilsRouterTests(OSComponentTestCase): self.assertEqual(self.net_config.network_settings.name, self.network.name) self.assertTrue(validate_network( - self.neutron, self.net_config.network_settings.name, True)) + self.neutron, self.net_config.network_settings.name, True, + self.project_id)) subnet_setting = self.net_config.network_settings.subnet_settings[0] self.assertTrue(validate_subnet( @@ -792,7 +810,8 @@ class NeutronUtilsRouterTests(OSComponentTestCase): self.assertEqual(self.net_config.network_settings.name, self.network.name) self.assertTrue(validate_network( - self.neutron, self.net_config.network_settings.name, True)) + self.neutron, self.net_config.network_settings.name, True, + self.project_id)) subnet_setting = self.net_config.network_settings.subnet_settings[0] self.assertTrue(validate_subnet( @@ -1007,7 +1026,7 @@ Validation routines """ -def validate_network(neutron, name, exists): +def validate_network(neutron, name, exists, project_id): """ Returns true if a network for a given name DOES NOT exist if the exists parameter is false conversely true. Returns false if a network for a given @@ -1015,9 +1034,11 @@ def validate_network(neutron, name, exists): :param neutron: The neutron client :param name: The expected network name :param exists: Whether or not the network name should exist or not + :param project_id: the associated project ID :return: True/False """ - network = neutron_utils.get_network(neutron, network_name=name) + network = neutron_utils.get_network(neutron, network_name=name, + project_id=project_id) if exists and network: return True if not exists and not network: diff --git a/snaps/openstack/utils/tests/nova_utils_tests.py b/snaps/openstack/utils/tests/nova_utils_tests.py index 9383088..560a9f3 100644 --- a/snaps/openstack/utils/tests/nova_utils_tests.py +++ b/snaps/openstack/utils/tests/nova_utils_tests.py @@ -323,7 +323,7 @@ class NovaUtilsInstanceTests(OSComponentTestCase): self.vm_inst = nova_utils.create_server( self.nova, self.neutron, self.glance, self.instance_settings, - self.image_creator.image_settings) + self.image_creator.image_settings, self.project_id) self.assertIsNotNone(self.vm_inst) @@ -341,7 +341,7 @@ class NovaUtilsInstanceTests(OSComponentTestCase): self.assertTrue(active) vm_inst = nova_utils.get_latest_server_object( - self.nova, self.neutron, self.vm_inst) + self.nova, self.neutron, self.vm_inst, self.project_id) self.assertEqual(self.vm_inst.name, vm_inst.name) self.assertEqual(self.vm_inst.id, vm_inst.id) @@ -453,7 +453,7 @@ class NovaUtilsInstanceVolumeTests(OSComponentTestCase): neutron = neutron_utils.neutron_client(self.os_creds) self.assertIsNotNone(nova_utils.attach_volume( self.nova, neutron, self.instance_creator.get_vm_inst(), - self.volume_creator.get_volume())) + self.volume_creator.get_volume(), self.project_id)) vol_attach = None attached = False @@ -472,7 +472,8 @@ class NovaUtilsInstanceVolumeTests(OSComponentTestCase): self.assertIsNotNone(vol_attach) vm_attach = nova_utils.get_server_object_by_id( - self.nova, neutron, self.instance_creator.get_vm_inst().id) + self.nova, neutron, self.instance_creator.get_vm_inst().id, + self.project_id) # Validate Attachment self.assertIsNotNone(vol_attach) @@ -484,12 +485,13 @@ class NovaUtilsInstanceVolumeTests(OSComponentTestCase): # Detach volume to VM self.assertIsNotNone(nova_utils.detach_volume( self.nova, neutron, self.instance_creator.get_vm_inst(), - self.volume_creator.get_volume())) + self.volume_creator.get_volume(), self.project_id)) vol_detach = cinder_utils.get_volume_by_id( self.cinder, self.volume_creator.get_volume().id) vm_detach = nova_utils.get_server_object_by_id( - self.nova, neutron, self.instance_creator.get_vm_inst().id) + self.nova, neutron, self.instance_creator.get_vm_inst().id, + self.project_id) # Validate Detachment self.assertIsNotNone(vol_detach) @@ -517,7 +519,7 @@ class NovaUtilsInstanceVolumeTests(OSComponentTestCase): with self.assertRaises(NovaException): nova_utils.attach_volume( self.nova, neutron, self.instance_creator.get_vm_inst(), - self.volume_creator.get_volume(), 0) + self.volume_creator.get_volume(), self.project_id, 0) def test_detach_volume_nowait(self): """ @@ -533,11 +535,12 @@ class NovaUtilsInstanceVolumeTests(OSComponentTestCase): neutron = neutron_utils.neutron_client(self.os_creds) nova_utils.attach_volume( self.nova, neutron, self.instance_creator.get_vm_inst(), - self.volume_creator.get_volume()) + self.volume_creator.get_volume(), self.project_id) # Check VmInst for attachment latest_vm = nova_utils.get_server_object_by_id( - self.nova, neutron, self.instance_creator.get_vm_inst().id) + self.nova, neutron, self.instance_creator.get_vm_inst().id, + self.project_id) self.assertEqual(1, len(latest_vm.volume_ids)) # Check Volume for attachment @@ -561,4 +564,4 @@ class NovaUtilsInstanceVolumeTests(OSComponentTestCase): with self.assertRaises(NovaException): nova_utils.detach_volume( self.nova, neutron, self.instance_creator.get_vm_inst(), - self.volume_creator.get_volume(), 0) + self.volume_creator.get_volume(), self.project_id, 0) diff --git a/snaps/openstack/utils/tests/settings_utils_tests.py b/snaps/openstack/utils/tests/settings_utils_tests.py index cbd78d8..5dabe38 100644 --- a/snaps/openstack/utils/tests/settings_utils_tests.py +++ b/snaps/openstack/utils/tests/settings_utils_tests.py @@ -327,7 +327,7 @@ class SettingsUtilsVmInstTests(OSComponentTestCase): self.nova, self.neutron, vm_inst_settings=self.inst_creator.instance_settings) derived_vm_settings = settings_utils.create_vm_inst_config( - self.nova, self.neutron, server) + self.nova, self.neutron, server, self.project_id) self.assertIsNotNone(derived_vm_settings) self.assertIsNotNone(derived_vm_settings.port_settings) self.assertIsNotNone(derived_vm_settings.floating_ip_settings) |