diff --git a/rally/neutron/neutron-create-list-network-cc.yml b/rally/neutron/neutron-create-list-network-cc.yml index 155641c64..4835cbe73 100644 --- a/rally/neutron/neutron-create-list-network-cc.yml +++ b/rally/neutron/neutron-create-list-network-cc.yml @@ -1,6 +1,7 @@ {% 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 %} +{% set sla_avg_list_networks = sla_avg_list_networks or 15 %} --- NeutronNetworks.create_and_list_networks: - @@ -25,3 +26,5 @@ max_seconds_per_iteration: {{sla_max_seconds}} failure_rate: max: {{sla_max_failure}} + max_avg_duration_per_atomic: + neutron.list_networks: {{sla_avg_list_networks}} diff --git a/rally/neutron/neutron-create-list-port-cc.yml b/rally/neutron/neutron-create-list-port-cc.yml index 758d6d0a3..149a403d5 100644 --- a/rally/neutron/neutron-create-list-port-cc.yml +++ b/rally/neutron/neutron-create-list-port-cc.yml @@ -1,12 +1,16 @@ {% set ports_per_network = ports_per_network or 4 %} +{% set network_create_args = network_create_args or {} %} +{% set port_create_args = port_create_args or {} %} {% 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 %} +{% set sla_avg_list_ports = sla_avg_list_ports or 15 %} --- NeutronNetworks.create_and_list_ports: - args: - network_create_args: {} + network_create_args: {{network_create_args}} + port_create_args: {{port_create_args}} ports_per_network: {{ports_per_network}} runner: concurrency: {{concurrency}} @@ -27,3 +31,5 @@ max_seconds_per_iteration: {{sla_max_seconds}} failure_rate: max: {{sla_max_failure}} + max_avg_duration_per_atomic: + neutron.list_ports: {{sla_avg_list_ports}} diff --git a/rally/neutron/neutron-create-list-router-cc.yml b/rally/neutron/neutron-create-list-router-cc.yml index a47b5b9d9..9b122b312 100644 --- a/rally/neutron/neutron-create-list-router-cc.yml +++ b/rally/neutron/neutron-create-list-router-cc.yml @@ -1,4 +1,7 @@ {% set subnets_per_network = subnets_per_network or 2 %} +{% set network_create_args = network_create_args or {} %} +{% set subnet_create_args = subnet_create_args or {} %} +{% set subnet_cidr_start = subnet_cidr_start or "10.0.0.0/16" %} {% set router_create_args = router_create_args or {} %} {% set sla_max_avg_duration = sla_max_avg_duration or 60 %} {% set sla_max_failure = sla_max_failure or 0 %} @@ -7,9 +10,9 @@ NeutronNetworks.create_and_list_routers: - args: - network_create_args: {} - subnet_create_args: {} - subnet_cidr_start: "10.0.0.0/16" + network_create_args: {{network_create_args}} + subnet_create_args: {{subnet_create_args}} + subnet_cidr_start: {{subnet_cidr_start}} subnets_per_network: {{subnets_per_network}} router_create_args: {{ router_create_args }} runner: