[Bug1535948] Add Heat template validator

* add heat template validator to the validators.
* add `template_validator` to each Heat scenario with usage of templates
* add missed sla section to some scenarios in mos job
* fix samples - allow them to work from the box

Change-Id: I33aa709a3c4b94cb48c8067df685eee6442c0210
Closes-bug: #1535948

rally-jobs/rally-mos.yaml

@@ -129,6 +129,8 @@
 
   HeatStacks.create_and_list_stack:
     -
+      args:
+        template_path: "~/.rally/extra/default.yaml.template"
       runner:
         type: "constant"
         times: 1
@@ -137,9 +139,14 @@
         users:
           tenants: 1
           users_per_tenant: 1
+      sla:
+        failure_rate:
+          max: 0
 
   HeatStacks.create_and_delete_stack:
     -
+      args:
+        template_path: "~/.rally/extra/default.yaml.template"
       runner:
         type: "constant"
         times: 1
@@ -148,6 +155,9 @@
         users:
           tenants: 1
           users_per_tenant: 1
+      sla:
+        failure_rate:
+          max: 0
 
   Authenticate.keystone:
     -
@@ -534,6 +544,10 @@
           nova:
             security_groups: -1
             security_group_rules: -1
+      sla:
+        failure_rate:
+          max: 0
+
 
 
   NeutronNetworks.create_and_list_networks:

rally/plugins/openstack/scenarios/heat/stacks.py

@@ -25,6 +25,7 @@ class HeatStacks(utils.HeatScenario):
     """Benchmark scenarios for Heat stacks."""
 
     @types.convert(template_path={"type": "file"}, files={"type": "file_dict"})
+    @validation.validate_heat_template("template_path")
     @validation.required_services(consts.Service.HEAT)
     @validation.required_openstack(users=True)
     @scenario.configure(context={"cleanup": ["heat"]})
@@ -56,6 +57,7 @@ class HeatStacks(utils.HeatScenario):
                 self.clients("heat").resources.list(stack.id)
 
     @types.convert(template_path={"type": "file"}, files={"type": "file_dict"})
+    @validation.validate_heat_template("template_path")
     @validation.required_services(consts.Service.HEAT)
     @validation.required_openstack(users=True)
     @scenario.configure(context={"cleanup": ["heat"]})
@@ -77,6 +79,7 @@ class HeatStacks(utils.HeatScenario):
         self._delete_stack(stack)
 
     @types.convert(template_path={"type": "file"}, files={"type": "file_dict"})
+    @validation.validate_heat_template("template_path")
     @validation.required_services(consts.Service.HEAT)
     @validation.required_openstack(users=True)
     @scenario.configure(context={"cleanup": ["heat"]})
@@ -104,6 +107,7 @@ class HeatStacks(utils.HeatScenario):
                    updated_template_path={"type": "file"},
                    files={"type": "file_dict"},
                    updated_files={"type": "file_dict"})
+    @validation.validate_heat_template("template_path")
     @validation.required_services(consts.Service.HEAT)
     @validation.required_openstack(users=True)
     @scenario.configure(context={"cleanup": ["heat"]})
@@ -139,6 +143,7 @@ class HeatStacks(utils.HeatScenario):
         self._delete_stack(stack)
 
     @types.convert(template_path={"type": "file"}, files={"type": "file_dict"})
+    @validation.validate_heat_template("template_path")
     @validation.required_services(consts.Service.HEAT)
     @validation.required_openstack(users=True)
     @scenario.configure(context={"cleanup": ["heat"]})
@@ -176,6 +181,7 @@ class HeatStacks(utils.HeatScenario):
         self._scale_stack(stack, output_key, delta)
 
     @types.convert(template_path={"type": "file"}, files={"type": "file_dict"})
+    @validation.validate_heat_template("template_path")
     @validation.required_services(consts.Service.HEAT)
     @validation.required_openstack(users=True)
     @scenario.configure(context={"cleanup": ["heat"]})
@@ -214,6 +220,7 @@ class HeatStacks(utils.HeatScenario):
                 self.clients("heat").events.list(stack.id)
 
     @types.convert(template_path={"type": "file"}, files={"type": "file_dict"})
+    @validation.validate_heat_template("template_path")
     @validation.required_services(consts.Service.HEAT)
     @validation.required_openstack(users=True)
     @scenario.configure(context={"cleanup": ["heat"]})

samples/tasks/scenarios/heat/create-and-delete-stack.json

@@ -2,7 +2,7 @@
     "HeatStacks.create_and_delete_stack": [
         {
             "args": {
-               "template_path": "templates/default.yaml.template"
+               "template_path": "samples/tasks/scenarios/heat/templates/default.yaml.template"
             },
             "runner": {
                 "type": "constant",

samples/tasks/scenarios/heat/create-and-delete-stack.yaml

@@ -2,7 +2,7 @@
   HeatStacks.create_and_delete_stack:
     -
       args:
-        template_path: "templates/default.yaml.template"
+        template_path: "samples/tasks/scenarios/heat/templates/default.yaml.template"
       runner:
         type: "constant"
         times: 10

samples/tasks/scenarios/heat/create-and-list-stack.json

@@ -2,7 +2,7 @@
     "HeatStacks.create_and_list_stack": [
         {
             "args": {
-               "template_path": "templates/default.yaml.template"
+               "template_path": "samples/tasks/scenarios/heat/templates/default.yaml.template"
             },
             "runner": {
                 "type": "constant",

samples/tasks/scenarios/heat/create-and-list-stack.yaml

@@ -2,7 +2,7 @@
   HeatStacks.create_and_list_stack:
     -
       args:
-        template_path: "templates/default.yaml.template"
+        template_path: "samples/tasks/scenarios/heat/templates/default.yaml.template"
       runner:
         type: "constant"
         times: 10

samples/tasks/scenarios/heat/create-check-delete-stack.json

@@ -2,7 +2,7 @@
     "HeatStacks.create_check_delete_stack": [
         {
             "args": {
-              "template_path": "templates/random_strings.yaml.template"
+              "template_path": "samples/tasks/scenarios/heat/templates/random_strings.yaml.template"
             },
             "runner": {
                 "type": "constant",

samples/tasks/scenarios/heat/create-check-delete-stack.yaml

@@ -2,7 +2,7 @@
   HeatStacks.create_check_delete_stack:
     -
       args:
-        template_path: "templates/random_strings.yaml.template"
+        template_path: "samples/tasks/scenarios/heat/templates/random_strings.yaml.template"
       runner:
         type: "constant"
         times: 10

samples/tasks/scenarios/heat/create-snapshot-restore-delete-stack.json

@@ -2,7 +2,7 @@
     "HeatStacks.create_snapshot_restore_delete_stack": [
         {
             "args": {
-               "template_path": "templates/random_strings.yaml.template"
+               "template_path": "samples/tasks/scenarios/heat/templates/random_strings.yaml.template"
             },
             "runner": {
                 "type": "constant",

samples/tasks/scenarios/heat/create-snapshot-restore-delete-stack.yaml

@@ -2,7 +2,7 @@
   HeatStacks.create_snapshot_restore_delete_stack:
     -
       args:
-        template_path: "templates/random_strings.yaml.template"
+        template_path: "samples/tasks/scenarios/heat/templates/random_strings.yaml.template"
       runner:
         type: "constant"
         times: 10

samples/tasks/scenarios/heat/create-stack-and-scale.json

@@ -2,7 +2,7 @@
   "HeatStacks.create_stack_and_scale": [
     {
       "args": {
-        "template_path": "templates/autoscaling_group.yaml.template",
+        "template_path": "samples/tasks/scenarios/heat/templates/autoscaling_group.yaml.template",
         "output_key": "scaling_url",
         "delta": 1
       },

samples/tasks/scenarios/heat/create-stack-and-scale.yaml

@@ -2,7 +2,7 @@
   HeatStacks.create_stack_and_scale:
     -
       args:
-        template_path: "templates/autoscaling_group.yaml.template"
+        template_path: "samples/tasks/scenarios/heat/templates/autoscaling_group.yaml.template"
         output_key: "scaling_url"
         delta: 1
       runner:

samples/tasks/scenarios/heat/create-suspend-resume-delete-stack.json

@@ -2,7 +2,7 @@
     "HeatStacks.create_suspend_resume_delete_stack": [
         {
             "args": {
-               "template_path": "templates/random_strings.yaml.template"
+               "template_path": "samples/tasks/scenarios/heat/templates/random_strings.yaml.template"
             },
             "runner": {
                 "type": "constant",

samples/tasks/scenarios/heat/create-suspend-resume-delete-stack.yaml

@@ -2,7 +2,7 @@
   HeatStacks.create_suspend_resume_delete_stack:
     -
       args:
-        template_path: "templates/random_strings.yaml.template"
+        template_path: "samples/tasks/scenarios/heat/templates/random_strings.yaml.template"
       runner:
         type: "constant"
         times: 10

samples/tasks/scenarios/heat/create-update-delete-stack-add-res.json

@@ -2,8 +2,8 @@
     "HeatStacks.create_update_delete_stack": [
         {
             "args": {
-               "template_path": "templates/random_strings.yaml.template",
-               "updated_template_path": "templates/updated_random_strings_add.yaml.template"
+               "template_path": "samples/tasks/scenarios/heat/templates/random_strings.yaml.template",
+               "updated_template_path": "samples/tasks/scenarios/heat/templates/updated_random_strings_add.yaml.template"
             },
             "runner": {
                 "type": "constant",

samples/tasks/scenarios/heat/create-update-delete-stack-add-res.yaml

@@ -2,8 +2,8 @@
   HeatStacks.create_update_delete_stack:
     -
       args:
-        template_path: "templates/random_strings.yaml.template"
-        updated_template_path: "templates/updated_random_strings_add.yaml.template"
+        template_path: "samples/tasks/scenarios/heat/templates/random_strings.yaml.template"
+        updated_template_path: "samples/tasks/scenarios/heat/templates/updated_random_strings_add.yaml.template"
       runner:
         type: "constant"
         times: 10

samples/tasks/scenarios/heat/create-update-delete-stack-del-res.json

@@ -2,8 +2,8 @@
     "HeatStacks.create_update_delete_stack": [
         {
             "args": {
-               "template_path": "templates/random_strings.yaml.template",
-               "updated_template_path": "templates/updated_random_strings_delete.yaml.template"
+               "template_path": "samples/tasks/scenarios/heat/templates/random_strings.yaml.template",
+               "updated_template_path": "samples/tasks/scenarios/heat/templates/updated_random_strings_delete.yaml.template"
             },
             "runner": {
                 "type": "constant",

samples/tasks/scenarios/heat/create-update-delete-stack-del-res.yaml

@@ -2,8 +2,8 @@
   HeatStacks.create_update_delete_stack:
     -
       args:
-        template_path: "templates/random_strings.yaml.template"
-        updated_template_path: "templates/updated_random_strings_delete.yaml.template"
+        template_path: "samples/tasks/scenarios/heat/templates/random_strings.yaml.template"
+        updated_template_path: "samples/tasks/scenarios/heat/templates/updated_random_strings_delete.yaml.template"
       runner:
         type: "constant"
         times: 10

samples/tasks/scenarios/heat/create-update-delete-stack-increase.json

@@ -2,8 +2,8 @@
     "HeatStacks.create_update_delete_stack": [
         {
             "args": {
-               "template_path": "templates/resource_group.yaml.template",
-               "updated_template_path": "templates/updated_resource_group_increase.yaml.template"
+               "template_path": "samples/tasks/scenarios/heat/templates/resource_group.yaml.template",
+               "updated_template_path": "samples/tasks/scenarios/heat/templates/updated_resource_group_increase.yaml.template"
             },
             "runner": {
                 "type": "constant",

samples/tasks/scenarios/heat/create-update-delete-stack-increase.yaml

@@ -2,8 +2,8 @@
   HeatStacks.create_update_delete_stack:
     -
       args:
-        template_path: "templates/resource_group.yaml.template"
-        updated_template_path: "templates/updated_resource_group_increase.yaml.template"
+        template_path: "samples/tasks/scenarios/heat/templates/resource_group.yaml.template"
+        updated_template_path: "samples/tasks/scenarios/heat/templates/updated_resource_group_increase.yaml.template"
       runner:
         type: "constant"
         times: 10

samples/tasks/scenarios/heat/create-update-delete-stack-inplace.json

@@ -2,8 +2,8 @@
     "HeatStacks.create_update_delete_stack": [
         {
             "args": {
-               "template_path": "templates/autoscaling_policy.yaml.template",
-               "updated_template_path": "templates/updated_autoscaling_policy_inplace.yaml.template"
+               "template_path": "samples/tasks/scenarios/heat/templates/autoscaling_policy.yaml.template",
+               "updated_template_path": "samples/tasks/scenarios/heat/templates/updated_autoscaling_policy_inplace.yaml.template"
             },
             "runner": {
                 "type": "constant",

samples/tasks/scenarios/heat/create-update-delete-stack-inplace.yaml

@@ -2,8 +2,8 @@
   HeatStacks.create_update_delete_stack:
     -
       args:
-        template_path: "templates/autoscaling_policy.yaml.template"
-        updated_template_path: "templates/updated_autoscaling_policy_inplace.yaml.template"
+        template_path: "samples/tasks/scenarios/heat/templates/autoscaling_policy.yaml.template"
+        updated_template_path: "samples/tasks/scenarios/heat/templates/updated_autoscaling_policy_inplace.yaml.template"
       runner:
         type: "constant"
         times: 10

samples/tasks/scenarios/heat/create-update-delete-stack-reduce.json

@@ -2,8 +2,8 @@
     "HeatStacks.create_update_delete_stack": [
         {
             "args": {
-               "template_path": "templates/resource_group.yaml.template",
-               "updated_template_path": "templates/updated_resource_group_reduce.yaml.template"
+               "template_path": "samples/tasks/scenarios/heat/templates/resource_group.yaml.template",
+               "updated_template_path": "samples/tasks/scenarios/heat/templates/updated_resource_group_reduce.yaml.template"
             },
             "runner": {
                 "type": "constant",

samples/tasks/scenarios/heat/create-update-delete-stack-reduce.yaml

@@ -2,8 +2,8 @@
   HeatStacks.create_update_delete_stack:
     -
       args:
-        template_path: "templates/resource_group.yaml.template"
-        updated_template_path: "templates/updated_resource_group_reduce.yaml.template"
+        template_path: "samples/tasks/scenarios/heat/templates/resource_group.yaml.template"
+        updated_template_path: "samples/tasks/scenarios/heat/templates/updated_resource_group_reduce.yaml.template"
       runner:
         type: "constant"
         times: 10

samples/tasks/scenarios/heat/create-update-delete-stack-replace.json

@@ -2,8 +2,8 @@
     "HeatStacks.create_update_delete_stack": [
         {
             "args": {
-               "template_path": "templates/random_strings.yaml.template",
-               "updated_template_path": "templates/updated_random_strings_replace.yaml.template"
+               "template_path": "samples/tasks/scenarios/heat/templates/random_strings.yaml.template",
+               "updated_template_path": "samples/tasks/scenarios/heat/templates/updated_random_strings_replace.yaml.template"
             },
             "runner": {
                 "type": "constant",

samples/tasks/scenarios/heat/create-update-delete-stack-replace.yaml

@@ -2,8 +2,8 @@
   HeatStacks.create_update_delete_stack:
     -
       args:
-        template_path: "templates/random_strings.yaml.template"
-        updated_template_path: "templates/updated_random_strings_replace.yaml.template"
+        template_path: "samples/tasks/scenarios/heat/templates/random_strings.yaml.template"
+        updated_template_path: "samples/tasks/scenarios/heat/templates/updated_random_strings_replace.yaml.template"
       runner:
         type: "constant"
         times: 10