From fe1abfff948e66cfc3a897cb6a69dde9c4196780 Mon Sep 17 00:00:00 2001 From: "Carey, Alan" Date: Fri, 9 Nov 2018 05:51:35 +0000 Subject: Prox standalone test case changes: Files renamed to include dpdk in name. User/Password fields not needed in standalone context. Fix with OvS test case file dpdk port number added. JIRA: YARDSTICK-1500 JIRA: YARDSTICK-1475 JIRA: YARDSTICK-1471 Change-Id: I0422b5341172f098b1ff95b51b6fbc71b1b049f0 Signed-off-by: Carey, Alan --- .../nsut/prox/tc_prox_ovs-dpdk_l2fwd-2.yaml | 4 +- .../nsut/prox/tc_prox_ovs-dpdk_l2fwd-4.yaml | 113 ++++++++++++++++++++ .../prox/tc_prox_ovs-dpdk_l2fwd_pktTouch-2.yaml | 95 +++++++++++++++++ .../prox/tc_prox_ovs-dpdk_l2fwd_pktTouch-4.yaml | 112 ++++++++++++++++++++ .../vnf_samples/nsut/prox/tc_prox_ovs_l2fwd-4.yaml | 109 -------------------- .../nsut/prox/tc_prox_ovs_l2fwd_pktTouch-2.yaml | 97 ------------------ .../nsut/prox/tc_prox_ovs_l2fwd_pktTouch-4.yaml | 114 --------------------- .../nsut/prox/tc_prox_sriov_l2fwd-2.yaml | 2 - 8 files changed, 321 insertions(+), 325 deletions(-) create mode 100644 samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd-4.yaml create mode 100644 samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd_pktTouch-2.yaml create mode 100644 samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd_pktTouch-4.yaml delete mode 100644 samples/vnf_samples/nsut/prox/tc_prox_ovs_l2fwd-4.yaml delete mode 100644 samples/vnf_samples/nsut/prox/tc_prox_ovs_l2fwd_pktTouch-2.yaml delete mode 100644 samples/vnf_samples/nsut/prox/tc_prox_ovs_l2fwd_pktTouch-4.yaml (limited to 'samples/vnf_samples') diff --git a/samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd-2.yaml index 2f5e6ea27..e819ffc21 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd-2.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd-2.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2016-2018 Intel Corporation +# Copyright (c) 2018 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -71,8 +71,6 @@ contexts: hw:cpu_sockets: 1 hw:cpu_cores: 10 hw:cpu_threads: 2 - user: "root" - password: "" servers: vnf_0: network_ports: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd-4.yaml new file mode 100644 index 000000000..213d557e3 --- /dev/null +++ b/samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd-4.yaml @@ -0,0 +1,113 @@ +# Copyright (c) 2018 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/prox_binsearch.yaml + topology: prox-tg-topology-4.yaml + + nodes: + tg__0: tg__0.yardstick + vnf__0: vnf__0.yardstick + + options: + interface_speed_gbps: 10 + + vnf__0: + prox_path: /opt/nsb_bin/prox + prox_config: "configs/handle_l2fwd-4.cfg" + prox_args: + "-t": "" + + tg__0: + prox_path: /opt/nsb_bin/prox + prox_config: "configs/gen_l2fwd-4.cfg" + prox_args: + "-e": "" + "-t": "" + + runner: + type: Duration + # we kill after duration, independent of test duration, so set this high + duration: 300 + +contexts: + - name: yardstick + type: Node + file: prox_tg_bm.yaml + - name: yardstick + type: StandaloneOvsDpdk + file: /etc/yardstick/nodes/standalone/host_ovs.yaml + vm_deploy: True + ovs_properties: + version: + ovs: 2.8.0 + dpdk: 17.05.2 + pmd_threads: 2 + ram: + socket_0: 2048 + socket_1: 2048 + queues: 4 + vpath: "/usr/local" + flavor: + images: "/var/lib/libvirt/images/yardstick-nsb-image.img" + ram: 16384 + extra_specs: + hw:cpu_sockets: 1 + hw:cpu_cores: 10 + hw:cpu_threads: 2 + servers: + vnf__0: + network_ports: + mgmt: + cidr: '1.1.1.62/24' + xe0: + - uplink_0 + xe1: + - downlink_0 + xe2: + - uplink_1 + xe3: + - downlink_1 + + networks: + uplink_0: + port_num: 0 + phy_port: "0000:05:00.0" + vpci: "0000:00:0a.0" + cidr: '152.16.100.10/24' + gateway_ip: '152.16.100.20' + downlink_0: + port_num: 1 + phy_port: "0000:05:00.1" + vpci: "0000:00:0b.0" + cidr: '152.16.40.10/24' + gateway_ip: '152.16.100.20' + uplink_1: + port_num: 2 + phy_port: "0000:05:00.2" + vpci: "0000:00:0c.0" + cidr: '152.16.50.10/24' + gateway_ip: '152.16.100.20' + downlink_1: + port_num: 3 + phy_port: "0000:05:00.3" + vpci: "0000:00:0d.0" + cidr: '152.16.30.10/24' + gateway_ip: '152.16.100.20' + diff --git a/samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd_pktTouch-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd_pktTouch-2.yaml new file mode 100644 index 000000000..81f867ea3 --- /dev/null +++ b/samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd_pktTouch-2.yaml @@ -0,0 +1,95 @@ +# Copyright (c) 2018 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/prox_binsearch.yaml + topology: prox-tg-topology-2.yaml + + nodes: + tg__0: tg__0.yardstick + vnf__0: vnf__0.yardstick + + options: + interface_speed_gbps: 10 + + vnf__0: + prox_path: /opt/nsb_bin/prox + prox_config: "configs/handle_l2fwd_pktTouch-2.cfg" + prox_args: + "-t": "" + + tg__0: + prox_path: /opt/nsb_bin/prox + prox_config: "configs/gen_l2fwd_pktTouch-2.cfg" + prox_args: + "-e": "" + "-t": "" + + runner: + type: Duration + # we kill after duration, independent of test duration, so set this high + duration: 300 + +contexts: + - name: yardstick + type: Node + file: prox_tg_bm.yaml + - name: yardstick + type: StandaloneOvsDpdk + file: /etc/yardstick/nodes/standalone/host_ovs.yaml + vm_deploy: True + ovs_properties: + version: + ovs: 2.8.0 + dpdk: 17.05.2 + pmd_threads: 2 + ram: + socket_0: 2048 + socket_1: 2048 + queues: 4 + vpath: "/usr/local" + flavor: + images: "/var/lib/libvirt/images/yardstick-nsb-image.img" + ram: 16384 + extra_specs: + hw:cpu_sockets: 1 + hw:cpu_cores: 10 + hw:cpu_threads: 2 + servers: + vnf__0: + network_ports: + mgmt: + cidr: '1.1.1.61/24' + xe0: + - uplink_0 + xe1: + - downlink_0 + networks: + uplink_0: + port_num: 0 + phy_port: "0000:05:00.0" + vpci: "0000:00:07.0" + cidr: '152.16.100.10/24' + gateway_ip: '152.16.100.20' + downlink_0: + port_num: 1 + phy_port: "0000:05:00.1" + vpci: "0000:00:08.0" + cidr: '152.16.40.10/24' + gateway_ip: '152.16.100.20' diff --git a/samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd_pktTouch-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd_pktTouch-4.yaml new file mode 100644 index 000000000..c7e7ba506 --- /dev/null +++ b/samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd_pktTouch-4.yaml @@ -0,0 +1,112 @@ +# Copyright (c) 2018 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/prox_binsearch.yaml + topology: prox-tg-topology-4.yaml + + nodes: + tg__0: tg__0.yardstick + vnf__0: vnf__0.yardstick + + options: + interface_speed_gbps: 10 + + vnf__0: + prox_path: /opt/nsb_bin/prox + prox_config: "configs/handle_l2fwd_pktTouch-4.cfg" + prox_args: + "-t": "" + + tg__0: + prox_path: /opt/nsb_bin/prox + prox_config: "configs/gen_l2fwd_pktTouch-4.cfg" + prox_args: + "-e": "" + "-t": "" + + runner: + type: Duration + # we kill after duration, independent of test duration, so set this high + duration: 300 + +contexts: + - name: yardstick + type: Node + file: prox_tg_bm.yaml + - name: yardstick + type: StandaloneOvsDpdk + file: /etc/yardstick/nodes/standalone/host_ovs.yaml + vm_deploy: True + ovs_properties: + version: + ovs: 2.8.0 + dpdk: 17.05.2 + pmd_threads: 2 + ram: + socket_0: 2048 + socket_1: 2048 + queues: 4 + vpath: "/usr/local" + flavor: + images: "/var/lib/libvirt/images/yardstick-nsb-image.img" + ram: 16384 + extra_specs: + hw:cpu_sockets: 1 + hw:cpu_cores: 10 + hw:cpu_threads: 2 + servers: + vnf__0: + network_ports: + mgmt: + cidr: '1.1.1.61/24' + xe0: + - uplink_0 + xe1: + - downlink_0 + xe2: + - uplink_1 + xe3: + - downlink_1 + networks: + uplink_0: + port_num: 0 + phy_port: "0000:05:00.0" + vpci: "0000:00:0a.0" + cidr: '152.16.100.10/24' + gateway_ip: '152.16.100.20' + downlink_0: + port_num: 1 + phy_port: "0000:05:00.1" + vpci: "0000:00:0b.0" + cidr: '152.16.40.10/24' + gateway_ip: '152.16.100.20' + uplink_1: + port_num: 2 + phy_port: "0000:05:00.2" + vpci: "0000:00:0c.0" + cidr: '152.16.50.10/24' + gateway_ip: '152.16.100.20' + downlink_1: + port_num: 3 + phy_port: "0000:05:00.3" + vpci: "0000:00:0d.0" + cidr: '152.16.30.10/24' + gateway_ip: '152.16.100.20' + diff --git a/samples/vnf_samples/nsut/prox/tc_prox_ovs_l2fwd-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_ovs_l2fwd-4.yaml deleted file mode 100644 index f04cb60a5..000000000 --- a/samples/vnf_samples/nsut/prox/tc_prox_ovs_l2fwd-4.yaml +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright (c) 2016-2018 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/prox_binsearch.yaml - topology: prox-tg-topology-4.yaml - - nodes: - tg__0: tg__0.yardstick - vnf__0: vnf__0.yardstick - - options: - interface_speed_gbps: 10 - - vnf__0: - prox_path: /opt/nsb_bin/prox - prox_config: "configs/handle_l2fwd-4.cfg" - prox_args: - "-t": "" - - tg__0: - prox_path: /opt/nsb_bin/prox - prox_config: "configs/gen_l2fwd-4.cfg" - prox_args: - "-e": "" - "-t": "" - - runner: - type: Duration - # we kill after duration, independent of test duration, so set this high - duration: 300 - -contexts: - - name: yardstick - type: Node - file: prox_tg_bm.yaml - - name: yardstick - type: StandaloneOvsDpdk - file: /etc/yardstick/nodes/standalone/host_ovs.yaml - vm_deploy: True - ovs_properties: - version: - ovs: 2.8.0 - dpdk: 17.05.2 - pmd_threads: 2 - ram: - socket_0: 2048 - socket_1: 2048 - queues: 4 - vpath: "/usr/local" - flavor: - images: "/var/lib/libvirt/images/yardstick-nsb-image.img" - ram: 16384 - extra_specs: - hw:cpu_sockets: 1 - hw:cpu_cores: 10 - hw:cpu_threads: 2 - servers: - vnf__0: - network_ports: - mgmt: - cidr: '1.1.1.62/24' - xe0: - - uplink_0 - xe1: - - downlink_0 - xe2: - - uplink_1 - xe3: - - downlink_1 - - networks: - uplink_0: - phy_port: "0000:05:00.0" - vpci: "0000:00:0a.0" - cidr: '152.16.100.10/24' - gateway_ip: '152.16.100.20' - downlink_0: - phy_port: "0000:05:00.1" - vpci: "0000:00:0b.0" - cidr: '152.16.40.10/24' - gateway_ip: '152.16.100.20' - uplink_1: - phy_port: "0000:05:00.2" - vpci: "0000:00:0c.0" - cidr: '152.16.50.10/24' - gateway_ip: '152.16.100.20' - downlink_1: - phy_port: "0000:05:00.3" - vpci: "0000:00:0d.0" - cidr: '152.16.30.10/24' - gateway_ip: '152.16.100.20' - diff --git a/samples/vnf_samples/nsut/prox/tc_prox_ovs_l2fwd_pktTouch-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_ovs_l2fwd_pktTouch-2.yaml deleted file mode 100644 index f3b5c4fef..000000000 --- a/samples/vnf_samples/nsut/prox/tc_prox_ovs_l2fwd_pktTouch-2.yaml +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright (c) 2016-2018 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/prox_binsearch.yaml - topology: prox-tg-topology-2.yaml - - nodes: - tg__0: tg__0.yardstick - vnf__0: vnf__0.yardstick - - options: - interface_speed_gbps: 10 - - vnf__0: - prox_path: /opt/nsb_bin/prox - prox_config: "configs/handle_l2fwd_pktTouch-2.cfg" - prox_args: - "-t": "" - - tg__0: - prox_path: /opt/nsb_bin/prox - prox_config: "configs/gen_l2fwd_pktTouch-2.cfg" - prox_args: - "-e": "" - "-t": "" - - runner: - type: Duration - # we kill after duration, independent of test duration, so set this high - duration: 300 - -contexts: - - name: yardstick - type: Node - file: prox_tg_bm.yaml - - name: yardstick - type: StandaloneOvsDpdk - file: /etc/yardstick/nodes/standalone/host_ovs.yaml - vm_deploy: True - ovs_properties: - version: - ovs: 2.8.0 - dpdk: 17.05.2 - pmd_threads: 2 - ram: - socket_0: 2048 - socket_1: 2048 - queues: 4 - vpath: "/usr/local" - flavor: - images: "/var/lib/libvirt/images/yardstick-nsb-image.img" - ram: 16384 - extra_specs: - hw:cpu_sockets: 1 - hw:cpu_cores: 10 - hw:cpu_threads: 2 - user: "" - password: "" - servers: - vnf__0: - network_ports: - mgmt: - cidr: '1.1.1.61/24' - xe0: - - uplink_0 - xe1: - - downlink_0 - networks: - uplink_0: - port_num: 0 - phy_port: "0000:05:00.0" - vpci: "0000:00:07.0" - cidr: '152.16.100.10/24' - gateway_ip: '152.16.100.20' - downlink_0: - port_num: 1 - phy_port: "0000:05:00.1" - vpci: "0000:00:08.0" - cidr: '152.16.40.10/24' - gateway_ip: '152.16.100.20' diff --git a/samples/vnf_samples/nsut/prox/tc_prox_ovs_l2fwd_pktTouch-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_ovs_l2fwd_pktTouch-4.yaml deleted file mode 100644 index a2385bd4a..000000000 --- a/samples/vnf_samples/nsut/prox/tc_prox_ovs_l2fwd_pktTouch-4.yaml +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright (c) 2016-2018 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/prox_binsearch.yaml - topology: prox-tg-topology-4.yaml - - nodes: - tg__0: tg__0.yardstick - vnf__0: vnf__0.yardstick - - options: - interface_speed_gbps: 10 - - vnf__0: - prox_path: /opt/nsb_bin/prox - prox_config: "configs/handle_l2fwd_pktTouch-4.cfg" - prox_args: - "-t": "" - - tg__0: - prox_path: /opt/nsb_bin/prox - prox_config: "configs/gen_l2fwd_pktTouch-4.cfg" - prox_args: - "-e": "" - "-t": "" - - runner: - type: Duration - # we kill after duration, independent of test duration, so set this high - duration: 300 - -contexts: - - name: yardstick - type: Node - file: prox_tg_bm.yaml - - name: yardstick - type: StandaloneOvsDpdk - file: /etc/yardstick/nodes/standalone/host_ovs.yaml - vm_deploy: True - ovs_properties: - version: - ovs: 2.8.0 - dpdk: 17.05.2 - pmd_threads: 2 - ram: - socket_0: 2048 - socket_1: 2048 - queues: 4 - vpath: "/usr/local" - flavor: - images: "/var/lib/libvirt/images/yardstick-nsb-image.img" - ram: 16384 - extra_specs: - hw:cpu_sockets: 1 - hw:cpu_cores: 10 - hw:cpu_threads: 2 - user: "" - password: "" - servers: - vnf__0: - network_ports: - mgmt: - cidr: '1.1.1.61/24' - xe0: - - uplink_0 - xe1: - - downlink_0 - xe2: - - uplink_1 - xe3: - - downlink_1 - networks: - uplink_0: - port_num: 0 - phy_port: "0000:05:00.0" - vpci: "0000:00:0a.0" - cidr: '152.16.100.10/24' - gateway_ip: '152.16.100.20' - downlink_0: - port_num: 1 - phy_port: "0000:05:00.1" - vpci: "0000:00:0b.0" - cidr: '152.16.40.10/24' - gateway_ip: '152.16.100.20' - uplink_1: - port_num: 2 - phy_port: "0000:05:00.2" - vpci: "0000:00:0c.0" - cidr: '152.16.50.10/24' - gateway_ip: '152.16.100.20' - downlink_1: - port_num: 3 - phy_port: "0000:05:00.3" - vpci: "0000:00:0d.0" - cidr: '152.16.30.10/24' - gateway_ip: '152.16.100.20' - diff --git a/samples/vnf_samples/nsut/prox/tc_prox_sriov_l2fwd-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_sriov_l2fwd-2.yaml index 97a3d5af3..ceeb877f8 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_sriov_l2fwd-2.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_sriov_l2fwd-2.yaml @@ -61,8 +61,6 @@ contexts: hw:cpu_sockets: 1 hw:cpu_cores: 10 hw:cpu_threads: 2 - user: "" - password: "" servers: vnf_0: network_ports: -- cgit 1.2.3-korg