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>

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 2f5e6ea..e819ffc 100644 (file)
--- 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
similarity index 95%
rename from samples/vnf_samples/nsut/prox/tc_prox_ovs_l2fwd-4.yaml
rename to samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd-4.yaml
index f04cb60..213d557 100644 (file)
--- 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
similarity index 96%
rename from samples/vnf_samples/nsut/prox/tc_prox_ovs_l2fwd_pktTouch-2.yaml
rename to samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd_pktTouch-2.yaml
index f3b5c4f..81f867e 100644 (file)
--- 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
similarity index 97%
rename from samples/vnf_samples/nsut/prox/tc_prox_ovs_l2fwd_pktTouch-4.yaml
rename to samples/vnf_samples/nsut/prox/tc_prox_ovs-dpdk_l2fwd_pktTouch-4.yaml
index a2385bd..c7e7ba5 100644 (file)
--- 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 97a3d5a..ceeb877 100644 (file)
--- 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: