Merge "Add update + add/delete resource cases"

rally-jobs/extra/resource_group.yaml.template

@@ -0,0 +1,13 @@
+heat_template_version: 2014-10-16
+
+description: Test template for rally create-update-delete scenario
+
+resources:
+  test_group:
+    type: OS::Heat::ResourceGroup
+    properties:
+      count: 2
+      resource_def:
+        type: OS::Heat::RandomString
+        properties:
+          length: 20

rally-jobs/extra/updated_resource_group_increase.yaml.template

@@ -0,0 +1,16 @@
+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
+  and adds children resources to that resource.
+
+resources:
+  test_group:
+    type: OS::Heat::ResourceGroup
+    properties:
+      count: 3
+      resource_def:
+        type: OS::Heat::RandomString
+        properties:
+          length: 20

rally-jobs/extra/updated_resource_group_reduce.yaml.template

@@ -0,0 +1,16 @@
+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
+  and deletes children resources from that resource.
+
+resources:
+  test_group:
+    type: OS::Heat::ResourceGroup
+    properties:
+      count: 1
+      resource_def:
+        type: OS::Heat::RandomString
+        properties:
+          length: 20

rally-jobs/rally.yaml

@@ -574,6 +574,38 @@
         failure_rate:
           max: 0
 
+    -
+      args:
+        template_path: "/home/jenkins/.rally/extra/resource_group.yaml.template"
+        updated_template_path: "/home/jenkins/.rally/extra/updated_resource_group_increase.yaml.template"
+      runner:
+        type: "constant"
+        times: 6
+        concurrency: 3
+      context:
+        users:
+          tenants: 2
+          users_per_tenant: 3
+      sla:
+        failure_rate:
+          max: 0
+
+    -
+      args:
+        template_path: "/home/jenkins/.rally/extra/resource_group.yaml.template"
+        updated_template_path: "/home/jenkins/.rally/extra/updated_resource_group_reduce.yaml.template"
+      runner:
+        type: "constant"
+        times: 6
+        concurrency: 3
+      context:
+        users:
+          tenants: 2
+          users_per_tenant: 3
+      sla:
+        failure_rate:
+          max: 0
+
   Authenticate.keystone:
     -
       runner:

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

@@ -0,0 +1,21 @@
+{
+    "HeatStacks.create_update_delete_stack": [
+        {
+            "args": {
+               "template_path": "templates/resource_group.yaml.template",
+               "updated_template_path": "templates/updated_resource_group_increase.yaml.template"
+            },
+            "runner": {
+                "type": "constant",
+                "times": 10,
+                "concurrency": 2
+            },
+            "context": {
+                "users": {
+                    "tenants": 2,
+                    "users_per_tenant": 3
+                }
+            }
+        }
+    ]
+}

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

@@ -0,0 +1,14 @@
+---
+  HeatStacks.create_update_delete_stack:
+    -
+      args:
+        template_path: "templates/resource_group.yaml.template"
+        updated_template_path: "templates/updated_resource_group_increase.yaml.template"
+      runner:
+        type: "constant"
+        times: 10
+        concurrency: 2
+      context:
+        users:
+          tenants: 2
+          users_per_tenant: 3

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

@@ -0,0 +1,21 @@
+{
+    "HeatStacks.create_update_delete_stack": [
+        {
+            "args": {
+               "template_path": "templates/resource_group.yaml.template",
+               "updated_template_path": "templates/updated_resource_group_reduce.yaml.template"
+            },
+            "runner": {
+                "type": "constant",
+                "times": 10,
+                "concurrency": 2
+            },
+            "context": {
+                "users": {
+                    "tenants": 2,
+                    "users_per_tenant": 3
+                }
+            }
+        }
+    ]
+}

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

@@ -0,0 +1,14 @@
+---
+  HeatStacks.create_update_delete_stack:
+    -
+      args:
+        template_path: "templates/resource_group.yaml.template"
+        updated_template_path: "templates/updated_resource_group_reduce.yaml.template"
+      runner:
+        type: "constant"
+        times: 10
+        concurrency: 2
+      context:
+        users:
+          tenants: 2
+          users_per_tenant: 3

samples/tasks/scenarios/heat/templates/resource_group.yaml.template

@@ -0,0 +1,13 @@
+heat_template_version: 2014-10-16
+
+description: Test template for rally create-update-delete scenario
+
+resources:
+  test_group:
+    type: OS::Heat::ResourceGroup
+    properties:
+      count: 2
+      resource_def:
+        type: OS::Heat::RandomString
+        properties:
+          length: 20

samples/tasks/scenarios/heat/templates/updated_resource_group_increase.yaml.template

@@ -0,0 +1,16 @@
+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
+  and adds children resources to that resource.
+
+resources:
+  test_group:
+    type: OS::Heat::ResourceGroup
+    properties:
+      count: 3
+      resource_def:
+        type: OS::Heat::RandomString
+        properties:
+          length: 20

samples/tasks/scenarios/heat/templates/updated_resource_group_reduce.yaml.template

@@ -0,0 +1,16 @@
+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
+  and deletes children resources from that resource.
+
+resources:
+  test_group:
+    type: OS::Heat::ResourceGroup
+    properties:
+      count: 1
+      resource_def:
+        type: OS::Heat::RandomString
+        properties:
+          length: 20