From a9bc4cc9cf2eca1c37fd8829ecf54e3fe0b766ee Mon Sep 17 00:00:00 2001 From: Ross Brattain Date: Mon, 23 Oct 2017 14:51:04 -0700 Subject: NSB: update vfw tc_heat_external tests rename xe0, xe1 to uplink_0, downlink_0 enumerate tgs/vnfs starting from 0. add disable_dhcp Change-Id: Ia4f08b3ad5ab298192c249d04b10a6efbe4f210e Signed-off-by: Ross Brattain (cherry picked from commit b3a48eddc398c23523e379e6838160d456cf4368) --- ...external_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml | 22 ++--- ...al_rfc2544_ipv4_1rule_1flow_64B_trex_4port.yaml | 96 ++++++++++++++++++++++ 2 files changed, 107 insertions(+), 11 deletions(-) create mode 100644 samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_trex_4port.yaml diff --git a/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml index 8f09b1283..b685699cc 100644 --- a/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml +++ b/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml @@ -19,8 +19,8 @@ scenarios: traffic_profile: ../../traffic_profiles/ixia_ipv4_latency.yaml topology: vfw_vnf_topology_ixia.yaml nodes: - tg__0: trafficgen_1.yardstick1 - vnf__0: vnf.yardstick + tg__0: tg_0.traffic_gen + vnf__0: vnf_0.yardstick options: framesize: uplink: {64B: 100} @@ -42,7 +42,7 @@ scenarios: ixia_profile: ../../traffic_profiles/vfw/vfw_ipv4_profile_1flows.ixncfg contexts: # put node context first, so we don't HEAT deploy if node has errors - - name: yardstick1 + - name: traffic_gen type: Node file: ixia.yml - name: yardstick @@ -66,17 +66,17 @@ contexts: networks: mgmt: cidr: '10.0.1.0/24' - xe0: - cidr: '10.0.2.0/24' - vld_id: downlink_0 + uplink_0: + cidr: '10.1.0.0/24' gateway_ip: 'null' provider: true physical_network: phystenant1 - port_security_enabled: False - xe1: - cidr: '10.0.3.0/24' - vld_id: uplink_0 + port_security_enabled: false + enable_dhcp: 'false' + downlink_0: + cidr: '10.2.0.0/24' gateway_ip: 'null' provider: true physical_network: phystenant2 - port_security_enabled: False + port_security_enabled: false + enable_dhcp: 'false' diff --git a/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_trex_4port.yaml b/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_trex_4port.yaml new file mode 100644 index 000000000..2469dc866 --- /dev/null +++ b/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_trex_4port.yaml @@ -0,0 +1,96 @@ +# Copyright (c) 2016-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 +scenarios: +- type: NSPerf + traffic_profile: ../../traffic_profiles/ipv4_throughput-4.yaml + topology: vfw-tg-topology-4port.yaml + nodes: + tg__0: tg_0.traffic_gen + vnf__0: vnf_0.yardstick + options: + framesize: + uplink: {64B: 100} + downlink: {64B: 100} + flow: + src_ip: [{'tg__0': 'xe0'}, {'tg__0': 'xe2'}] + dst_ip: [{'tg__0': 'xe1'}, {'tg__0': 'xe3'}] + count: 1 + traffic_type: 4 + rfc2544: + allowed_drop_rate: 0.0001 - 0.0001 + vnf__0: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 2, worker_config: '1C/1T', worker_threads: 1} + runner: + type: Iteration + iterations: 10 + interval: 35 + ixia_profile: ../../traffic_profiles/vfw/vfw_ipv4_profile_muttiport.ixncfg +contexts: + # put node context first, so we don't HEAT deploy if node has errors + - name: traffic_gen + type: Node + file: ixia.yml + - name: yardstick + image: yardstick-samplevnfs + flavor: + vcpus: 10 + ram: 20480 + disk: 6 + extra_specs: + hw:cpu_sockets: 1 + hw:cpu_cores: 10 + hw:cpu_threads: 1 + user: ubuntu + placement_groups: + pgrp1: + policy: "availability" + servers: + vnf: + floating_ip: true + placement: "pgrp1" + networks: + mgmt: + cidr: '10.0.1.0/24' + uplink_0: + cidr: '10.1.0.0/24' + gateway_ip: 'null' + provider: true + physical_network: phystenant1 + port_security_enabled: false + enable_dhcp: 'false' + downlink_0: + cidr: '10.2.0.0/24' + gateway_ip: 'null' + provider: true + physical_network: phystenant2 + port_security_enabled: false + enable_dhcp: 'false' + uplink_1: + cidr: '10.3.0.0/24' + gateway_ip: 'null' + provider: true + physical_network: phystenant3 + port_security_enabled: false + enable_dhcp: 'false' + downlink_2: + cidr: '10.4.0.0/24' + gateway_ip: 'null' + provider: true + physical_network: phystenant4 + port_security_enabled: false + enable_dhcp: 'false' -- cgit 1.2.3-korg