diff options
Diffstat (limited to 'samples/vnf_samples')
30 files changed, 110 insertions, 365 deletions
diff --git a/samples/vnf_samples/nsut/prox/configs/gen_all-2.cfg b/samples/vnf_samples/nsut/prox/configs/gen_all-2.cfg index ac7f0475f..1ca3f7791 100644 --- a/samples/vnf_samples/nsut/prox/configs/gen_all-2.cfg +++ b/samples/vnf_samples/nsut/prox/configs/gen_all-2.cfg @@ -1,16 +1,17 @@ -; 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. +# 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. +# [eal options] -n=4 ; force number of memory channels @@ -18,36 +19,43 @@ no-output=no ; disable DPDK debug output [port 0] name=p0 -mac=70:00:00:00:00:01 +mac=hardware [port 1] name=p1 -mac=70:00:00:00:00:02 +mac=hardware [defaults] mempool size=4K +[variables] +$sut_mac0=@@dst_mac0 +$sut_mac1=@@dst_mac1 + [global] start time=5 -name=BNG gen +name=Basic Gen + [core 0] mode=master [core 1] -name=cpe0 +name=gen 0 task=0 mode=gen tx port=p0 bps=1250000000 -pkt inline=50 00 00 00 00 01 70 00 00 00 00 01 08 00 45 00 00 1c 00 01 00 00 40 11 f7 7d c0 a8 01 01 c0 a8 01 01 13 88 13 88 00 08 55 7b +; Ethernet + IP + UDP +pkt inline=${sut_mac0} 70 00 00 00 00 01 08 00 45 00 00 1c 00 01 00 00 40 11 f7 7d 00 00 00 01 00 00 00 02 13 88 13 88 00 08 55 7b [core 2] -name=cpe0 +name=gen 1 task=0 mode=gen tx port=p1 bps=1250000000 -pkt inline=50 00 00 00 00 02 70 00 00 00 00 02 08 00 45 00 00 1c 00 01 00 00 40 11 f7 7d c0 a8 01 01 c0 a8 01 01 13 88 13 88 00 08 55 7b +; Ethernet + IP + UDP +pkt inline=${sut_mac1} 70 00 00 00 00 02 08 00 45 00 00 1c 00 01 00 00 40 11 f7 7d 00 00 00 01 00 00 00 03 13 88 13 88 00 08 55 7b [core 3] task=0 diff --git a/samples/vnf_samples/nsut/prox/configs/gen_all-4.cfg b/samples/vnf_samples/nsut/prox/configs/gen_all-4.cfg deleted file mode 100644 index 7a23bf005..000000000 --- a/samples/vnf_samples/nsut/prox/configs/gen_all-4.cfg +++ /dev/null @@ -1,96 +0,0 @@ -; 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. - -[eal options] --n=4 ; force number of memory channels -no-output=no ; disable DPDK debug output - -[port 0] -name=p0 -mac=70:00:00:00:00:01 -[port 1] -name=p1 -mac=70:00:00:00:00:02 -[port 2] -name=p2 -mac=70:00:00:00:00:03 -[port 3] -name=p3 -mac=70:00:00:00:00:04 - - -[defaults] -mempool size=4K - -[global] -start time=5 -name=BNG gen -[core 0] -mode=master - -[core 1] -name=cpe0 -task=0 -mode=gen -tx port=p0 -bps=1250000000 -pkt inline=50 00 00 00 00 01 70 00 00 00 00 01 08 00 45 00 00 1c 00 01 00 00 40 11 f7 7d c0 a8 01 01 c0 a8 01 01 13 88 13 88 00 08 55 7b - -[core 2] -name=cpe0 -task=0 -mode=gen -tx port=p1 -bps=1250000000 -pkt inline=50 00 00 00 00 02 70 00 00 00 00 02 08 00 45 00 00 1c 00 01 00 00 40 11 f7 7d c0 a8 01 01 c0 a8 01 01 13 88 13 88 00 08 55 7b - -[core 3] -name=cpe0 -task=0 -mode=gen -tx port=p2 -bps=1250000000 -pkt inline=50 00 00 00 00 03 70 00 00 00 00 03 08 00 45 00 00 1c 00 01 00 00 40 11 f7 7d c0 a8 01 01 c0 a8 01 01 13 88 13 88 00 08 55 7b - -[core 4] -name=cpe0 -task=0 -mode=gen -tx port=p3 -bps=1250000000 -pkt inline=50 00 00 00 00 04 70 00 00 00 00 04 08 00 45 00 00 1c 00 01 00 00 40 11 f7 7d c0 a8 01 01 c0 a8 01 01 13 88 13 88 00 08 55 7b - -[core 5] -task=0 -mode=lat -rx port=p0 -lat pos=42 - -[core 6] -task=0 -mode=lat -rx port=p1 -lat pos=42 - -[core 7] -task=0 -mode=lat -rx port=p2 -lat pos=42 - -[core 8] -task=0 -mode=lat -rx port=p3 -lat pos=42 diff --git a/samples/vnf_samples/nsut/prox/configs/handle_none-2.cfg b/samples/vnf_samples/nsut/prox/configs/handle_none-2.cfg index 256337bfb..b32e61f12 100644 --- a/samples/vnf_samples/nsut/prox/configs/handle_none-2.cfg +++ b/samples/vnf_samples/nsut/prox/configs/handle_none-2.cfg @@ -1,16 +1,17 @@ -; 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. +# 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. +# [eal options] -n=4 ; force number of memory channels @@ -18,17 +19,18 @@ no-output=no ; disable DPDK debug output [port 0] name=if0 -mac=50:00:00:00:00:01 +mac=hardware + [port 1] name=if1 -mac=50:00:00:00:00:02 +mac=hardware [defaults] mempool size=4K [global] start time=5 -name=Handle None (4x) +name=Handle None (2x) [core 0] mode=master diff --git a/samples/vnf_samples/nsut/prox/configs/handle_none-4.cfg b/samples/vnf_samples/nsut/prox/configs/handle_none-4.cfg deleted file mode 100644 index 26a0aac26..000000000 --- a/samples/vnf_samples/nsut/prox/configs/handle_none-4.cfg +++ /dev/null @@ -1,72 +0,0 @@ -; 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. - -[eal options] --n=4 ; force number of memory channels -no-output=no ; disable DPDK debug output - -[port 0] -name=if0 -mac=50:00:00:00:00:01 -[port 1] -name=if1 -mac=50:00:00:00:00:02 -[port 2] -name=if2 -mac=50:00:00:00:00:03 -[port 3] -name=if3 -mac=50:00:00:00:00:04 - -[defaults] -mempool size=4K - -[global] -start time=5 -name=Handle None (4x) - -[core 0] -mode=master - -[core 1] -name=none -task=0 -mode=none -rx port=if0 -tx port=if1 -drop=no - -[core 2] -name=none -task=0 -mode=none -rx port=if1 -tx port=if0 -drop=no - -[core 3] -name=none -task=0 -mode=none -rx port=if2 -tx port=if3 -drop=no - -[core 4] -name=none -task=0 -mode=none -rx port=if3 -tx port=if2 -drop=no diff --git a/samples/vnf_samples/nsut/prox/prox-baremetal-1.yaml b/samples/vnf_samples/nsut/prox/prox-baremetal-1.yaml index a6c286242..8b0ba3f9c 100644 --- a/samples/vnf_samples/nsut/prox/prox-baremetal-1.yaml +++ b/samples/vnf_samples/nsut/prox/prox-baremetal-1.yaml @@ -16,7 +16,7 @@ nodes: - - name: "trafficgen_1" + name: "tg_0" role: TrafficGen ip: 1.1.1.1 user: "root" @@ -30,8 +30,8 @@ nodes: local_ip: "152.16.100.19" netmask: "255.255.255.0" dpdk_port_num: 0 -- - name: "vnf" +- + name: "vnf_0" role: VNF ip: 1.1.1.2 user: "root" diff --git a/samples/vnf_samples/nsut/prox/prox-baremetal-2.yaml b/samples/vnf_samples/nsut/prox/prox-baremetal-2.yaml index 4f081a7b8..1390e4a67 100644 --- a/samples/vnf_samples/nsut/prox/prox-baremetal-2.yaml +++ b/samples/vnf_samples/nsut/prox/prox-baremetal-2.yaml @@ -16,7 +16,7 @@ nodes: - - name: "trafficgen_1" + name: "tg_0" role: TrafficGen ip: 1.1.1.1 user: "root" @@ -39,7 +39,7 @@ nodes: netmask: "255.255.255.0" dpdk_port_num: 1 - - name: "vnf" + name: "vnf_0" role: VNF ip: 1.1.1.2 user: "root" diff --git a/samples/vnf_samples/nsut/prox/prox-baremetal-4.yaml b/samples/vnf_samples/nsut/prox/prox-baremetal-4.yaml index f9afa9c07..0b0986052 100644 --- a/samples/vnf_samples/nsut/prox/prox-baremetal-4.yaml +++ b/samples/vnf_samples/nsut/prox/prox-baremetal-4.yaml @@ -16,7 +16,7 @@ nodes: - - name: "trafficgen_1" + name: "tg_0" role: TrafficGen ip: 1.1.1.1 user: "root" @@ -52,7 +52,7 @@ nodes: netmask: "255.255.255.0" dpdk_port_num: 3 - - name: "vnf" + name: "vnf_0" role: VNF ip: 1.1.1.2 user: "root" diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-2.yaml index 6972d4008..22216d108 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-2.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-2.yaml @@ -30,8 +30,8 @@ scenarios: topology: prox-tg-topology-2.yaml nodes: - tg__0: trafficgen_1.yardstick - vnf__0: vnf.yardstick + tg__0: tg_0.yardstick + vnf__0: vnf_0.yardstick options: vnf__0: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-4.yaml index d85a483ad..8c6d0a2d7 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_acl-4.yaml @@ -30,8 +30,8 @@ scenarios: topology: prox-tg-topology-4.yaml nodes: - tg__0: trafficgen_1.yardstick - vnf__0: vnf.yardstick + tg__0: tg_0.yardstick + vnf__0: vnf_0.yardstick options: vnf__0: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_binsearch.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_binsearch-2.yaml index b80192363..2abbb9a46 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_binsearch.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_binsearch-2.yaml @@ -22,8 +22,8 @@ scenarios: topology: prox-tg-topology-2.yaml nodes: - tg__0: trafficgen_1.yardstick - vnf__0: vnf.yardstick + tg__0: tg_0.yardstick + vnf__0: vnf_0.yardstick options: vnf__0: @@ -40,9 +40,9 @@ scenarios: "-t": "" runner: - type: Search - interval: 5 - timeout: 1200 + type: Duration + # we kill after duration, independent of test duration, so set this high + duration: 300 context: type: Node diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_bng-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_bng-4.yaml index dd1fc1a27..914bace6c 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_bng-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_bng-4.yaml @@ -22,8 +22,8 @@ scenarios: topology: prox-tg-topology-4.yaml nodes: - tg__0: trafficgen_1.yardstick - vnf__0: vnf.yardstick + tg__0: tg_0.yardstick + vnf__0: vnf_0.yardstick options: vnf__0: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_bng_qos-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_bng_qos-4.yaml index dd04271b5..599a6e09a 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_bng_qos-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_bng_qos-4.yaml @@ -22,8 +22,8 @@ scenarios: topology: prox-tg-topology-4.yaml nodes: - tg__0: trafficgen_1.yardstick - vnf__0: vnf.yardstick + tg__0: tg_0.yardstick + vnf__0: vnf_0.yardstick options: vnf__0: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_buffering-1.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_buffering-1.yaml index 6a019bfff..5cc4f3cc4 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_buffering-1.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_buffering-1.yaml @@ -22,8 +22,8 @@ scenarios: topology: prox-tg-topology-1.yaml nodes: - tg__0: trafficgen_1.yardstick - vnf__0: vnf.yardstick + tg__0: tg_0.yardstick + vnf__0: vnf_0.yardstick options: vnf__0: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-2.yaml index 857c5eda3..b1fef6d45 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-2.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-2.yaml @@ -22,8 +22,8 @@ scenarios: topology: prox-tg-topology-2.yaml nodes: - tg__0: trafficgen_1.yardstick - vnf__0: vnf.yardstick + tg__0: tg_0.yardstick + vnf__0: vnf_0.yardstick options: vnf__0: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-4.yaml index 31f5a3c8b..e17c5c2a1 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd-4.yaml @@ -22,8 +22,8 @@ scenarios: topology: prox-tg-topology-4.yaml nodes: - tg__0: trafficgen_1.yardstick - vnf__0: vnf.yardstick + tg__0: tg_0.yardstick + vnf__0: vnf_0.yardstick options: vnf__0: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_multiflow-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_multiflow-2.yaml index 32fbfa024..0354dc78c 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_multiflow-2.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_multiflow-2.yaml @@ -22,8 +22,8 @@ scenarios: topology: prox-tg-topology-2.yaml nodes: - tg__0: trafficgen_1.yardstick - vnf__0: vnf.yardstick + tg__0: tg_0.yardstick + vnf__0: vnf_0.yardstick options: vnf__0: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_multiflow-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_multiflow-4.yaml index 206a3ff6d..ec49be722 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_multiflow-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_multiflow-4.yaml @@ -22,8 +22,8 @@ scenarios: topology: prox-tg-topology-4.yaml nodes: - tg__0: trafficgen_1.yardstick - vnf__0: vnf.yardstick + tg__0: tg_0.yardstick + vnf__0: vnf_0.yardstick options: vnf__0: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-2.yaml index 1f4695938..8ee90ff93 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-2.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-2.yaml @@ -22,8 +22,8 @@ scenarios: topology: prox-tg-topology-2.yaml nodes: - tg__0: trafficgen_1.yardstick - vnf__0: vnf.yardstick + tg__0: tg_0.yardstick + vnf__0: vnf_0.yardstick options: vnf__0: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-4.yaml index 94f0997e4..94f3a5629 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l2fwd_pktTouch-4.yaml @@ -22,8 +22,8 @@ scenarios: topology: prox-tg-topology-4.yaml nodes: - tg__0: trafficgen_1.yardstick - vnf__0: vnf.yardstick + tg__0: tg_0.yardstick + vnf__0: vnf_0.yardstick options: vnf__0: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-2.yaml index eb194de54..843073343 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-2.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-2.yaml @@ -22,8 +22,8 @@ scenarios: topology: prox-tg-topology-2.yaml nodes: - tg__0: trafficgen_1.yardstick - vnf__0: vnf.yardstick + tg__0: tg_0.yardstick + vnf__0: vnf_0.yardstick options: vnf__0: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-4.yaml index 2f8acce0b..bfc1eead2 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_l3fwd-4.yaml @@ -22,8 +22,8 @@ scenarios: topology: prox-tg-topology-4.yaml nodes: - tg__0: trafficgen_1.yardstick - vnf__0: vnf.yardstick + tg__0: tg_0.yardstick + vnf__0: vnf_0.yardstick options: vnf__0: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_lb-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_lb-4.yaml index 5a02f4aaa..c1969d441 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_lb-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_lb-4.yaml @@ -27,8 +27,8 @@ scenarios: topology: prox-tg-topology-4.yaml nodes: - tg__0: trafficgen_1.yardstick - vnf__0: vnf.yardstick + tg__0: tg_0.yardstick + vnf__0: vnf_0.yardstick options: vnf__0: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_lw_aftr-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_lw_aftr-4.yaml index 1b5d55331..37af37dcc 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_lw_aftr-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_lw_aftr-4.yaml @@ -22,8 +22,8 @@ scenarios: topology: prox-tg-topology-4.yaml nodes: - tg__0: trafficgen_1.yardstick - vnf__0: vnf.yardstick + tg__0: tg_0.yardstick + vnf__0: vnf_0.yardstick options: vnf__0: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-2.yaml index fa8ab97c8..e74e59ada 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-2.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-2.yaml @@ -22,8 +22,8 @@ scenarios: topology: prox-tg-topology-2.yaml nodes: - tg__0: trafficgen_1.yardstick - vnf__0: vnf.yardstick + tg__0: tg_0.yardstick + vnf__0: vnf_0.yardstick options: vnf__0: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-4.yaml index ab915534b..9c5edc117 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_mpls_tagging-4.yaml @@ -22,8 +22,8 @@ scenarios: topology: prox-tg-topology-4.yaml nodes: - tg__0: trafficgen_1.yardstick - vnf__0: vnf.yardstick + tg__0: tg_0.yardstick + vnf__0: vnf_0.yardstick options: vnf__0: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_ramp.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_ramp-2.yaml index 6d96c3ed1..1cf9d809d 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_ramp.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_ramp-2.yaml @@ -22,8 +22,8 @@ scenarios: topology: prox-tg-topology-2.yaml nodes: - tg__0: trafficgen_1.yardstick - vnf__0: vnf.yardstick + tg__0: tg_0.yardstick + vnf__0: vnf_0.yardstick options: vnf__0: @@ -40,10 +40,9 @@ scenarios: "-t": "" runner: - type: Search - # we kill after timeout, independent of test duration, so set this high - interval: 5 - timeout: 1200 + type: Duration + # we kill after duration, independent of test duration, so set this high + duration: 300 context: type: Node diff --git a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_vpe-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_vpe-4.yaml index 295f019c2..16dfa1b32 100644 --- a/samples/vnf_samples/nsut/prox/tc_prox_baremetal_vpe-4.yaml +++ b/samples/vnf_samples/nsut/prox/tc_prox_baremetal_vpe-4.yaml @@ -22,8 +22,8 @@ scenarios: topology: prox-tg-topology-4.yaml nodes: - tg__0: trafficgen_1.yardstick - vnf__0: vnf.yardstick + tg__0: tg_0.yardstick + vnf__0: vnf_0.yardstick options: vnf__0: diff --git a/samples/vnf_samples/nsut/prox/tc_prox_heat_context.yaml b/samples/vnf_samples/nsut/prox/tc_prox_heat_context.yaml deleted file mode 100644 index 9e0654edf..000000000 --- a/samples/vnf_samples/nsut/prox/tc_prox_heat_context.yaml +++ /dev/null @@ -1,79 +0,0 @@ -# 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/prox_binsearch.yaml - topology: prox-tg-topology-2.yaml - - nodes: - tg__0: tg_0.yardstick - vnf__0: vnf_0.yardstick - - options: - vnf__0: - prox_path: /root/dppd-PROX-v035/build/prox - prox_config: "configs/l3-swap-2.cfg" - prox_args: - "-t": "" - - tg__0: - prox_path: /root/dppd-PROX-v035/build/prox - prox_config: "configs/l3-gen-2.cfg" - prox_args: - "-e": "" - "-t": "" - - runner: - type: Duration - # we kill after duration, independent of test duration, so set this high - duration: 600 - -context: - name: yardstick - image: yardstick-samplevnfs - user: ubuntu - flavor: -# name: yardstick-dpdk-flavor - vcpus: 5 - ram: 20480 - disk: 6 - extra_specs: - hw:cpu_sockets: 1 - hw:cpu_cores: 5 - hw:cpu_threads: 1 -# hw:mem_page_size: large - placement_groups: - pgrp1: - policy: "availability" - - servers: - vnf_0: - floating_ip: true - placement: "pgrp1" - tg_0: - floating_ip: true - placement: "pgrp1" - - networks: - mgmt: - cidr: '10.0.1.0/24' - uplink_0: - cidr: '10.0.2.0/24' - downlink_0: - cidr: '10.0.3.0/24' diff --git a/samples/vnf_samples/nsut/vpe/vpe_config/full_tm_profile_10G.cfg b/samples/vnf_samples/nsut/vpe/vpe_config/full_tm_profile_10G.cfg index 502655fd0..8676a0774 100755 --- a/samples/vnf_samples/nsut/vpe/vpe_config/full_tm_profile_10G.cfg +++ b/samples/vnf_samples/nsut/vpe/vpe_config/full_tm_profile_10G.cfg @@ -1,33 +1,16 @@ -; BSD LICENSE +; Copyright (c) 2017 Intel Corporation ; -; Copyright(c) 2010-2014 Intel Corporation. All rights reserved. -; All rights reserved. +; 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 ; -; Redistribution and use in source and binary forms, with or without -; modification, are permitted provided that the following conditions -; are met: +; http://www.apache.org/licenses/LICENSE-2.0 ; -; * Redistributions of source code must retain the above copyright -; notice, this list of conditions and the following disclaimer. -; * Redistributions in binary form must reproduce the above copyright -; notice, this list of conditions and the following disclaimer in -; the documentation and/or other materials provided with the -; distribution. -; * Neither the name of Intel Corporation nor the names of its -; contributors may be used to endorse or promote products derived -; from this software without specific prior written permission. -; -; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -; "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -; LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -; A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -; OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -; SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -; LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -; DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -; THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +; 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. ; This file enables the following hierarchical scheduler configuration for each ; 10GbE output port: diff --git a/samples/vnf_samples/traffic_profiles/prox_mpls_tag_untag.yaml b/samples/vnf_samples/traffic_profiles/prox_mpls_tag_untag.yaml index 9ac6e6ecf..b65fb0526 100644 --- a/samples/vnf_samples/traffic_profiles/prox_mpls_tag_untag.yaml +++ b/samples/vnf_samples/traffic_profiles/prox_mpls_tag_untag.yaml @@ -18,7 +18,7 @@ name: prox_mpls_tag_untag description: MPLS tag/untag for max no-drop throughput over given packet sizes traffic_profile: - traffic_type: ProxMplsTagUntagProfile + traffic_type: ProxBinSearchProfile tolerated_loss: 0.001 test_precision: 0.1 # packet_sizes: [64, 128, 256, 512, 1024, 1280, 1518] |