NSB: count from 0, vnf_0, tg_9, private->uplink, public->downlink

Also rename private to uplink, public to downlink

for scale-out template we need to count from 0
so we can use range() without +1/-1 errors

vnf_0, vnf_1
tg_0, tg_1

also fix Ixia defaults

Change-Id: I6aecfbb95f99af20f012a9df19c19be77d1b5b77
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Edward MacGillivray <edward.s.macgillivray@intel.com>

7 files changed, 21 insertions, 21 deletions

diff --git a/samples/vnf_samples/nsut/prox/ovs-dpdk/http_tests/tc_FileSize-1K_Requests-1M_Concurrency-100.yaml b/samples/vnf_samples/nsut/prox/ovs-dpdk/http_tests/tc_FileSize-1K_Requests-1M_Concurrency-100.yaml
index 4695f0bfe..73fea8122 100644
--- a/samples/vnf_samples/nsut/prox/ovs-dpdk/http_tests/tc_FileSize-1K_Requests-1M_Concurrency-100.yaml
+++ b/samples/vnf_samples/nsut/prox/ovs-dpdk/http_tests/tc_FileSize-1K_Requests-1M_Concurrency-100.yaml
@@ -22,9 +22,9 @@ scenarios:
   topology: ../../acl-tg-topology-http.yaml
 
   nodes:
-    vnf__1: vnf.yardstick
-    tg__1: trafficgen_1.yardstick
-    tg__2: trafficgen_2.yardstick
+    vnf__0: vnf.yardstick
+    tg__0: trafficgen_1.yardstick
+    tg__1: trafficgen_2.yardstick
 
   options:
     acl:
diff --git a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_1518B_packetsize.yaml b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_1518B_packetsize.yaml
index f08289de9..0ca0005b2 100644
--- a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_1518B_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_1518B_packetsize.yaml
@@ -19,9 +19,9 @@ scenarios:
   traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
   topology: ../../acl-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
-    tg__2: trafficgen_2.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
+    tg__1: trafficgen_2.yardstick
   tc_options:
     rfc2544:
       allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_64B_packetsize.yaml b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_64B_packetsize.yaml
index 92f367855..d51b42f84 100644
--- a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_64B_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_64B_packetsize.yaml
@@ -19,9 +19,9 @@ scenarios:
   traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
   topology: ../../acl-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
-    tg__2: trafficgen_2.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
+    tg__1: trafficgen_2.yardstick
   tc_options:
     rfc2544:
       allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_IMIX_packetsize.yaml b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_IMIX_packetsize.yaml
index bc6ea4d2b..37da8e6c7 100644
--- a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_IMIX_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_1rule_1flow_IMIX_packetsize.yaml
@@ -19,9 +19,9 @@ scenarios:
   traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
   topology: ../../acl-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
-    tg__2: trafficgen_2.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
+    tg__1: trafficgen_2.yardstick
   tc_options:
     rfc2544:
       allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_1518B_packetsize.yaml b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_1518B_packetsize.yaml
index 05bf56fb7..cbe3e97ae 100644
--- a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_1518B_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_1518B_packetsize.yaml
@@ -19,9 +19,9 @@ scenarios:
   traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
   topology: ../../acl-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
-    tg__2: trafficgen_2.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
+    tg__1: trafficgen_2.yardstick
   tc_options:
     rfc2544:
       allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_64B_packetsize.yaml b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_64B_packetsize.yaml
index d560f56cf..707b46e7f 100644
--- a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_64B_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_64B_packetsize.yaml
@@ -19,9 +19,9 @@ scenarios:
   traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
   topology: ../../acl-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
-    tg__2: trafficgen_2.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
+    tg__1: trafficgen_2.yardstick
   tc_options:
     rfc2544:
       allowed_drop_rate: 0.8 - 1
diff --git a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_IMIX_packetsize.yaml b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_IMIX_packetsize.yaml
index 68fdf96e4..b1003df3d 100644
--- a/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_IMIX_packetsize.yaml
+++ b/samples/vnf_samples/nsut/prox/ovs-dpdk/throughput/tc_ipv4_worstcaserules_1flow_IMIX_packetsize.yaml
@@ -19,9 +19,9 @@ scenarios:
   traffic_profile: "../../../../traffic_profiles/ipv4_throughput.yaml"
   topology: ../../acl-tg-topology.yaml
   nodes:
-    tg__1: trafficgen_1.yardstick
-    vnf__1: vnf.yardstick
-    tg__2: trafficgen_2.yardstick
+    tg__0: trafficgen_1.yardstick
+    vnf__0: vnf.yardstick
+    tg__1: trafficgen_2.yardstick
   tc_options:
     rfc2544:
       allowed_drop_rate: 0.8 - 1