diff options
| -rw-r--r-- | snaps/openstack/tests/create_stack_tests.py | 2 | ||||
| -rw-r--r-- | snaps/openstack/tests/heat/agent-group.yaml | 8 | ||||
| -rw-r--r-- | snaps/openstack/tests/heat/agent.yaml | 1 | ||||
| -rw-r--r-- | snaps/openstack/utils/keystone_utils.py | 7 | ||||
| -rw-r--r-- | snaps/openstack/utils/tests/keystone_utils_tests.py | 7 |
5 files changed, 17 insertions, 8 deletions
diff --git a/snaps/openstack/tests/create_stack_tests.py b/snaps/openstack/tests/create_stack_tests.py index 6041735..7155a29 100644 --- a/snaps/openstack/tests/create_stack_tests.py +++ b/snaps/openstack/tests/create_stack_tests.py @@ -536,9 +536,11 @@ class CreateStackNestedResourceTests(OSIntegrationTestCase): self.flavor_creator.create() env_values = { + 'network_name': self.guid + '-network', 'public_network': self.ext_net_name, 'agent_image': self.image_creator.image_settings.name, 'agent_flavor': self.flavor_creator.flavor_settings.name, + 'key_name': self.guid + '-key', } heat_tmplt_path = pkg_resources.resource_filename( diff --git a/snaps/openstack/tests/heat/agent-group.yaml b/snaps/openstack/tests/heat/agent-group.yaml index 540ea93..4b97495 100644 --- a/snaps/openstack/tests/heat/agent-group.yaml +++ b/snaps/openstack/tests/heat/agent-group.yaml @@ -41,6 +41,10 @@ parameters: availability_zone: type: string default: nova + network_name: + type: string + key_name: + type: string resources: slaves: @@ -66,7 +70,7 @@ resources: network: type: OS::Neutron::Net properties: - name: network + name: { get_param: agent_count } subnet: type: OS::Neutron::Subnet @@ -91,7 +95,7 @@ resources: type: OS::Nova::KeyPair properties: save_private_key: true - name: agent_keypair + name: { get_param: key_name } open_security_group: type: OS::Neutron::SecurityGroup diff --git a/snaps/openstack/tests/heat/agent.yaml b/snaps/openstack/tests/heat/agent.yaml index 014b14f..8ac0660 100644 --- a/snaps/openstack/tests/heat/agent.yaml +++ b/snaps/openstack/tests/heat/agent.yaml @@ -25,7 +25,6 @@ parameters: default: 'Ubuntu 16.04' key_name: type: string - default: test_key username: type: string default: test_user diff --git a/snaps/openstack/utils/keystone_utils.py b/snaps/openstack/utils/keystone_utils.py index b8769c0..6262d06 100644 --- a/snaps/openstack/utils/keystone_utils.py +++ b/snaps/openstack/utils/keystone_utils.py @@ -381,9 +381,10 @@ def get_domain_by_id(keystone, domain_id): :param domain_id: the domain ID to retrieve :return: the SNAPS-OO Domain domain object """ - domain = keystone.domains.get(domain_id) - if domain: - return Domain(name=domain.name, domain_id=domain.id) + if keystone.version != V2_VERSION_STR: + domain = keystone.domains.get(domain_id) + if domain: + return Domain(name=domain.name, domain_id=domain.id) def __get_os_domain_by_name(keystone, domain_name): diff --git a/snaps/openstack/utils/tests/keystone_utils_tests.py b/snaps/openstack/utils/tests/keystone_utils_tests.py index b7f024d..2916003 100644 --- a/snaps/openstack/utils/tests/keystone_utils_tests.py +++ b/snaps/openstack/utils/tests/keystone_utils_tests.py @@ -124,8 +124,11 @@ class KeystoneUtilsTests(OSComponentTestCase): domain = keystone_utils.get_domain_by_id( self.keystone, project.domain_id) - self.assertIsNotNone(domain) - self.assertEqual(domain.id, project.domain_id) + if self.keystone.version == keystone_utils.V2_VERSION_STR: + self.assertIsNone(domain) + else: + self.assertIsNotNone(domain) + self.assertEqual(domain.id, project.domain_id) def test_get_endpoint_success(self): """ |