From 868177743a4cf5a6af6345a14e2bdbd2aa35af41 Mon Sep 17 00:00:00 2001 From: kairat_kushaev Date: Wed, 4 Feb 2015 16:06:41 +0300 Subject: [PATCH] Add update + add/delete resource cases The patch defines the following complex cases for create-update-delete stack scenario in rally tests for Heat: Case 1: - Heat creates a stack - Heat updates the stack (stack resource is updating and children resource is creating during stack-update) - Heat deletes the stack Case 2: - Heat creates a stack - Heat updates the stack (stack resource is updating and children resource is deleting during stack-update) - Heat deletes the stack Change-Id: I9d420b316ce38fd73f8eb74c0be253ed1a20f7db --- rally-jobs/extra/resource_group.yaml.template | 13 ++++++++ ...ated_resource_group_increase.yaml.template | 16 ++++++++++ ...pdated_resource_group_reduce.yaml.template | 16 ++++++++++ rally-jobs/rally.yaml | 32 +++++++++++++++++++ .../create-update-delete-stack-increase.json | 21 ++++++++++++ .../create-update-delete-stack-increase.yaml | 14 ++++++++ .../create-update-delete-stack-reduce.json | 21 ++++++++++++ .../create-update-delete-stack-reduce.yaml | 14 ++++++++ 8 files changed, 147 insertions(+) create mode 100644 rally-jobs/extra/resource_group.yaml.template create mode 100644 rally-jobs/extra/updated_resource_group_increase.yaml.template create mode 100644 rally-jobs/extra/updated_resource_group_reduce.yaml.template create mode 100644 samples/tasks/scenarios/heat/create-update-delete-stack-increase.json create mode 100644 samples/tasks/scenarios/heat/create-update-delete-stack-increase.yaml create mode 100644 samples/tasks/scenarios/heat/create-update-delete-stack-reduce.json create mode 100644 samples/tasks/scenarios/heat/create-update-delete-stack-reduce.yaml diff --git a/rally-jobs/extra/resource_group.yaml.template b/rally-jobs/extra/resource_group.yaml.template new file mode 100644 index 00000000..b3f505fa --- /dev/null +++ b/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 \ No newline at end of file diff --git a/rally-jobs/extra/updated_resource_group_increase.yaml.template b/rally-jobs/extra/updated_resource_group_increase.yaml.template new file mode 100644 index 00000000..891074eb --- /dev/null +++ b/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 \ No newline at end of file diff --git a/rally-jobs/extra/updated_resource_group_reduce.yaml.template b/rally-jobs/extra/updated_resource_group_reduce.yaml.template new file mode 100644 index 00000000..b4d1d173 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/rally-jobs/rally.yaml b/rally-jobs/rally.yaml index 2c06d8b5..135cb2de 100755 --- a/rally-jobs/rally.yaml +++ b/rally-jobs/rally.yaml @@ -553,6 +553,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: diff --git a/samples/tasks/scenarios/heat/create-update-delete-stack-increase.json b/samples/tasks/scenarios/heat/create-update-delete-stack-increase.json new file mode 100644 index 00000000..027c2477 --- /dev/null +++ b/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 + } + } + } + ] +} diff --git a/samples/tasks/scenarios/heat/create-update-delete-stack-increase.yaml b/samples/tasks/scenarios/heat/create-update-delete-stack-increase.yaml new file mode 100644 index 00000000..6835d526 --- /dev/null +++ b/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 diff --git a/samples/tasks/scenarios/heat/create-update-delete-stack-reduce.json b/samples/tasks/scenarios/heat/create-update-delete-stack-reduce.json new file mode 100644 index 00000000..cf3a2df7 --- /dev/null +++ b/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 + } + } + } + ] +} diff --git a/samples/tasks/scenarios/heat/create-update-delete-stack-reduce.yaml b/samples/tasks/scenarios/heat/create-update-delete-stack-reduce.yaml new file mode 100644 index 00000000..9a973333 --- /dev/null +++ b/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