NSB Prox BM test case fixes for scale up

YARDSTICK-839

In a scale-up test the VNF number can start from
0 to MAX (num_vnf-1)

The NSB PROX BM test nodes are currently marked as:
    tg__0: trafficgen_1.yardstick
    vnf__0: vnf.yardstick
They need to be changed to the below:
    tg__0: tg_0.yardstick
    vnf__0: vnf_0.yardstick

Changes done are:
- All BM Prox test cases have tg_0 and vnf_0 as default
  test nodes
- The prox-baremetal-1/2/4.yaml sample pod file
- Cleaned Up some unused Prox test/config files

Change-Id: I819011bcb35eda62b17dd3e1035918918c582b13
Signed-off-by: Abhijit Sinha <abhijit.sinha@intel.com>
(cherry picked from commit 4b0bf9ea920b461b6464d0c6888b3b0bcc9a0004)

1 files changed, 28 insertions, 20 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