summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarey, Alan <alan.carey@intel.com>2018-11-09 05:51:35 +0000
committerCarey, Alan <alan.carey@intel.com>2018-11-13 08:15:44 +0000
commitfe1abfff948e66cfc3a897cb6a69dde9c4196780 (patch)
tree9960d3dde879e9fa483feff3ea02ec0a5061fb3c
parent5e72ebaf14b3e414fe9a06bd9c6a0d2a859c7f79 (diff)
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 <alan.carey@intel.com>
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd-2.yaml4
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd-4.yaml (renamed from samples/vnf_samples/nsut/prox/tc_prox_ovs_l2fwd-4.yaml)6
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd_pktTouch-2.yaml (renamed from samples/vnf_samples/nsut/prox/tc_prox_ovs_l2fwd_pktTouch-2.yaml)4
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd_pktTouch-4.yaml (renamed from samples/vnf_samples/nsut/prox/tc_prox_ovs_l2fwd_pktTouch-4.yaml)4
-rw-r--r--samples/vnf_samples/nsut/prox/tc_prox_sriov_l2fwd-2.yaml2
5 files changed, 8 insertions, 12 deletions
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_l2fwd-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd-4.yaml
index f04cb60a5..213d557e3 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_ovs_l2fwd-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd-4.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.
@@ -87,21 +87,25 @@ contexts:
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'
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_ovs_l2fwd_pktTouch-2.yaml b/samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd_pktTouch-2.yaml
index f3b5c4fef..81f867ea3 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_ovs_l2fwd_pktTouch-2.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd_pktTouch-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: ""
- password: ""
servers:
vnf__0:
network_ports:
diff --git a/samples/vnf_samples/nsut/prox/tc_prox_ovs_l2fwd_pktTouch-4.yaml b/samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd_pktTouch-4.yaml
index a2385bd4a..c7e7ba506 100644
--- a/samples/vnf_samples/nsut/prox/tc_prox_ovs_l2fwd_pktTouch-4.yaml
+++ b/samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd_pktTouch-4.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: ""
- password: ""
servers:
vnf__0:
network_ports:
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: