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>

1 files changed, 4 insertions, 2 deletions

diff --git a/yardstick/network_services/traffic_profile/rfc2544.py b/yardstick/network_services/traffic_profile/rfc2544.py
index 3dc08df69..16e809b65 100644
--- a/yardstick/network_services/traffic_profile/rfc2544.py
+++ b/yardstick/network_services/traffic_profile/rfc2544.py
@@ -58,7 +58,8 @@ class RFC2544Profile(TrexProfile):
             if not profile_data:
                 continue
             # correlated traffic doesn't use public traffic?
-            if vld_id.startswith("public") and self.generator.rfc2544_helper.correlated_traffic:
+            if vld_id.startswith(self.DOWNLINK) and \
+                self.generator.rfc2544_helper.correlated_traffic:
                 continue
             for intf in intfs:
                 port = self.generator.vnfd_helper.port_num(intf)
@@ -165,7 +166,8 @@ class RFC2544Profile(TrexProfile):
             if not profile_data:
                 continue
             # correlated traffic doesn't use public traffic?
-            if vld_id.startswith("public") and self.generator.rfc2544_helper.correlated_traffic:
+            if vld_id.startswith(self.DOWNLINK) and \
+                self.generator.rfc2544_helper.correlated_traffic:
                 continue
             for intf in intfs:
                 port = self.generator.vnfd_helper.port_num(intf)