From a0e9752c3c2931bd0e748fce565f0fa330a19023 Mon Sep 17 00:00:00 2001 From: Joe Talerico Date: Tue, 20 Sep 2016 06:24:25 -0400 Subject: [PATCH] Adding more Nova Scenarios We ship Nova with only two Scenarios. This commit is to enable other API workloads for Nova. Change-Id: I499853fc1451301b4ec9d50fd9a3460b7d251110 --- browbeat-complete.yaml | 33 ++++++++++++------ browbeat-config.yaml | 31 ++++++++++++----- rally/nova/README.rst | 5 +++ rally/nova/nova-boot-bounce-delete-cc.yml | 41 +++++++++++++++++++++++ rally/nova/nova-boot-list-cc.yml | 2 ++ rally/nova/nova-boot-show-cc.yml | 36 ++++++++++++++++++++ rally/nova/nova-boot-snapshot-cc.yml | 2 ++ rally/nova/nova-lock-unlock-cc.yml | 36 ++++++++++++++++++++ 8 files changed, 168 insertions(+), 18 deletions(-) create mode 100644 rally/nova/nova-boot-bounce-delete-cc.yml create mode 100644 rally/nova/nova-boot-show-cc.yml create mode 100644 rally/nova/nova-lock-unlock-cc.yml diff --git a/browbeat-complete.yaml b/browbeat-complete.yaml index 861719c58..15ac06f07 100644 --- a/browbeat-complete.yaml +++ b/browbeat-complete.yaml @@ -187,23 +187,36 @@ rally: - 96 times: 128 scenarios: - - name: boot-snapshot-delete + - name: boot-snapshot-delete-cirros enabled: true file: rally/nova/nova-boot-snapshot-cc.yml image_name: cirros - flavor_name: m1.tiny - - name: boot-list-centos - enabled: true - file: rally/nova/nova-boot-list-cc.yml - sla_max_seconds: 30 - sla_max_failure: 0 + flavor_name: m1.xtiny + net_id: - name: boot-list-cirros enabled: true image_name: cirros file: rally/nova/nova-boot-list-cc.yml - flavor_name: m1.tiny - sla_max_seconds: 30 - sla_max_failure: 0 + flavor_name: m1.xtiny + net_id: + - name: boot-show-cirros + enabled: true + image_name: cirros + file: rally/nova/nova-boot-show-cc.yml + flavor_name: m1.xtiny + net_id: + - name: boot-bounce-delete-cirros + enabled: true + image_name: cirros + file: rally/nova/nova-boot-bounce-delete-cc.yml + flavor_name: m1.xtiny + net_id: + - name: boot-lock-unlock-cirros + enabled: true + image_name: cirros + file: rally/nova/nova-lock-unlock-cc.yml + flavor_name: m1.xtiny + net_id: - name: glance enabled: true concurrency: diff --git a/browbeat-config.yaml b/browbeat-config.yaml index 4898259cc..cafbfe73d 100644 --- a/browbeat-config.yaml +++ b/browbeat-config.yaml @@ -184,21 +184,36 @@ rally: - 8 times: 10 scenarios: - - name: boot-snapshot-delete + - name: boot-snapshot-delete-cirros enabled: true file: rally/nova/nova-boot-snapshot-cc.yml image_name: cirros - flavor_name: m1.tiny - - name: boot-list-centos - enabled: false - file: rally/nova/nova-boot-list-cc.yml - sla_max_seconds: 30 - sla_max_failure: 0 + flavor_name: m1.xtiny + net_id: - name: boot-list-cirros enabled: true image_name: cirros file: rally/nova/nova-boot-list-cc.yml - flavor_name: m1.tiny + flavor_name: m1.xtiny + net_id: + - name: boot-show-cirros + enabled: true + image_name: cirros + file: rally/nova/nova-boot-show-cc.yml + flavor_name: m1.xtiny + net_id: + - name: boot-bounce-delete-cirros + enabled: true + image_name: cirros + file: rally/nova/nova-boot-bounce-delete-cc.yml + flavor_name: m1.xtiny + net_id: + - name: boot-lock-unlock-cirros + enabled: true + image_name: cirros + file: rally/nova/nova-lock-unlock-cc.yml + flavor_name: m1.xtiny + net_id: - name: glance enabled: true concurrency: diff --git a/rally/nova/README.rst b/rally/nova/README.rst index bb52f3e10..e6a2fad1d 100644 --- a/rally/nova/README.rst +++ b/rally/nova/README.rst @@ -1,2 +1,7 @@ Nova scenarios ============== + +We have one required field to make all these Nova scenario's work*: + net_id - The network ID we should attach all these guests to. + +* The Neutron network(s) MUST be set to --shared. If they are not set to --shared, the Rally workload will fail. diff --git a/rally/nova/nova-boot-bounce-delete-cc.yml b/rally/nova/nova-boot-bounce-delete-cc.yml new file mode 100644 index 000000000..c89463f81 --- /dev/null +++ b/rally/nova/nova-boot-bounce-delete-cc.yml @@ -0,0 +1,41 @@ +{% set image_name = image_name or "centos7" %} +{% set flavor_name = flavor_name or "m1.small" %} +{% set sla_max_avg_duration = sla_max_avg_duration or 60 %} +{% set sla_max_failure = sla_max_failure or 0 %} +{% set sla_max_seconds = sla_max_seconds or 60 %} +--- + NovaServers.boot_and_bounce_server: + - + args: + flavor: + name: {{flavor_name}} + image: + name: {{image_name}} + nics: + - net-id: {{net_id}} + actions: + - hard_reboot: 3 + - soft_reboot: 3 + - stop_start: 3 + - rescue_unrescue: 3 + runner: + concurrency: {{concurrency}} + times: {{times}} + type: "constant" + context: + users: + tenants: 1 + users_per_tenant: 1 + quotas: + neutron: + network: -1 + port: -1 + nova: + instances: -1 + cores: -1 + ram: -1 + sla: + max_avg_duration: {{sla_max_avg_duration}} + max_seconds_per_iteration: {{sla_max_seconds}} + failure_rate: + max: {{sla_max_failure}} diff --git a/rally/nova/nova-boot-list-cc.yml b/rally/nova/nova-boot-list-cc.yml index 8ef49549a..d826c6750 100644 --- a/rally/nova/nova-boot-list-cc.yml +++ b/rally/nova/nova-boot-list-cc.yml @@ -11,6 +11,8 @@ name: {{flavor_name}} image: name: {{image_name}} + nics: + - net-id: {{net_id}} detailed: true runner: concurrency: {{concurrency}} diff --git a/rally/nova/nova-boot-show-cc.yml b/rally/nova/nova-boot-show-cc.yml new file mode 100644 index 000000000..80deb83ac --- /dev/null +++ b/rally/nova/nova-boot-show-cc.yml @@ -0,0 +1,36 @@ +{% set image_name = image_name or "centos7" %} +{% set flavor_name = flavor_name or "m1.small" %} +{% set sla_max_avg_duration = sla_max_avg_duration or 60 %} +{% set sla_max_failure = sla_max_failure or 0 %} +{% set sla_max_seconds = sla_max_seconds or 60 %} +--- + NovaServers.boot_and_show_server: + - + args: + flavor: + name: "{{flavor_name}}" + image: + name: "{{image_name}}" + nics: + - net-id: {{net_id}} + runner: + concurrency: {{concurrency}} + times: {{times}} + type: "constant" + context: + users: + tenants: 1 + users_per_tenant: 1 + quotas: + neutron: + network: -1 + port: -1 + nova: + instances: -1 + cores: -1 + ram: -1 + sla: + max_avg_duration: {{sla_max_avg_duration}} + max_seconds_per_iteration: {{sla_max_seconds}} + failure_rate: + max: {{sla_max_failure}} diff --git a/rally/nova/nova-boot-snapshot-cc.yml b/rally/nova/nova-boot-snapshot-cc.yml index eec63acec..fd60c7d5b 100644 --- a/rally/nova/nova-boot-snapshot-cc.yml +++ b/rally/nova/nova-boot-snapshot-cc.yml @@ -12,6 +12,8 @@ image: name: "{{image_name}}" force_delete: false + nics: + - net-id: {{net_id}} detailed: true runner: concurrency: {{concurrency}} diff --git a/rally/nova/nova-lock-unlock-cc.yml b/rally/nova/nova-lock-unlock-cc.yml new file mode 100644 index 000000000..e7e88fb77 --- /dev/null +++ b/rally/nova/nova-lock-unlock-cc.yml @@ -0,0 +1,36 @@ +{% set image_name = image_name or "centos7" %} +{% set flavor_name = flavor_name or "m1.small" %} +{% set sla_max_avg_duration = sla_max_avg_duration or 60 %} +{% set sla_max_failure = sla_max_failure or 0 %} +{% set sla_max_seconds = sla_max_seconds or 60 %} +--- + NovaServers.boot_lock_unlock_and_delete: + - + args: + flavor: + name: {{flavor_name}} + image: + name: {{image_name}} + nics: + - net-id: {{net_id}} + runner: + concurrency: {{concurrency}} + times: {{times}} + type: "constant" + context: + users: + tenants: 1 + users_per_tenant: 1 + quotas: + neutron: + network: -1 + port: -1 + nova: + instances: -1 + cores: -1 + ram: -1 + sla: + max_avg_duration: {{sla_max_avg_duration}} + max_seconds_per_iteration: {{sla_max_seconds}} + failure_rate: + max: {{sla_max_failure}}