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>

3 files changed, 63 insertions, 63 deletions

diff --git a/tests/unit/network_services/traffic_profile/test_ixia_rfc2544.py b/tests/unit/network_services/traffic_profile/test_ixia_rfc2544.py
index 656623624..6fffb9ede 100644
--- a/tests/unit/network_services/traffic_profile/test_ixia_rfc2544.py
+++ b/tests/unit/network_services/traffic_profile/test_ixia_rfc2544.py
@@ -54,7 +54,7 @@ class TestIXIARFC2544Profile(unittest.TestCase):
                'name': 'rfc2544',
                'traffic_profile': {'traffic_type': 'IXIARFC2544Profile',
                                    'frame_rate': 100},
-               'public': {'ipv4':
+               IXIARFC2544Profile.DOWNLINK: {'ipv4':
                           {'outer_l2': {'framesize':
                                         {'64B': '100', '1518B': '0',
                                          '128B': '0', '1400B': '0',
@@ -66,7 +66,7 @@ class TestIXIARFC2544Profile(unittest.TestCase):
                                           'dscp': 0, 'ttl': 32},
                            'outer_l4': {'srcport': '2001',
                                         'dsrport': '1234'}}},
-               'private': {'ipv4':
+               IXIARFC2544Profile.UPLINK: {'ipv4':
                            {'outer_l2': {'framesize':
                                          {'64B': '100', '1518B': '0',
                                           '128B': '0', '1400B': '0',
@@ -83,12 +83,12 @@ class TestIXIARFC2544Profile(unittest.TestCase):
     def test_get_ixia_traffic_profile_error(self):
         traffic_generator = mock.Mock(autospec=TrexProfile)
         traffic_generator.my_ports = [0, 1]
-        traffic_generator.priv_ports = [-1]
-        traffic_generator.pub_ports = [1]
+        traffic_generator.uplink_ports = [-1]
+        traffic_generator.downlink_ports = [1]
         traffic_generator.client = \
             mock.Mock(return_value=True)
         STATIC_TRAFFIC = {
-            "private": {
+            IXIARFC2544Profile.UPLINK: {
                 "id": 1,
                 "bidir": "False",
                 "duration": 60,
@@ -127,7 +127,7 @@ class TestIXIARFC2544Profile(unittest.TestCase):
                 },
                 "traffic_type": "continuous"
             },
-            "public": {
+            IXIARFC2544Profile.DOWNLINK: {
                 "id": 2,
                 "bidir": "False",
                 "duration": 60,
@@ -187,12 +187,12 @@ class TestIXIARFC2544Profile(unittest.TestCase):
     def test_get_ixia_traffic_profile(self, mock_open):
         traffic_generator = mock.Mock(autospec=TrexProfile)
         traffic_generator.my_ports = [0, 1]
-        traffic_generator.priv_ports = [-1]
-        traffic_generator.pub_ports = [1]
+        traffic_generator.uplink_ports = [-1]
+        traffic_generator.downlink_ports = [1]
         traffic_generator.client = \
             mock.Mock(return_value=True)
         STATIC_TRAFFIC = {
-            "private": {
+            IXIARFC2544Profile.UPLINK: {
                 "id": 1,
                 "bidir": "False",
                 "duration": 60,
@@ -234,7 +234,7 @@ class TestIXIARFC2544Profile(unittest.TestCase):
                 },
                 "traffic_type": "continuous"
             },
-            "public": {
+            IXIARFC2544Profile.DOWNLINK: {
                 "id": 2,
                 "bidir": "False",
                 "duration": 60,
@@ -297,12 +297,12 @@ class TestIXIARFC2544Profile(unittest.TestCase):
     def test_get_ixia_traffic_profile_v6(self, mock_open):
         traffic_generator = mock.Mock(autospec=TrexProfile)
         traffic_generator.my_ports = [0, 1]
-        traffic_generator.priv_ports = [-1]
-        traffic_generator.pub_ports = [1]
+        traffic_generator.uplink_ports = [-1]
+        traffic_generator.downlink_ports = [1]
         traffic_generator.client = \
             mock.Mock(return_value=True)
         STATIC_TRAFFIC = {
-            "private": {
+            IXIARFC2544Profile.UPLINK: {
                 "id": 1,
                 "bidir": "False",
                 "duration": 60,
@@ -341,7 +341,7 @@ class TestIXIARFC2544Profile(unittest.TestCase):
                 },
                 "traffic_type": "continuous"
             },
-            "public": {
+            IXIARFC2544Profile.DOWNLINK: {
                 "id": 2,
                 "bidir": "False",
                 "duration": 60,
@@ -398,7 +398,7 @@ class TestIXIARFC2544Profile(unittest.TestCase):
                         'traffic_profile':
                         {'traffic_type': 'IXIARFC2544Profile',
                          'frame_rate': 100},
-                        'public':
+                        IXIARFC2544Profile.DOWNLINK:
                         {'ipv4':
                          {'outer_l2': {'framesize':
                                        {'64B': '100', '1518B': '0',
@@ -415,7 +415,7 @@ class TestIXIARFC2544Profile(unittest.TestCase):
                                          'dscp': 0, 'ttl': 32},
                           'outer_l4': {'srcport': '2001',
                                        'dsrport': '1234'}}},
-                        'private': {'ipv4':
+                        IXIARFC2544Profile.UPLINK: {'ipv4':
                                     {'outer_l2': {'framesize':
                                                   {'64B': '100', '1518B': '0',
                                                    '128B': '0', '1400B': '0',
@@ -449,13 +449,13 @@ class TestIXIARFC2544Profile(unittest.TestCase):
     def test__ixia_traffic_generate(self):
         traffic_generator = mock.Mock(autospec=TrexProfile)
         traffic_generator.networks = {
-            "private_0": ["xe0"],
-            "public_0": ["xe1"],
+            "uplink_0": ["xe0"],
+            "downlink_0": ["xe1"],
         }
         traffic_generator.client = \
             mock.Mock(return_value=True)
-        traffic = {"public": {'iload': 10},
-                   "private": {'iload': 10}}
+        traffic = {IXIARFC2544Profile.DOWNLINK: {'iload': 10},
+                   IXIARFC2544Profile.UPLINK: {'iload': 10}}
         ixia_obj = mock.MagicMock()
         r_f_c2544_profile = IXIARFC2544Profile(self.TRAFFIC_PROFILE)
         r_f_c2544_profile.rate = 100
@@ -466,15 +466,15 @@ class TestIXIARFC2544Profile(unittest.TestCase):
     def test_execute(self):
         traffic_generator = mock.Mock(autospec=TrexProfile)
         traffic_generator.networks = {
-            "private_0": ["xe0"],
-            "public_0": ["xe1"],
+            "uplink_0": ["xe0"],
+            "downlink_0": ["xe1"],
         }
         traffic_generator.client = \
             mock.Mock(return_value=True)
         r_f_c2544_profile = IXIARFC2544Profile(self.TRAFFIC_PROFILE)
         r_f_c2544_profile.first_run = True
-        r_f_c2544_profile.params = {"public": {'iload': 10},
-                                    "private": {'iload': 10}}
+        r_f_c2544_profile.params = {IXIARFC2544Profile.DOWNLINK: {'iload': 10},
+                                    IXIARFC2544Profile.UPLINK: {'iload': 10}}
 
         r_f_c2544_profile.get_streams = mock.Mock()
         r_f_c2544_profile.full_profile = {}
@@ -487,9 +487,9 @@ class TestIXIARFC2544Profile(unittest.TestCase):
     def test_update_traffic_profile(self):
         traffic_generator = mock.Mock(autospec=TrexProfile)
         traffic_generator.networks = {
-            "private_0": ["xe0"],  # private, one value for intfs
-            "public_0": ["xe1", "xe2"],  # public, two values for intfs
-            "public_1": ["xe3"],  # not in TRAFFIC PROFILE
+            "uplink_0": ["xe0"],  # private, one value for intfs
+            "downlink_0": ["xe1", "xe2"],  # public, two values for intfs
+            "downlink_1": ["xe3"],  # not in TRAFFIC PROFILE
             "tenant_0": ["xe4"],  # not public or private
         }
 
@@ -499,8 +499,8 @@ class TestIXIARFC2544Profile(unittest.TestCase):
 
         traffic_profile = deepcopy(self.TRAFFIC_PROFILE)
         traffic_profile.update({
-            "private_0": ["xe0"],
-            "public_0": ["xe1", "xe2"],
+            "uplink_0": ["xe0"],
+            "downlink_0": ["xe1", "xe2"],
         })
 
         r_f_c2544_profile = IXIARFC2544Profile(traffic_profile)
@@ -513,8 +513,8 @@ class TestIXIARFC2544Profile(unittest.TestCase):
     def test_get_drop_percentage(self):
         traffic_generator = mock.Mock(autospec=TrexProfile)
         traffic_generator.networks = {
-            "private_0": ["xe0"],
-            "public_0": ["xe1"],
+            "uplink_0": ["xe0"],
+            "downlink_0": ["xe1"],
         }
         traffic_generator.client = \
             mock.Mock(return_value=True)
@@ -548,8 +548,8 @@ class TestIXIARFC2544Profile(unittest.TestCase):
     def test_get_drop_percentage_update(self):
         traffic_generator = mock.Mock(autospec=TrexProfile)
         traffic_generator.my_ports = [0, 1]
-        traffic_generator.priv_ports = [0]
-        traffic_generator.pub_ports = [1]
+        traffic_generator.uplink_ports = [0]
+        traffic_generator.downlink_ports = [1]
         traffic_generator.client = \
             mock.Mock(return_value=True)
         r_f_c2544_profile = IXIARFC2544Profile(self.TRAFFIC_PROFILE)
@@ -582,8 +582,8 @@ class TestIXIARFC2544Profile(unittest.TestCase):
     def test_get_drop_percentage_div_zero(self):
         traffic_generator = mock.Mock(autospec=TrexProfile)
         traffic_generator.my_ports = [0, 1]
-        traffic_generator.priv_ports = [0]
-        traffic_generator.pub_ports = [1]
+        traffic_generator.uplink_ports = [0]
+        traffic_generator.downlink_ports = [1]
         traffic_generator.client = \
             mock.Mock(return_value=True)
         r_f_c2544_profile = IXIARFC2544Profile(self.TRAFFIC_PROFILE)
@@ -623,8 +623,8 @@ class TestIXIARFC2544Profile(unittest.TestCase):
     def test_start_ixia_latency(self):
         traffic_generator = mock.Mock(autospec=TrexProfile)
         traffic_generator.networks = {
-            "private_0": ["xe0"],
-            "public_0": ["xe1"],
+            "uplink_0": ["xe0"],
+            "downlink_0": ["xe1"],
         }
         traffic_generator.client = \
             mock.Mock(return_value=True)
diff --git a/tests/unit/network_services/traffic_profile/test_rfc2544.py b/tests/unit/network_services/traffic_profile/test_rfc2544.py
index 2366b8124..221233710 100644
--- a/tests/unit/network_services/traffic_profile/test_rfc2544.py
+++ b/tests/unit/network_services/traffic_profile/test_rfc2544.py
@@ -50,7 +50,7 @@ class TestRFC2544Profile(unittest.TestCase):
                'name': 'rfc2544',
                'traffic_profile': {'traffic_type': 'RFC2544Profile',
                                    'frame_rate': 100},
-               'public_0': {'ipv4':
+               'downlink_0': {'ipv4':
                           {'outer_l2': {'framesize':
                                         {'64B': '100', '1518B': '0',
                                          '128B': '0', '1400B': '0',
@@ -62,7 +62,7 @@ class TestRFC2544Profile(unittest.TestCase):
                                           'dscp': 0, 'ttl': 32, 'count': 1},
                            'outer_l4': {'srcport': '2001',
                                'dsrport': '1234', 'count': 1}}},
-               'private_0': {'ipv4':
+               'uplink_0': {'ipv4':
                            {'outer_l2': {'framesize':
                                          {'64B': '100', '1518B': '0',
                                           '128B': '0', '1400B': '0',
@@ -83,8 +83,8 @@ class TestRFC2544Profile(unittest.TestCase):
     def test_execute(self):
         traffic_generator = mock.Mock(autospec=TrexProfile)
         traffic_generator.networks = {
-            "private_0": ["xe0"],
-            "public_0": ["xe1"],
+            "uplink_0": ["xe0"],
+            "downlink_0": ["xe1"],
         }
         traffic_generator.client = \
             mock.Mock(return_value=True)
@@ -96,8 +96,8 @@ class TestRFC2544Profile(unittest.TestCase):
     def test_get_drop_percentage(self):
         traffic_generator = mock.Mock(autospec=TrexProfile)
         traffic_generator.networks = {
-            "private_0": ["xe0"],
-            "public_0": ["xe1"],
+            "uplink_0": ["xe0"],
+            "downlink_0": ["xe1"],
         }
         traffic_generator.client = mock.Mock(return_value=True)
 
@@ -143,8 +143,8 @@ class TestRFC2544Profile(unittest.TestCase):
     def test_get_drop_percentage_update(self):
         traffic_generator = mock.Mock(autospec=RFC2544Profile)
         traffic_generator.networks = {
-            "private_0": ["xe0"],
-            "public_0": ["xe1"],
+            "uplink_0": ["xe0"],
+            "downlink_0": ["xe1"],
         }
         traffic_generator.client = mock.Mock(return_value=True)
 
@@ -191,8 +191,8 @@ class TestRFC2544Profile(unittest.TestCase):
     def test_get_drop_percentage_div_zero(self):
         traffic_generator = mock.Mock(autospec=TrexProfile)
         traffic_generator.networks = {
-            "private_0": ["xe0"],
-            "public_0": ["xe1"],
+            "uplink_0": ["xe0"],
+            "downlink_0": ["xe1"],
         }
         traffic_generator.client = \
             mock.Mock(return_value=True)
diff --git a/tests/unit/network_services/traffic_profile/test_traffic_profile.py b/tests/unit/network_services/traffic_profile/test_traffic_profile.py
index e0b0ce85c..8355c85b6 100644
--- a/tests/unit/network_services/traffic_profile/test_traffic_profile.py
+++ b/tests/unit/network_services/traffic_profile/test_traffic_profile.py
@@ -60,24 +60,24 @@ class TestTrexProfile(unittest.TestCase):
                'name': 'rfc2544',
                'traffic_profile': {'traffic_type': 'RFC2544Profile',
                                    'frame_rate': 100},
-               'public': {'ipv4': {'outer_l2': {'framesize': {'64B': '100',
+               TrafficProfile.DOWNLINK: {'ipv4': {'outer_l2': {'framesize': {'64B': '100',
                                                               '1518B': '0',
                                                               '128B': '0',
                                                               '1400B': '0',
                                                               '256B': '0',
                                                               '373b': '0',
                                                               '570B': '0'},
-                                                "srcmac": "00:00:00:00:00:02",
-                                                "dstmac": "00:00:00:00:00:01"},
-                                   'outer_l3v4': {'dstip4': '1.1.1.1-1.1.2.2',
+                                                               "srcmac": "00:00:00:00:00:02",
+                                                               "dstmac": "00:00:00:00:00:01"},
+                                                  'outer_l3v4': {'dstip4': '1.1.1.1-1.1.2.2',
                                                   'proto': 'udp',
                                                   'srcip4': '9.9.1.1-90.1.2.2',
                                                   'dscp': 0, 'ttl': 32,
                                                   'count': 1},
-                                   'outer_l4': {'srcport': '2001',
+                                                  'outer_l4': {'srcport': '2001',
                                                 'dsrport': '1234',
                                                 'count': 1}}},
-               'private': {'ipv4':
+               TrafficProfile.UPLINK: {'ipv4':
                            {'outer_l2': {'framesize':
                                          {'64B': '100', '1518B': '0',
                                           '128B': '0', '1400B': '0',
@@ -97,22 +97,22 @@ class TestTrexProfile(unittest.TestCase):
                   'name': 'rfc2544',
                   'traffic_profile': {'traffic_type': 'RFC2544Profile',
                                       'frame_rate': 100},
-                  'public': {'ipv6': {'outer_l2': {'framesize':
+                  TrafficProfile.DOWNLINK: {'ipv6': {'outer_l2': {'framesize':
                                                    {'64B': '100', '1518B': '0',
                                                     '128B': '0', '1400B': '0',
                                                     '256B': '0', '373b': '0',
                                                     '570B': '0'},
                                                    "srcmac": "00:00:00:00:00:02",
                                                    "dstmac": "00:00:00:00:00:01"},
-                                      'outer_l3v4': {'dstip6': '0064:ff9b:0:0:0:0:9810:6414-0064:ff9b:0:0:0:0:9810:6420',
+                                                     'outer_l3v4': {'dstip6': '0064:ff9b:0:0:0:0:9810:6414-0064:ff9b:0:0:0:0:9810:6420',
                                                      'proto': 'udp',
                                                      'srcip6': '0064:ff9b:0:0:0:0:9810:2814-0064:ff9b:0:0:0:0:9810:2820',
                                                      'dscp': 0, 'ttl': 32,
                                                      'count': 1},
-                                      'outer_l4': {'srcport': '2001',
+                                                     'outer_l4': {'srcport': '2001',
                                                    'dsrport': '1234',
                                                    'count': 1}}},
-                  'private':
+                  TrafficProfile.UPLINK:
                   {'ipv6': {'outer_l2': {'framesize':
                                          {'64B': '100', '1518B': '0',
                                           '128B': '0', '1400B': '0',
@@ -153,21 +153,21 @@ class TestTrexProfile(unittest.TestCase):
             TrexProfile(TrafficProfile)
         qinq = {"S-VLAN": {"id": 128, "priority": 0, "cfi": 0},
                 "C-VLAN": {"id": 512, "priority": 0, "cfi": 0}}
-        outer_l2 = self.PROFILE['private']['ipv4']['outer_l2']
+        outer_l2 = self.PROFILE[TrafficProfile.UPLINK]['ipv4']['outer_l2']
         outer_l2['QinQ'] = qinq
         self.assertEqual(None, trex_profile._set_outer_l2_fields(outer_l2))
 
     def test__set_outer_l3v4_fields(self):
         trex_profile = \
             TrexProfile(TrafficProfile)
-        outer_l3v4 = self.PROFILE['private']['ipv4']['outer_l3v4']
+        outer_l3v4 = self.PROFILE[TrafficProfile.UPLINK]['ipv4']['outer_l3v4']
         outer_l3v4['proto'] = 'tcp'
         self.assertEqual(None, trex_profile._set_outer_l3v4_fields(outer_l3v4))
 
     def test__set_outer_l3v6_fields(self):
         trex_profile = \
             TrexProfile(TrafficProfile)
-        outer_l3v6 = self.PROFILE_v6['private']['ipv6']['outer_l3v4']
+        outer_l3v6 = self.PROFILE_v6[TrafficProfile.UPLINK]['ipv6']['outer_l3v4']
         outer_l3v6['proto'] = 'tcp'
         outer_l3v6['tc'] = 1
         outer_l3v6['hlim'] = 10
@@ -176,19 +176,19 @@ class TestTrexProfile(unittest.TestCase):
     def test__set_outer_l4_fields(self):
         trex_profile = \
             TrexProfile(TrafficProfile)
-        outer_l4 = self.PROFILE['private']['ipv4']['outer_l4']
+        outer_l4 = self.PROFILE[TrafficProfile.UPLINK]['ipv4']['outer_l4']
         self.assertEqual(None, trex_profile._set_outer_l4_fields(outer_l4))
 
     def test_get_streams(self):
         trex_profile = \
             TrexProfile(TrafficProfile)
         trex_profile.params = self.PROFILE
-        profile_data = self.PROFILE["private"]
+        profile_data = self.PROFILE[TrafficProfile.UPLINK]
         self.assertIsNotNone(trex_profile.get_streams(profile_data))
         trex_profile.pg_id = 1
         self.assertIsNotNone(trex_profile.get_streams(profile_data))
         trex_profile.params = self.PROFILE_v6
-        trex_profile.profile_data = self.PROFILE_v6["private"]
+        trex_profile.profile_data = self.PROFILE_v6[TrafficProfile.UPLINK]
         self.assertIsNotNone(trex_profile.get_streams(profile_data))
         trex_profile.pg_id = 1
         self.assertIsNotNone(trex_profile.get_streams(profile_data))