diff --git a/browbeat-complete.yaml b/browbeat-complete.yaml index 3a2a43e90..2c9dac4d9 100644 --- a/browbeat-complete.yaml +++ b/browbeat-complete.yaml @@ -107,6 +107,28 @@ workloads: flavor_name: m1.tiny sla_max_seconds: 30 sla_max_failure: 0 + + - name: create-and-list-snapshots + enabled: true + size: 1 + file: rally/cinder/cinder-create-and-list-snapshots.yml + sla_max_seconds: 30 + sla_max_failure: 0 + + - name: create-and-list-volume + enabled: true + size: 1 + file: rally/cinder/cinder-create-and-list-volume.yml + sla_max_seconds: 30 + sla_max_failure: 0 + + - name: create-and-update-volume + enabled: true + size: 1 + file: rally/cinder/cinder-create-and-update-volume.yml + sla_max_seconds: 30 + sla_max_failure: 0 + - name: keystonebasic enabled: true type: rally diff --git a/browbeat-config.yaml b/browbeat-config.yaml index a4244ac03..94f0f029a 100644 --- a/browbeat-config.yaml +++ b/browbeat-config.yaml @@ -113,6 +113,21 @@ workloads: flavor_name: m1.tiny file: rally/cinder/cinder-create-and-attach-volume-cc.yml + - name: create-and-list-snapshots + enabled: true + size: 1 + file: rally/cinder/cinder-create-and-list-snapshots.yml + + - name: create-and-list-volume + enabled: true + size: 1 + file: rally/cinder/cinder-create-and-list-volume.yml + + - name: create-and-update-volume + enabled: true + size: 1 + file: rally/cinder/cinder-create-and-update-volume.yml + - name: keystonebasic enabled: false type: rally diff --git a/rally/cinder/cinder-create-and-attach-volume-cc.yml b/rally/cinder/cinder-create-and-attach-volume-cc.yml index 60cb830f9..c0ec60e4a 100644 --- a/rally/cinder/cinder-create-and-attach-volume-cc.yml +++ b/rally/cinder/cinder-create-and-attach-volume-cc.yml @@ -22,8 +22,8 @@ start_cidr: "10.0.0.0/16" networks_per_tenant: 1 users: - tenants: 2 - users_per_tenant: 2 + tenants: 10 + users_per_tenant: 20 quotas: neutron: network: -1 diff --git a/rally/cinder/cinder-create-and-list-snapshots.yml b/rally/cinder/cinder-create-and-list-snapshots.yml new file mode 100644 index 000000000..027d37ed5 --- /dev/null +++ b/rally/cinder/cinder-create-and-list-snapshots.yml @@ -0,0 +1,25 @@ +{% set size = size or 1 %} +{% 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 %} +--- + CinderVolumes.create_and_list_snapshots: + - + args: + force: False + detailed: True + runner: + type: "constant" + times: {{ times }} + concurrency: {{ concurrency }} + context: + users: + tenants: 10 + users_per_tenant: 20 + volumes: + size: {{ size }} + 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/cinder/cinder-create-and-list-volume.yml b/rally/cinder/cinder-create-and-list-volume.yml new file mode 100644 index 000000000..54ebced30 --- /dev/null +++ b/rally/cinder/cinder-create-and-list-volume.yml @@ -0,0 +1,23 @@ +{% set size = size or 1 %} +{% 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 %} +--- + CinderVolumes.create_and_list_volume: + - + args: + size: {{ size }} + detailed: True + runner: + type: "constant" + times: {{ times }} + concurrency: {{ concurrency }} + context: + users: + tenants: 10 + users_per_tenant: 20 + 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/cinder/cinder-create-and-update-volume.yml b/rally/cinder/cinder-create-and-update-volume.yml new file mode 100644 index 000000000..85be701a7 --- /dev/null +++ b/rally/cinder/cinder-create-and-update-volume.yml @@ -0,0 +1,25 @@ +{% set size = size or 1 %} +{% 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 %} +--- + CinderVolumes.create_and_update_volume: + - + args: + update_volume_kwargs: + description: "desc_updated" + create_volume_kwargs: {} + size: {{ size }} + runner: + type: "constant" + times: {{ times }} + concurrency: {{ concurrency }} + context: + users: + tenants: 10 + users_per_tenant: 20 + sla: + max_avg_duration: {{ sla_max_avg_duration }} + max_seconds_per_iteration: {{ sla_max_seconds }} + failure_rate: + max: {{ sla_max_failure }}