Ensure consistent naming of sample scenarios

Rename sample scenario files so that dash(-) used consistently
instead of underscore (_)

Change-Id: I8e4ccabfc16b32a12a091e6b168b12d25643b028

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

@@ -2,11 +2,11 @@
     "HeatStacks.create_and_delete_stack": [
         {
             "args": {
-               "template_path": "samples/tasks/scenarios/heat/templates/resource_group_server_with_volume.yaml.template",
+               "template_path": "samples/tasks/scenarios/heat/templates/resource-group-server-with-volume.yaml.template",
                "parameters": {
                    "num_instances": 2
                },
-               "files": ["samples/tasks/scenarios/heat/templates/server_with_volume.yaml.template"]
+               "files": ["samples/tasks/scenarios/heat/templates/server-with-volume.yaml.template"]
             },
             "runner": {
                 "type": "constant",

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

@@ -2,10 +2,10 @@
   HeatStacks.create_and_delete_stack:
     -
       args:
-        template_path: "samples/tasks/scenarios/heat/templates/resource_group_server_with_volume.yaml.template"
+        template_path: "samples/tasks/scenarios/heat/templates/resource-group-server-with-volume.yaml.template"
         parameters:
            num_instances: 2
-        files: ["samples/tasks/scenarios/heat/templates/server_with_volume.yaml.template"]
+        files: ["samples/tasks/scenarios/heat/templates/server-with-volume.yaml.template"]
       runner:
         type: "constant"
         times: 3

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

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

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@
   HeatStacks.create_and_delete_stack:
     -
       args:
-        template_path: "samples/tasks/scenarios/heat/templates/server_with_volume.yaml.template"
+        template_path: "samples/tasks/scenarios/heat/templates/server-with-volume.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": "samples/tasks/scenarios/heat/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: "samples/tasks/scenarios/heat/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": "samples/tasks/scenarios/heat/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: "samples/tasks/scenarios/heat/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-list-output-resource-group.json

@@ -2,7 +2,7 @@
     "HeatStacks.create_stack_and_list_output": [
         {
             "args": {
-               "template_path": "samples/tasks/scenarios/heat/templates/resource_group_with_outputs.yaml.template"
+               "template_path": "samples/tasks/scenarios/heat/templates/resource-group-with-outputs.yaml.template"
             },
             "runner": {
                 "type": "constant",
@@ -21,7 +21,7 @@
     "HeatStacks.create_stack_and_list_output_via_API": [
         {
             "args": {
-               "template_path": "samples/tasks/scenarios/heat/templates/resource_group_with_outputs.yaml.template"
+               "template_path": "samples/tasks/scenarios/heat/templates/resource-group-with-outputs.yaml.template"
             },
             "runner": {
                 "type": "constant",

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

@@ -2,7 +2,7 @@
   HeatStacks.create_stack_and_list_output:
     -
       args:
-        template_path: "samples/tasks/scenarios/heat/templates/resource_group_with_outputs.yaml.template"
+        template_path: "samples/tasks/scenarios/heat/templates/resource-group-with-outputs.yaml.template"
       runner:
         type: "constant"
         times: 5
@@ -15,7 +15,7 @@
   HeatStacks.create_stack_and_list_output_via_API:
     -
       args:
-        template_path: "samples/tasks/scenarios/heat/templates/resource_group_with_outputs.yaml.template"
+        template_path: "samples/tasks/scenarios/heat/templates/resource-group-with-outputs.yaml.template"
       runner:
         type: "constant"
         times: 5

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

@@ -2,7 +2,7 @@
   "HeatStacks.create_stack_and_scale": [
     {
       "args": {
-        "template_path": "samples/tasks/scenarios/heat/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: "samples/tasks/scenarios/heat/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-stack-and-show-output-resource-group.json

@@ -2,7 +2,7 @@
     "HeatStacks.create_stack_and_show_output": [
         {
             "args": {
-               "template_path": "samples/tasks/scenarios/heat/templates/resource_group_with_outputs.yaml.template",
+               "template_path": "samples/tasks/scenarios/heat/templates/resource-group-with-outputs.yaml.template",
                "output_key": "val1"
             },
             "runner": {
@@ -22,7 +22,7 @@
     "HeatStacks.create_stack_and_show_output_via_API": [
         {
             "args": {
-               "template_path": "samples/tasks/scenarios/heat/templates/resource_group_with_outputs.yaml.template",
+               "template_path": "samples/tasks/scenarios/heat/templates/resource-group-with-outputs.yaml.template",
                "output_key": "val1"
             },
             "runner": {

samples/tasks/scenarios/heat/create-stack-and-show-output-resource-group.yaml

@@ -2,7 +2,7 @@
   HeatStacks.create_stack_and_show_output:
     -
       args:
-        template_path: "samples/tasks/scenarios/heat/templates/resource_group_with_outputs.yaml.template"
+        template_path: "samples/tasks/scenarios/heat/templates/resource-group-with-outputs.yaml.template"
         output_key: "val1"
       runner:
         type: "constant"
@@ -16,7 +16,7 @@
   HeatStacks.create_stack_and_show_output_via_API:
     -
       args:
-        template_path: "samples/tasks/scenarios/heat/templates/resource_group_with_outputs.yaml.template"
+        template_path: "samples/tasks/scenarios/heat/templates/resource-group-with-outputs.yaml.template"
         output_key: "val1"
       runner:
         type: "constant"

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

@@ -2,7 +2,7 @@
     "HeatStacks.create_suspend_resume_delete_stack": [
         {
             "args": {
-               "template_path": "samples/tasks/scenarios/heat/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: "samples/tasks/scenarios/heat/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": "samples/tasks/scenarios/heat/templates/random_strings.yaml.template",
-               "updated_template_path": "samples/tasks/scenarios/heat/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: "samples/tasks/scenarios/heat/templates/random_strings.yaml.template"
-        updated_template_path: "samples/tasks/scenarios/heat/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": "samples/tasks/scenarios/heat/templates/random_strings.yaml.template",
-               "updated_template_path": "samples/tasks/scenarios/heat/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: "samples/tasks/scenarios/heat/templates/random_strings.yaml.template"
-        updated_template_path: "samples/tasks/scenarios/heat/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": "samples/tasks/scenarios/heat/templates/resource_group.yaml.template",
-               "updated_template_path": "samples/tasks/scenarios/heat/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: "samples/tasks/scenarios/heat/templates/resource_group.yaml.template"
-        updated_template_path: "samples/tasks/scenarios/heat/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": "samples/tasks/scenarios/heat/templates/autoscaling_policy.yaml.template",
-               "updated_template_path": "samples/tasks/scenarios/heat/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: "samples/tasks/scenarios/heat/templates/autoscaling_policy.yaml.template"
-        updated_template_path: "samples/tasks/scenarios/heat/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": "samples/tasks/scenarios/heat/templates/resource_group.yaml.template",
-               "updated_template_path": "samples/tasks/scenarios/heat/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: "samples/tasks/scenarios/heat/templates/resource_group.yaml.template"
-        updated_template_path: "samples/tasks/scenarios/heat/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": "samples/tasks/scenarios/heat/templates/random_strings.yaml.template",
-               "updated_template_path": "samples/tasks/scenarios/heat/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: "samples/tasks/scenarios/heat/templates/random_strings.yaml.template"
-        updated_template_path: "samples/tasks/scenarios/heat/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

samples/tasks/scenarios/heat/templates/resource-group-server-with-volume.yaml.template

@@ -36,9 +36,9 @@ resources:
     properties:
       count: {get_param: num_instances}
       resource_def:
-        type: templates/server_with_volume.yaml.template
+        type: templates/server-with-volume.yaml.template
         properties:
           image: {get_param: instance_image}
           volume_size: {get_param: instance_volume_size}
           flavor: {get_param: instance_flavor}
-          availability_zone: {get_param: instance_availability_zone}
+          availability_zone: {get_param: instance_availability_zone}

samples/tasks/scenarios/heat/templates/updated-random-strings-add.yaml.template

@@ -2,7 +2,7 @@ heat_template_version: 2014-10-16
 
 description: >
   Test template for create-update-delete-stack scenario in rally.
-  The template updates the stack defined by random_strings.yaml.template with additional resource.
+  The template updates the stack defined by random-strings.yaml.template with additional resource.
 
 resources:
   test_string_one:
@@ -16,4 +16,4 @@ resources:
   test_string_three:
     type: OS::Heat::RandomString
     properties:
-      length: 20
+      length: 20

samples/tasks/scenarios/heat/templates/updated-random-strings-delete.yaml.template

@@ -2,10 +2,10 @@ heat_template_version: 2014-10-16
 
 description: >
   Test template for create-update-delete-stack scenario in rally.
-  The template deletes one resource from the stack defined by random_strings.yaml.template.
+  The template deletes one resource from the stack defined by random-strings.yaml.template.
 
 resources:
   test_string_one:
     type: OS::Heat::RandomString
     properties:
-      length: 20
+      length: 20

samples/tasks/scenarios/heat/templates/updated-random-strings-replace.yaml.template

@@ -3,7 +3,7 @@ heat_template_version: 2014-10-16
 description: >
   Test template for create-update-delete-stack scenario in rally.
   The template deletes one resource from the stack defined by
-  random_strings.yaml.template and re-creates it with the updated parameters
+  random-strings.yaml.template and re-creates it with the updated parameters
   (so-called update-replace). That happens because some parameters cannot be
   changed without resource re-creation. The template allows to measure performance
   of update-replace operation.
@@ -16,4 +16,4 @@ resources:
   test_string_two:
     type: OS::Heat::RandomString
     properties:
-      length: 40
+      length: 40

samples/tasks/scenarios/heat/templates/updated-resource-group-increase.yaml.template

@@ -2,7 +2,7 @@ heat_template_version: 2014-10-16
 
 description: >
   Test template for create-update-delete-stack scenario in rally.
-  The template updates one resource from the stack defined by resource_group.yaml.template
+  The template updates one resource from the stack defined by resource-group.yaml.template
   and adds children resources to that resource.
 
 resources:
@@ -13,4 +13,4 @@ resources:
       resource_def:
         type: OS::Heat::RandomString
         properties:
-          length: 20
+          length: 20

samples/tasks/scenarios/heat/templates/updated-resource-group-reduce.yaml.template

@@ -2,7 +2,7 @@ heat_template_version: 2014-10-16
 
 description: >
   Test template for create-update-delete-stack scenario in rally.
-  The template updates one resource from the stack defined by resource_group.yaml.template
+  The template updates one resource from the stack defined by resource-group.yaml.template
   and deletes children resources from that resource.
 
 resources:
@@ -13,4 +13,4 @@ resources:
       resource_def:
         type: OS::Heat::RandomString
         properties:
-          length: 20
+          length: 20