Create a safe rand name for stack name
To avoid the name conflict in integration test.
Change-Id: Ia64e42403f29056008d69aa5c60d396564d66755
diff --git a/telemetry_tempest_plugin/scenario/telemetry_integration_gabbits/autoscaling.yaml b/telemetry_tempest_plugin/scenario/telemetry_integration_gabbits/autoscaling.yaml
index d6eb3d1..900aa76 100644
--- a/telemetry_tempest_plugin/scenario/telemetry_integration_gabbits/autoscaling.yaml
+++ b/telemetry_tempest_plugin/scenario/telemetry_integration_gabbits/autoscaling.yaml
@@ -28,7 +28,7 @@
- name: control stack status
desc: Checks the stack have been created successfully
- url: $ENVIRON['HEAT_SERVICE_URL']/stacks/integration_test
+ url: $ENVIRON['HEAT_SERVICE_URL']/stacks/$ENVIRON['STACK_NAME']
redirects: true
method: GET
status: 200
@@ -99,13 +99,13 @@
count: 30
delay: 1
response_strings:
- - "integration_test-cpu_alarm_high-"
+ - "$ENVIRON['STACK_NAME']-cpu_alarm_high-"
response_json_paths:
$[0].state: alarm
- name: get stack location
desc: Get the stack location
- url: $ENVIRON['HEAT_SERVICE_URL']/stacks/integration_test
+ url: $ENVIRON['HEAT_SERVICE_URL']/stacks/$ENVIRON['STACK_NAME']
method: GET
status: 302
@@ -117,7 +117,7 @@
- name: get deleted stack
desc: Check the stack have been deleted
- url: $ENVIRON['HEAT_SERVICE_URL']/stacks/integration_test
+ url: $ENVIRON['HEAT_SERVICE_URL']/stacks/$ENVIRON['STACK_NAME']
redirects: true
method: GET
poll:
diff --git a/telemetry_tempest_plugin/scenario/telemetry_integration_gabbits/create_stack.json b/telemetry_tempest_plugin/scenario/telemetry_integration_gabbits/create_stack.json
index 126f0c5..429ba49 100644
--- a/telemetry_tempest_plugin/scenario/telemetry_integration_gabbits/create_stack.json
+++ b/telemetry_tempest_plugin/scenario/telemetry_integration_gabbits/create_stack.json
@@ -1,5 +1,5 @@
{
- "stack_name": "integration_test",
+ "stack_name": "$ENVIRON['STACK_NAME']",
"template": {
"heat_template_version": "2013-05-23",
"description": "Integration Test AutoScaling with heat+ceilometer+gnocchi+aodh",
diff --git a/telemetry_tempest_plugin/scenario/test_telemetry_integration.py b/telemetry_tempest_plugin/scenario/test_telemetry_integration.py
index 2fded9f..eb76023 100644
--- a/telemetry_tempest_plugin/scenario/test_telemetry_integration.py
+++ b/telemetry_tempest_plugin/scenario/test_telemetry_integration.py
@@ -13,6 +13,7 @@
import os
from tempest import config
+from tempest.lib.common.utils import data_utils
from tempest.scenario import manager
from telemetry_tempest_plugin.scenario import utils
@@ -97,6 +98,7 @@
"GLANCE_IMAGE_NAME": self.glance_image_create(),
"NOVA_FLAVOR_REF": config.CONF.compute.flavor_ref,
"NEUTRON_NETWORK": networks[0].get('id'),
+ "STACK_NAME": data_utils.rand_name('telemetry'),
})