diff --git a/browbeat-complete.yaml b/browbeat-complete.yaml index dade1f941..382948885 100644 --- a/browbeat-complete.yaml +++ b/browbeat-complete.yaml @@ -36,11 +36,15 @@ rally: create-attach-volume-centos: enabled: true file: rally/cinder/cinder-create-and-attach-volume-cc.yml + sla_max_seconds: 30 + sla_max_failure: 0 create-attach-volume-cirros: enabled: true image_name: cirros file: rally/cinder/cinder-create-and-attach-volume-cc.yml flavor_name: m1.tiny + sla_max_seconds: 30 + sla_max_failure: 0 keystone: enabled: true concurrency: @@ -57,15 +61,23 @@ rally: authentic-keystone: enabled: true file: rally/keystone/authenticate-keystone-cc.yml + sla_max_seconds: 30 + sla_max_failure: 0 authentic-neutron: enabled: true file: rally/keystone/authenticate-neutron-cc.yml + sla_max_seconds: 30 + sla_max_failure: 0 authentic-nova: enabled: true file: rally/keystone/authenticate-nova-cc.yml + sla_max_seconds: 30 + sla_max_failure: 0 create-list-tenant: enabled: true file: rally/keystone/keystone-create-list-tenant-cc.yml + sla_max_seconds: 30 + sla_max_failure: 0 times: 5000 concurrency: - 256 @@ -75,6 +87,8 @@ rally: times: 5000 concurrency: - 256 + sla_max_seconds: 30 + sla_max_failure: 0 nova: enabled: true concurrency: @@ -89,11 +103,15 @@ rally: boot-list-centos: enabled: true file: rally/nova/nova-boot-list-cc.yml + sla_max_seconds: 30 + sla_max_failure: 0 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 neutron: enabled: true concurrency: @@ -106,15 +124,25 @@ rally: create-list-network: enabled: true file: rally/neutron/neutron-create-list-network-cc.yml + sla_max_seconds: 30 + sla_max_failure: 0 create-list-port: enabled: true file: rally/neutron/neutron-create-list-port-cc.yml + sla_max_seconds: 30 + sla_max_failure: 0 create-list-router: enabled: true file: rally/neutron/neutron-create-list-router-cc.yml + sla_max_seconds: 30 + sla_max_failure: 0 create-list-security-group: enabled: true file: rally/neutron/neutron-create-list-security-group-cc.yml + sla_max_seconds: 30 + sla_max_failure: 0 create-list-subnet: enabled: true file: rally/neutron/neutron-create-list-subnet-cc.yml + sla_max_seconds: 30 + sla_max_failure: 0 diff --git a/browbeat-config.yaml b/browbeat-config.yaml index d4e5657cf..7d94c2c4e 100644 --- a/browbeat-config.yaml +++ b/browbeat-config.yaml @@ -33,6 +33,8 @@ rally: create-attach-volume-centos: enabled: false file: rally/cinder/cinder-create-and-attach-volume-cc.yml + sla_max_seconds: 30 + sla_max_failure: 0 create-attach-volume-cirros: enabled: true image_name: cirros @@ -47,6 +49,8 @@ rally: authentic-keystone: enabled: true file: rally/keystone/authenticate-keystone-cc.yml + sla_max_seconds: 30 + sla_max_failure: 0 authentic-neutron: enabled: false file: rally/keystone/authenticate-neutron-cc.yml @@ -68,6 +72,8 @@ rally: boot-list-centos: enabled: false file: rally/nova/nova-boot-list-cc.yml + sla_max_seconds: 30 + sla_max_failure: 0 boot-list-cirros: enabled: true image_name: cirros @@ -82,6 +88,8 @@ rally: create-list-network: enabled: false file: rally/neutron/neutron-create-list-network-cc.yml + sla_max_seconds: 30 + sla_max_failure: 0 create-list-port: enabled: true file: rally/neutron/neutron-create-list-port-cc.yml diff --git a/rally/cinder/cinder-create-and-attach-volume-cc.yml b/rally/cinder/cinder-create-and-attach-volume-cc.yml index e3a6fc8c6..879a0a2a9 100644 --- a/rally/cinder/cinder-create-and-attach-volume-cc.yml +++ b/rally/cinder/cinder-create-and-attach-volume-cc.yml @@ -1,5 +1,7 @@ {% set image_name = image_name or "centos7" %} {% set flavor_name = flavor_name or "m1.small" %} +{% set sla_max_failure = sla_max_failure or 0 %} +{% set sla_max_seconds = sla_max_seconds or 60 %} --- CinderVolumes.create_and_attach_volume: - @@ -28,3 +30,7 @@ cinder: gigabytes: -1 volumes: -1 + sla: + max_seconds_per_iteration: {{sla_max_seconds}} + failure_rate: + max: {{sla_max_failure}} diff --git a/rally/keystone/authenticate-keystone-cc.yml b/rally/keystone/authenticate-keystone-cc.yml index c09924ba3..413f89498 100644 --- a/rally/keystone/authenticate-keystone-cc.yml +++ b/rally/keystone/authenticate-keystone-cc.yml @@ -1,3 +1,5 @@ +{% set sla_max_failure = sla_max_failure or 0 %} +{% set sla_max_seconds = sla_max_seconds or 60 %} --- Authenticate.keystone: - @@ -13,3 +15,7 @@ concurrency: {{concurrency}} times: {{times}} type: "constant" + sla: + max_seconds_per_iteration: {{sla_max_seconds}} + failure_rate: + max: {{sla_max_failure}} diff --git a/rally/keystone/authenticate-neutron-cc.yml b/rally/keystone/authenticate-neutron-cc.yml index 7e0a29a83..8be9d2b25 100644 --- a/rally/keystone/authenticate-neutron-cc.yml +++ b/rally/keystone/authenticate-neutron-cc.yml @@ -1,4 +1,6 @@ {% set repetitions = repetitions or 2 %} +{% set sla_max_failure = sla_max_failure or 0 %} +{% set sla_max_seconds = sla_max_seconds or 60 %} --- Authenticate.validate_neutron: - @@ -15,3 +17,7 @@ concurrency: {{concurrency}} times: {{times}} type: "constant" + sla: + max_seconds_per_iteration: {{sla_max_seconds}} + failure_rate: + max: {{sla_max_failure}} diff --git a/rally/keystone/authenticate-nova-cc.yml b/rally/keystone/authenticate-nova-cc.yml index e64eed74a..c36fa0528 100644 --- a/rally/keystone/authenticate-nova-cc.yml +++ b/rally/keystone/authenticate-nova-cc.yml @@ -1,17 +1,23 @@ {% set repetitions = repetitions or 2 %} +{% set sla_max_failure = sla_max_failure or 0 %} +{% set sla_max_seconds = sla_max_seconds or 60 %} --- - Authenticate.validate_nova: - - - args: + Authenticate.validate_nova: + - + args: repetitions: {{repetitions}} - context: - users: + context: + users: project_domain: "default" resource_management_workers: 30 tenants: 1 user_domain: "default" users_per_tenant: 8 - runner: + runner: concurrency: {{concurrency}} times: {{times}} type: "constant" + sla: + max_seconds_per_iteration: {{sla_max_seconds}} + failure_rate: + max: {{sla_max_failure}} diff --git a/rally/keystone/keystone-create-list-tenant-cc.yml b/rally/keystone/keystone-create-list-tenant-cc.yml index d054db154..bd86352d2 100644 --- a/rally/keystone/keystone-create-list-tenant-cc.yml +++ b/rally/keystone/keystone-create-list-tenant-cc.yml @@ -1,3 +1,5 @@ +{% set sla_max_failure = sla_max_failure or 0 %} +{% set sla_max_seconds = sla_max_seconds or 60 %} --- KeystoneBasic.create_and_list_tenants: - @@ -13,3 +15,7 @@ concurrency: {{concurrency}} times: {{times}} type: "constant" + sla: + max_seconds_per_iteration: {{sla_max_seconds}} + failure_rate: + max: {{sla_max_failure}} diff --git a/rally/keystone/keystone-create-list-user-cc.yml b/rally/keystone/keystone-create-list-user-cc.yml index bb8486955..cd83de00a 100644 --- a/rally/keystone/keystone-create-list-user-cc.yml +++ b/rally/keystone/keystone-create-list-user-cc.yml @@ -1,3 +1,5 @@ +{% set sla_max_failure = sla_max_failure or 0 %} +{% set sla_max_seconds = sla_max_seconds or 60 %} --- KeystoneBasic.create_and_list_users: - @@ -13,3 +15,7 @@ concurrency: {{concurrency}} times: {{times}} type: "constant" + sla: + max_seconds_per_iteration: {{sla_max_seconds}} + failure_rate: + max: {{sla_max_failure}} diff --git a/rally/neutron/neutron-create-list-network-cc.yml b/rally/neutron/neutron-create-list-network-cc.yml index 2e220b5c7..ad6cf265e 100644 --- a/rally/neutron/neutron-create-list-network-cc.yml +++ b/rally/neutron/neutron-create-list-network-cc.yml @@ -1,3 +1,5 @@ +{% set sla_max_failure = sla_max_failure or 0 %} +{% set sla_max_seconds = sla_max_seconds or 60 %} --- NeutronNetworks.create_and_list_networks: - @@ -17,3 +19,7 @@ port: -1 router: -1 subnet: -1 + sla: + max_seconds_per_iteration: {{sla_max_seconds}} + failure_rate: + max: {{sla_max_failure}} diff --git a/rally/neutron/neutron-create-list-port-cc.yml b/rally/neutron/neutron-create-list-port-cc.yml index a52dbb9eb..107070499 100644 --- a/rally/neutron/neutron-create-list-port-cc.yml +++ b/rally/neutron/neutron-create-list-port-cc.yml @@ -1,4 +1,6 @@ {% set ports_per_network = ports_per_network or 4 %} +{% set sla_max_failure = sla_max_failure or 0 %} +{% set sla_max_seconds = sla_max_seconds or 60 %} --- NeutronNetworks.create_and_list_ports: - @@ -19,3 +21,7 @@ port: -1 router: -1 subnet: -1 + sla: + max_seconds_per_iteration: {{sla_max_seconds}} + failure_rate: + max: {{sla_max_failure}} diff --git a/rally/neutron/neutron-create-list-router-cc.yml b/rally/neutron/neutron-create-list-router-cc.yml index eed68f177..a7e39e687 100644 --- a/rally/neutron/neutron-create-list-router-cc.yml +++ b/rally/neutron/neutron-create-list-router-cc.yml @@ -1,4 +1,6 @@ {% set subnets_per_network = subnets_per_network or 2 %} +{% set sla_max_failure = sla_max_failure or 0 %} +{% set sla_max_seconds = sla_max_seconds or 60 %} --- NeutronNetworks.create_and_list_routers: - @@ -22,3 +24,7 @@ port: -1 router: -1 subnet: -1 + sla: + max_seconds_per_iteration: {{sla_max_seconds}} + failure_rate: + max: {{sla_max_failure}} diff --git a/rally/neutron/neutron-create-list-security-group-cc.yml b/rally/neutron/neutron-create-list-security-group-cc.yml index 8473bee45..15debb852 100644 --- a/rally/neutron/neutron-create-list-security-group-cc.yml +++ b/rally/neutron/neutron-create-list-security-group-cc.yml @@ -1,3 +1,5 @@ +{% set sla_max_failure = sla_max_failure or 0 %} +{% set sla_max_seconds = sla_max_seconds or 60 %} --- NeutronSecurityGroup.create_and_list_security_groups: - @@ -18,3 +20,7 @@ router: -1 subnet: -1 security_group: -1 + sla: + max_seconds_per_iteration: {{sla_max_seconds}} + failure_rate: + max: {{sla_max_failure}} diff --git a/rally/neutron/neutron-create-list-subnet-cc.yml b/rally/neutron/neutron-create-list-subnet-cc.yml index 09ad95def..cd5f182f1 100644 --- a/rally/neutron/neutron-create-list-subnet-cc.yml +++ b/rally/neutron/neutron-create-list-subnet-cc.yml @@ -1,4 +1,6 @@ {% set subnets_per_network = subnets_per_network or 2 %} +{% set sla_max_failure = sla_max_failure or 0 %} +{% set sla_max_seconds = sla_max_seconds or 60 %} --- NeutronNetworks.create_and_list_subnets: - @@ -21,3 +23,7 @@ port: -1 router: -1 subnet: -1 + sla: + 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 83b9c55ce..e8253306c 100644 --- a/rally/nova/nova-boot-list-cc.yml +++ b/rally/nova/nova-boot-list-cc.yml @@ -1,5 +1,7 @@ {% set image_name = image_name or "centos7" %} {% set flavor_name = flavor_name or "m1.small" %} +{% set sla_max_failure = sla_max_failure or 0 %} +{% set sla_max_seconds = sla_max_seconds or 60 %} --- NovaServers.boot_and_list_server: - @@ -25,3 +27,7 @@ instances: -1 cores: -1 ram: -1 + sla: + max_seconds_per_iteration: {{sla_max_seconds}} + failure_rate: + max: {{sla_max_failure}}