Merge "Add ability set vm_to_heat_api_insecure parameter"
diff --git a/_modules/runtest/tempest_sections/heat_plugin.py b/_modules/runtest/tempest_sections/heat_plugin.py
index 87f11c4..ec9c089 100644
--- a/_modules/runtest/tempest_sections/heat_plugin.py
+++ b/_modules/runtest/tempest_sections/heat_plugin.py
@@ -56,6 +56,7 @@
'user_domain_name',
'username',
'volume_size',
+ 'vm_to_heat_api_insecure',
]
@property
@@ -281,3 +282,16 @@
@property
def volume_size(self):
pass
+
+ @property
+ def vm_to_heat_api_insecure(self):
+ c = conditions.BaseRule('keystone.client.enabled', 'eq', True)
+ api_v3_enabled = self.get_item_when_condition_match(
+ 'keystone.client.resources.v3.enabled', c)
+ if not api_v3_enabled:
+ if self.get_item_when_condition_match(
+ 'keystone.client.server.identity.service.heat.endpoints.public_protocol', c) == 'https':
+ return True
+ if self.get_item_when_condition_match(
+ 'keystone.client.resources.v3.services.heat.endpoints.heat_public_v1.url', c).startswith('https'):
+ return True
diff --git a/_modules/runtest/tempest_sections/share.py b/_modules/runtest/tempest_sections/share.py
index 339c599..5484148 100644
--- a/_modules/runtest/tempest_sections/share.py
+++ b/_modules/runtest/tempest_sections/share.py
@@ -8,7 +8,7 @@
'min_api_microversion': '2.0',
'max_api_microversion': '2.40'
},
- 'queens':
+ 'queens':
{
'min_api_microversion': '2.0',
'max_api_microversion': '2.42'