Merge "Add more trunk scenarios"

browbeat-config.yaml

@@ -160,6 +160,29 @@ workloads:
       - name: create-list-subnet
         enabled: true
         file: rally/neutron/neutron-create-list-subnet-cc.yml
+      - name: create-list-trunks
+        enabled: true
+        subport_count: 10
+        file: rally/neutron/neutron-create-list-trunks.yml
+      - name: boot-server-with-subports
+        enabled: true
+        flavor_name: m1.small
+        image_name: centos7
+        subport_count: 10
+        file: rally/neutron/neutron-boot-server-with-subports.yml
+      - name: boot-server-and-add-subports
+        enabled: true
+        flavor_name: m1.small
+        image_name: centos7
+        subport_count: 10
+        file: rally/neutron/neutron-boot-server-and-add-subports.yml
+      - name: boot-server-and-batch-add-subports
+        enabled: true
+        flavor_name: m1.small
+        image_name: centos7
+        subports_per_batch: 10
+        batches: 5
+        file: rally/neutron/neutron-boot-server-and-batch-add-subports.yml
 
   - name: nova
     enabled: true

rally/neutron/neutron-boot-server-and-add-subports.yml

@@ -0,0 +1,40 @@
+{% set flavor_name = flavor_name or "m1.small" %}
+{% set image_name = image_name or "centos7" %}
+{% set subport_count = subport_count or 10 %}
+{% 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 %}
+---
+  NeutronTrunks.boot_server_and_add_subports:
+    -
+      args:
+        flavor:
+            name: {{flavor_name}}
+        image:
+            name: {{image_name}}
+        network_create_args: {}
+        subport_count: {{subport_count}}
+      runner:
+        type: "constant"
+        times: {{times}}
+        concurrency: {{concurrency}}
+      context:
+        users:
+          tenants: 3
+          users_per_tenant: 3
+        quotas:
+          neutron:
+            network: -1
+            subnet: -1
+            port: -1
+            trunk: -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}}
+

rally/neutron/neutron-boot-server-and-batch-add-subports.yml

@@ -0,0 +1,42 @@
+{% set flavor_name = flavor_name or "m1.small" %}
+{% set image_name = image_name or "centos7" %}
+{% set subports_per_batch = subports_per_batch or 10 %}
+{% set batches = batches or 10 %}
+{% 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 %}
+---
+  NeutronTrunks.boot_server_and_batch_add_subports:
+    -
+      args:
+        flavor:
+            name: {{flavor_name}}
+        image:
+            name: {{image_name}}
+        network_create_args: {}
+        subports_per_batch: {{subports_per_batch}}
+        batches: {{batches}}
+      runner:
+        type: "constant"
+        times: {{times}}
+        concurrency: {{concurrency}}
+      context:
+        users:
+          tenants: 3
+          users_per_tenant: 3
+        quotas:
+          neutron:
+            network: -1
+            subnet: -1
+            port: -1
+            trunk: -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}}
+

rally/neutron/neutron-boot-server-with-subports.yml

@@ -0,0 +1,39 @@
+{% set flavor_name = flavor_name or "m1.small" %}
+{% set image_name = image_name or "centos7" %}
+{% set subport_count = subport_count or 10 %}
+{% 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 %}
+---
+  NeutronTrunks.boot_server_with_subports:
+    -
+      args:
+        flavor:
+            name: "{{flavor_name}}"
+        image:
+            name: "{{image_name}}"
+        network_create_args: {}
+        subport_count: {{subport_count}}
+      runner:
+        type: "constant"
+        times: {{times}}
+        concurrency: {{concurrency}}
+      context:
+        users:
+          tenants: 3
+          users_per_tenant: 3
+        quotas:
+          neutron:
+            network: -1
+            subnet: -1
+            port: -1
+            trunk: -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}}

rally/neutron/neutron-create-list-trunks.yml

@@ -1,5 +1,4 @@
-{% set subnets_per_network = subnets_per_network or 2 %}
+{% set subport_count = subport_count or 10 %}
-{% 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 %}
 {% set sla_max_seconds = sla_max_seconds or 60 %}
@@ -8,11 +7,11 @@
     -
       args:
         network_create_args: {}
-        subport_count: 10
+        subport_count: {{subport_count}}
       runner:
         type: "constant"
-        times: 100
+        times: {{times}}
-        concurrency: 10
+        concurrency: {{concurrency}}
       context:
         users:
           tenants: 3