openstack/rally-openstack
Code Issues Proposed changes

[Bug1535948] Add Heat template validator

Browse Source 
* 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
This commit is contained in:
Roman Vasilets 2016-02-25 16:25:41 +02:00
parent 0f7fc8bcd5
commit d31279c2e4
26 changed files with 57 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rally-jobs/rally-mos.yaml
View File

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

7
rally/plugins/openstack/scenarios/heat/stacks.py
View File

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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