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>

4 files changed, 34 insertions, 34 deletions

diff --git a/tests/unit/benchmark/core/test_task.py b/tests/unit/benchmark/core/test_task.py
index e3917b5b2..737e7058b 100644
--- a/tests/unit/benchmark/core/test_task.py
+++ b/tests/unit/benchmark/core/test_task.py
@@ -70,10 +70,10 @@ class TaskTestCase(unittest.TestCase):
                         'network_name': 'mgmt',
                     },
                     'xe0': {
-                        'network_name': 'private_0',
+                        'network_name': 'uplink_0',
                     },
                     'xe1': {
-                        'network_name': 'public_0',
+                        'network_name': 'downlink_0',
                     },
                 },
             },
@@ -82,11 +82,11 @@ class TaskTestCase(unittest.TestCase):
                     'mgmt': {
                         'network_name': 'mgmt',
                     },
-                    'private_0': {
-                        'network_name': 'private_0',
+                    'uplink_0': {
+                        'network_name': 'uplink_0',
                     },
-                    'public_0': {
-                        'network_name': 'public_0',
+                    'downlink_0': {
+                        'network_name': 'downlink_0',
                     },
                 },
             },
@@ -100,15 +100,15 @@ class TaskTestCase(unittest.TestCase):
             },
             {},
             {
-                'name': 'private_0',
+                'name': 'uplink_0',
                 'subnet_cidr': '10.20.0.0/16',
             },
             {
-                'name': 'public_0',
+                'name': 'downlink_0',
                 'segmentation_id': '1001',
             },
             {
-                'name': 'private_1',
+                'name': 'uplink_1',
             },
         ])
 
@@ -116,9 +116,9 @@ class TaskTestCase(unittest.TestCase):
         expected_get_network_calls = 6
         expected = {
             'mgmt': {'name': 'mgmt', 'network_type': 'flat'},
-            'private_0': {'name': 'private_0', 'subnet_cidr': '10.20.0.0/16'},
-            'private_1': {'name': 'private_1'},
-            'public_0': {'name': 'public_0', 'segmentation_id': '1001'},
+            'uplink_0': {'name': 'uplink_0', 'subnet_cidr': '10.20.0.0/16'},
+            'uplink_1': {'name': 'uplink_1'},
+            'downlink_0': {'name': 'downlink_0', 'segmentation_id': '1001'},
         }
 
         networks = task.get_networks_from_nodes(nodes)
diff --git a/tests/unit/benchmark/scenarios/networking/ipv4_throughput_vpe.yaml b/tests/unit/benchmark/scenarios/networking/ipv4_throughput_vpe.yaml
index cfa166a74..2123e4705 100644
--- a/tests/unit/benchmark/scenarios/networking/ipv4_throughput_vpe.yaml
+++ b/tests/unit/benchmark/scenarios/networking/ipv4_throughput_vpe.yaml
@@ -49,13 +49,13 @@ private:
       ipv4:
         outer_l2:
             framesize:
-                64B: "{{ get(imix, 'imix.private.imix_small', '0') }}"
-                128B: "{{ get(imix, 'imix.private.imix_128B', '0') }}"
-                256B: "{{ get(imix, 'imix.private.imix_256B', '0') }}"
-                373b: "{{ get(imix, 'imix.private.imix_373B', '0') }}"
-                570B: "{{get(imix, 'imix.private.imix_570B', '0') }}"
-                1400B: "{{get(imix, 'imix.private.imix_1400B', '0') }}"
-                1518B: "{{get(imix, 'imix.private.imix_1500B', '0') }}"
+                64B: "{{ get(imix, 'imix.uplink.imix_small', '0') }}"
+                128B: "{{ get(imix, 'imix.uplink.imix_128B', '0') }}"
+                256B: "{{ get(imix, 'imix.uplink.imix_256B', '0') }}"
+                373b: "{{ get(imix, 'imix.uplink.imix_373B', '0') }}"
+                570B: "{{get(imix, 'imix.uplink.imix_570B', '0') }}"
+                1400B: "{{get(imix, 'imix.uplink.imix_1400B', '0') }}"
+                1518B: "{{get(imix, 'imix.uplink.imix_1500B', '0') }}"
 
             QinQ:
                 S-VLAN:
@@ -81,13 +81,13 @@ public:
       ipv4:
         outer_l2:
             framesize:
-                64B: "{{ get(imix, 'imix.private.imix_small', '0') }}"
-                128B: "{{ get(imix, 'imix.private.imix_128B', '0') }}"
-                256B: "{{ get(imix, 'imix.private.imix_256B', '0') }}"
-                373b: "{{ get(imix, 'imix.private.imix_373B', '0') }}"
-                570B: "{{get(imix, 'imix.private.imix_570B', '0') }}"
-                1400B: "{{get(imix, 'imix.private.imix_1400B', '0') }}"
-                1518B: "{{get(imix, 'imix.private.imix_1500B', '0') }}"
+                64B: "{{ get(imix, 'imix.uplink.imix_small', '0') }}"
+                128B: "{{ get(imix, 'imix.uplink.imix_128B', '0') }}"
+                256B: "{{ get(imix, 'imix.uplink.imix_256B', '0') }}"
+                373b: "{{ get(imix, 'imix.uplink.imix_373B', '0') }}"
+                570B: "{{get(imix, 'imix.uplink.imix_570B', '0') }}"
+                1400B: "{{get(imix, 'imix.uplink.imix_1400B', '0') }}"
+                1518B: "{{get(imix, 'imix.uplink.imix_1500B', '0') }}"
 
         outer_l3v4:
             proto: "tcp"
diff --git a/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py b/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py
index 8aa9a8c8b..fa9b8549d 100644
--- a/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py
+++ b/tests/unit/benchmark/scenarios/networking/test_vnf_generic.py
@@ -242,11 +242,11 @@ class TestNetworkServiceTestCase(unittest.TestCase):
                 'vnf__1': self.vnf__1,
             },
             'networks': {
-                'private': {
-                    'vld_id': 'private',
+                GenericVNF.UPLINK: {
+                    'vld_id': GenericVNF.UPLINK,
                 },
-                'public': {
-                    'vld_id': 'public',
+                GenericVNF.DOWNLINK: {
+                    'vld_id': GenericVNF.DOWNLINK,
                 },
             },
         }
@@ -265,7 +265,7 @@ class TestNetworkServiceTestCase(unittest.TestCase):
                 }
             ],
             'type': 'ELAN',
-            'id': 'private',
+            'id': GenericVNF.UPLINK,
             'name': 'tg__1 to vnf__1 link 1'
         }
 
@@ -283,7 +283,7 @@ class TestNetworkServiceTestCase(unittest.TestCase):
                 }
             ],
             'type': 'ELAN',
-            'id': 'public',
+            'id': GenericVNF.DOWNLINK,
             'name': 'vnf__1 to tg__1 link 2'
         }
 
diff --git a/tests/unit/benchmark/scenarios/networking/vpe_vnf_topology.yaml b/tests/unit/benchmark/scenarios/networking/vpe_vnf_topology.yaml
index 0de4b6e79..1ac6c1f89 100644
--- a/tests/unit/benchmark/scenarios/networking/vpe_vnf_topology.yaml
+++ b/tests/unit/benchmark/scenarios/networking/vpe_vnf_topology.yaml
@@ -27,7 +27,7 @@ nsd:nsd-catalog:
             VNF model: ../../vnf_descriptors/vpe_vnf.yaml    #tg_l3fwd.yaml #tg_trex_tpl.yaml       #TREX
 
         vld:
-        -   id: private
+        -   id: uplink
             name: tg__1 to vnf__1 link 1
             type: ELAN
             vnfd-connection-point-ref:
@@ -38,7 +38,7 @@ nsd:nsd-catalog:
                 vnfd-connection-point-ref: xe0
                 vnfd-id-ref: vnf__1                  #VNF
 
-        -   id: public
+        -   id: downlink
             name: vnf__1 to tg__1 link 2
             type: ELAN
             vnfd-connection-point-ref: