Add sla_max_avg_duration

Change-Id: I5211b805b5756cc5db94b4ddd4cb135fb19ed333

browbeat-complete.yaml

@@ -63,16 +63,19 @@ rally:
         authentic-keystone:
           enabled: true
           file: rally/keystone/authenticate-keystone-cc.yml
+          sla_max_avg_duration: 6
           sla_max_seconds: 30
           sla_max_failure: 0
         authentic-neutron:
           enabled: true
           file: rally/keystone/authenticate-neutron-cc.yml
+          sla_max_avg_duration: 18
           sla_max_seconds: 30
           sla_max_failure: 0
         authentic-nova:
           enabled: true
           file: rally/keystone/authenticate-nova-cc.yml
+          sla_max_avg_duration: 12
           sla_max_seconds: 30
           sla_max_failure: 0
         create-list-tenant:

browbeat-config.yaml

@@ -51,6 +51,7 @@ rally:
         authentic-keystone:
           enabled: true
           file: rally/keystone/authenticate-keystone-cc.yml
+          sla_max_avg_duration: 1
           sla_max_seconds: 30
           sla_max_failure: 0
         authentic-neutron:

rally/cinder/cinder-create-and-attach-volume-cc.yml

@@ -1,5 +1,6 @@
 {% 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 %}
 ---
@@ -31,6 +32,7 @@
             gigabytes: -1
             volumes: -1
       sla:
+        max_avg_duration: {{sla_max_avg_duration}}
         max_seconds_per_iteration: {{sla_max_seconds}}
         failure_rate:
           max: {{sla_max_failure}}

rally/keystone/authenticate-keystone-cc.yml

@@ -1,3 +1,4 @@
+{% 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 %}
 ---
@@ -16,6 +17,7 @@
         times: {{times}}
         type: "constant"
       sla:
+        max_avg_duration: {{sla_max_avg_duration}}
         max_seconds_per_iteration: {{sla_max_seconds}}
         failure_rate:
           max: {{sla_max_failure}}

rally/keystone/authenticate-neutron-cc.yml

@@ -1,4 +1,5 @@
 {% set repetitions = repetitions or 2 %}
+{% 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 %}
 ---
@@ -18,6 +19,7 @@
         times: {{times}}
         type: "constant"
       sla:
+        max_avg_duration: {{sla_max_avg_duration}}
         max_seconds_per_iteration: {{sla_max_seconds}}
         failure_rate:
           max: {{sla_max_failure}}

rally/keystone/authenticate-nova-cc.yml

@@ -1,4 +1,5 @@
 {% set repetitions = repetitions or 2 %}
+{% 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 %}
 ---
@@ -18,6 +19,7 @@
         times: {{times}}
         type: "constant"
       sla:
+        max_avg_duration: {{sla_max_avg_duration}}
         max_seconds_per_iteration: {{sla_max_seconds}}
         failure_rate:
           max: {{sla_max_failure}}

rally/keystone/keystone-create-list-tenant-cc.yml

@@ -1,3 +1,4 @@
+{% 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 %}
 ---
@@ -16,6 +17,7 @@
         times: {{times}}
         type: "constant"
       sla:
+        max_avg_duration: {{sla_max_avg_duration}}
         max_seconds_per_iteration: {{sla_max_seconds}}
         failure_rate:
           max: {{sla_max_failure}}

rally/keystone/keystone-create-list-user-cc.yml

@@ -1,3 +1,4 @@
+{% 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 %}
 ---
@@ -16,6 +17,7 @@
         times: {{times}}
         type: "constant"
       sla:
+        max_avg_duration: {{sla_max_avg_duration}}
         max_seconds_per_iteration: {{sla_max_seconds}}
         failure_rate:
           max: {{sla_max_failure}}

rally/neutron/neutron-create-list-network-cc.yml

@@ -1,3 +1,4 @@
+{% 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 %}
 ---
@@ -20,6 +21,7 @@
             router: -1
             subnet: -1
       sla:
+        max_avg_duration: {{sla_max_avg_duration}}
         max_seconds_per_iteration: {{sla_max_seconds}}
         failure_rate:
           max: {{sla_max_failure}}

rally/neutron/neutron-create-list-port-cc.yml

@@ -1,4 +1,5 @@
 {% set ports_per_network = ports_per_network or 4 %}
+{% 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 %}
 ---
@@ -22,6 +23,7 @@
             router: -1
             subnet: -1
       sla:
+        max_avg_duration: {{sla_max_avg_duration}}
         max_seconds_per_iteration: {{sla_max_seconds}}
         failure_rate:
           max: {{sla_max_failure}}

rally/neutron/neutron-create-list-router-cc.yml

@@ -1,4 +1,5 @@
 {% set subnets_per_network = subnets_per_network or 2 %}
+{% 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 %}
 ---
@@ -25,6 +26,7 @@
             router: -1
             subnet: -1
       sla:
+        max_avg_duration: {{sla_max_avg_duration}}
         max_seconds_per_iteration: {{sla_max_seconds}}
         failure_rate:
           max: {{sla_max_failure}}

rally/neutron/neutron-create-list-security-group-cc.yml

@@ -1,3 +1,4 @@
+{% 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 %}
 ---
@@ -21,6 +22,7 @@
             subnet: -1
             security_group: -1
       sla:
+        max_avg_duration: {{sla_max_avg_duration}}
         max_seconds_per_iteration: {{sla_max_seconds}}
         failure_rate:
           max: {{sla_max_failure}}

rally/neutron/neutron-create-list-subnet-cc.yml

@@ -1,4 +1,5 @@
 {% set subnets_per_network = subnets_per_network or 2 %}
+{% 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 %}
 ---
@@ -24,6 +25,7 @@
             router: -1
             subnet: -1
       sla:
+        max_avg_duration: {{sla_max_avg_duration}}
         max_seconds_per_iteration: {{sla_max_seconds}}
         failure_rate:
           max: {{sla_max_failure}}

rally/nova/nova-boot-list-cc.yml

@@ -1,5 +1,6 @@
 {% 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 %}
 ---
@@ -28,6 +29,7 @@
             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}}