diff options
Diffstat (limited to 'snaps/openstack/tests')
| -rw-r--r-- | snaps/openstack/tests/create_instance_tests.py | 8 | ||||
| -rw-r--r-- | snaps/openstack/tests/create_router_tests.py | 7 | ||||
| -rw-r--r-- | snaps/openstack/tests/os_source_file_test.py | 9 |
3 files changed, 17 insertions, 7 deletions
diff --git a/snaps/openstack/tests/create_instance_tests.py b/snaps/openstack/tests/create_instance_tests.py index 54b6e53..560a2fc 100644 --- a/snaps/openstack/tests/create_instance_tests.py +++ b/snaps/openstack/tests/create_instance_tests.py @@ -475,15 +475,15 @@ class CreateInstanceSimpleTests(OSIntegrationTestCase): self.image_creator.image_settings) vm_inst = self.inst_creator.create() - self.assertEqual(1, len( - nova_utils.get_servers_by_name(self.nova, instance_settings.name))) + self.assertIsNotNone(nova_utils.get_server( + self.nova, vm_inst_settings=instance_settings)) # Delete instance nova_utils.delete_vm_instance(self.nova, vm_inst) self.assertTrue(self.inst_creator.vm_deleted(block=True)) - self.assertEqual(0, len( - nova_utils.get_servers_by_name(self.nova, instance_settings.name))) + self.assertIsNone(nova_utils.get_server( + self.nova, vm_inst_settings=instance_settings)) # Exception should not be thrown self.inst_creator.clean() diff --git a/snaps/openstack/tests/create_router_tests.py b/snaps/openstack/tests/create_router_tests.py index 6e10d66..6f37445 100644 --- a/snaps/openstack/tests/create_router_tests.py +++ b/snaps/openstack/tests/create_router_tests.py @@ -326,6 +326,13 @@ class CreateRouterSuccessTests(OSIntegrationTestCase): self.assertTrue(verify_router_attributes(router, self.router_creator)) + # Instantiate second identical creator to ensure a second router + # has not been created + router_creator2 = create_router.OpenStackRouter( + self.os_creds, router_settings) + router2 = router_creator2.create() + self.assertIsNotNone(self.router_creator.get_router(), router2) + def test_create_router_external_network(self): """ Test creation of a router connected to an external network and a diff --git a/snaps/openstack/tests/os_source_file_test.py b/snaps/openstack/tests/os_source_file_test.py index da474a2..1617f91 100644 --- a/snaps/openstack/tests/os_source_file_test.py +++ b/snaps/openstack/tests/os_source_file_test.py @@ -145,17 +145,20 @@ class OSIntegrationTestCase(OSComponentTestCase): self.role = None if self.use_keystone: - self.keystone = keystone_utils.keystone_client(self.os_creds) + self.keystone = keystone_utils.keystone_client(self.admin_os_creds) guid = self.__class__.__name__ + '-' + str(uuid.uuid4())[:-19] project_name = guid + '-proj' self.project_creator = deploy_utils.create_project( - self.admin_os_creds, ProjectSettings(name=project_name)) + self.admin_os_creds, ProjectSettings( + name=project_name, + domain=self.admin_os_creds.project_domain_name)) self.user_creator = deploy_utils.create_user( self.admin_os_creds, UserSettings( name=guid + '-user', password=guid, project_name=project_name, roles={ - 'admin': self.project_creator.project_settings.name})) + 'admin': self.project_creator.project_settings.name}, + domain_name=self.admin_os_creds.user_domain_name)) self.os_creds = self.user_creator.get_os_creds( self.project_creator.project_settings.name) |