summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliyin <liyin11@huawei.com>2018-03-08 17:54:07 +0000
committerAce Lee <liyin11@huawei.com>2018-03-21 04:16:38 +0000
commited28dadbfd2089362ea13106e21694611e407917 (patch)
tree9ac90dabe4f6c3cbde8cd3d713f3e963c932d210
parent973853de78ebdf312779ba87c72130334ef0c6f3 (diff)
Offline support for bottlenecks project
JIRA: YARDSTICK-1053 Those three yaml files are for bottlenecks support offiline flavor The ssh time out problem will fix in changing the duration time Change-Id: Ifd317404a820d0446ffab5070211e48def1a0d2f Signed-off-by: liyin <liyin11@huawei.com>
-rw-r--r--samples/ping_bottlenecks.yaml11
-rw-r--r--samples/storage_bottlenecks.yaml16
-rw-r--r--samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_bottlenecks_scale_out.yaml123
3 files changed, 144 insertions, 6 deletions
diff --git a/samples/ping_bottlenecks.yaml b/samples/ping_bottlenecks.yaml
index e6fef4259..625d4501a 100644
--- a/samples/ping_bottlenecks.yaml
+++ b/samples/ping_bottlenecks.yaml
@@ -15,6 +15,10 @@ description: >
measure VMs latency using ping;
run_in_parallel: true
{% set stack_num = stack_num or 1 %}
+{% set image_name = image_name or "yardstick-image" %}
+{% set cpu_num = cpu_num or 1 %}
+{% set ram_num = ram_num or 512 %}
+{% set disk_num = disk_num or 7 %}
scenarios:
{% for num in range(stack_num) %}
@@ -34,8 +38,11 @@ contexts:
{% for num in range(stack_num) %}
-
name: demo{{num}}
- image: yardstick-image
- flavor: yardstick-flavor
+ image: {{image_name}}
+ flavor:
+ vcpus: {{cpu_num}}
+ ram: {{ram_num}}
+ disk: {{disk_num}}
user: ubuntu
placement_groups:
diff --git a/samples/storage_bottlenecks.yaml b/samples/storage_bottlenecks.yaml
index 1aa0d7e35..971a307da 100644
--- a/samples/storage_bottlenecks.yaml
+++ b/samples/storage_bottlenecks.yaml
@@ -31,6 +31,11 @@ run_in_parallel: true
{% set numjobs = numjobs or "1" %}
{% set direct = direct or "1" %}
{% set volume_size = volume_size or 50 %}
+{% set image_name = image_name or "yardstick-image" %}
+{% set cpu_num = cpu_num or 1 %}
+{% set ram_num = ram_num or 512 %}
+{% set disk_num = disk_num or 7 %}
+{% set run_time = run_time or 3000 %}
scenarios:
{% for num in range(stack_num) %}
@@ -51,7 +56,7 @@ scenarios:
runner:
type: Duration
- duration: 60
+ duration: {{ run_time }}
interval: 1
{% endfor %}
@@ -59,8 +64,11 @@ contexts:
{% for context_num in range(stack_num) %}
-
name: storage_bottlenecks-{{context_num}}-{{volume_num}}
- image: yardstick-image
- flavor: yardstick-flavor
+ image: {{image_name}}
+ flavor:
+ vcpus: {{cpu_num}}
+ ram: {{ram_num}}
+ disk: {{disk_num}}
user: ubuntu
servers:
@@ -74,4 +82,4 @@ contexts:
test:
cidr: "10.0.1.0/24"
port_security_enabled: true
-{% endfor %} \ No newline at end of file
+{% endfor %}
diff --git a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_bottlenecks_scale_out.yaml b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_bottlenecks_scale_out.yaml
new file mode 100644
index 000000000..fe3595b14
--- /dev/null
+++ b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_bottlenecks_scale_out.yaml
@@ -0,0 +1,123 @@
+# Copyright (c) 2017 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+---
+schema: yardstick:task:0.1
+
+{% set num_vnfs = num_vnfs or 2 %}
+{% set image_name = image_name or "yardstick-samplevnfs" %}
+{% set cpu_num = cpu_num or 10 %}
+{% set ram_num = ram_num or 10240 %}
+{% set disk_num = disk_num or 7 %}
+
+scenarios:
+ - type: NSPerf
+ traffic_profile: ../../traffic_profiles/ipv4_throughput-{{ num_vnfs }}.yaml
+ topology: acl-tg-topology-3node-{{ num_vnfs }}.yaml
+ nodes:
+ tg__0: tg_0.yardstick
+ tg__1: tg_1.yardstick
+{% for vnf_num in range(num_vnfs|int) %}
+ vnf__{{ vnf_num }}: vnf_{{ vnf_num }}.yardstick
+{% endfor %}
+ options:
+ framesize:
+ uplink: {64B: 100}
+ downlink: {64B: 100}
+ flow:
+ src_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+ - {'tg__0': 'xe{{ vnf_num }}'}
+{% endfor %}
+ dst_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+ - {'tg__1': 'xe{{ vnf_num }}'}
+{% endfor %}
+ count: 1
+ traffic_type: 4
+ rfc2544:
+ allowed_drop_rate: 0.0001 - 0.0001
+ correlated_traffic: true
+{% for vnf_num in range(num_vnfs|int) %}
+ vnf__{{ vnf_num }}:
+ rules: acl_1rule.yaml
+ vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1}
+{% endfor %}
+ runner:
+ type: Iteration
+ iterations: 10
+ interval: 35
+context:
+ name: yardstick
+ image: {{ image_name }}
+ flavor:
+ vcpus: {{ cpu_num }}
+ ram: {{ ram_num }}
+ disk: {{ disk_num }}
+ extra_specs:
+ hw:cpu_sockets: 1
+ hw:cpu_cores: {{ cpu_num }}
+ hw:cpu_threads: 1
+ user: ubuntu
+ placement_groups:
+ pgrp1:
+ policy: "availability"
+ servers:
+ tg_0:
+ floating_ip: true
+ placement: "pgrp1"
+ network_ports:
+ mgmt:
+ - mgmt
+{% for vnf_num in range(num_vnfs|int) %}
+ uplink_{{ vnf_num }}:
+ - xe{{ vnf_num }}
+{% endfor %}
+ tg_1:
+ floating_ip: true
+ placement: "pgrp1"
+ network_ports:
+ mgmt:
+ - mgmt
+{% for vnf_num in range(num_vnfs|int) %}
+ downlink_{{ vnf_num }}:
+ - xe{{ vnf_num }}
+{% endfor %}
+{% for vnf_num in range(num_vnfs|int) %}
+ vnf_{{ vnf_num }}:
+ floating_ip: true
+ placement: "pgrp1"
+ network_ports:
+ mgmt:
+ - mgmt
+ uplink_{{ vnf_num }}:
+ - xe0
+ downlink_{{ vnf_num }}:
+ - xe1
+{% endfor %}
+ networks:
+ mgmt:
+ cidr: '10.0.1.0/24'
+{% for vnf_num in range(num_vnfs|int) %}
+ uplink_{{ vnf_num }}:
+ cidr: '10.{{ vnf_num + 1 }}.0.0/24'
+ gateway_ip: 'null'
+ port_security_enabled: False
+ enable_dhcp: 'false'
+ downlink_{{ vnf_num }}:
+ cidr: '10.{{ vnf_num + 1 }}.1.0/24'
+ gateway_ip: 'null'
+ port_security_enabled: False
+ enable_dhcp: 'false'
+{% endfor %}