From 9b0b8ae33541c0ad8925521b1c3f1bc559fefbe6 Mon Sep 17 00:00:00 2001 From: Ross Brattain Date: Tue, 12 Sep 2017 09:57:38 -0700 Subject: 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 Signed-off-by: Edward MacGillivray --- .../unit/network_services/vnf_generic/vnf/test_prox_helpers.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/unit/network_services/vnf_generic/vnf/test_prox_helpers.py') diff --git a/tests/unit/network_services/vnf_generic/vnf/test_prox_helpers.py b/tests/unit/network_services/vnf_generic/vnf/test_prox_helpers.py index 821c10f64..8d21fbb28 100644 --- a/tests/unit/network_services/vnf_generic/vnf/test_prox_helpers.py +++ b/tests/unit/network_services/vnf_generic/vnf/test_prox_helpers.py @@ -679,7 +679,7 @@ class TestProxDpdkVnfSetupEnvHelper(unittest.TestCase): 'vpci': '0000:05:00.0', 'local_ip': '152.16.100.19', 'type': 'PCI-PASSTHROUGH', - 'vld_id': 'private_0', + 'vld_id': 'uplink_0', 'netmask': '255.255.255.0', 'dpdk_port_num': 0, 'bandwidth': '10 Gbps', @@ -698,7 +698,7 @@ class TestProxDpdkVnfSetupEnvHelper(unittest.TestCase): 'vpci': '0000:05:00.1', 'local_ip': '152.16.40.19', 'type': 'PCI-PASSTHROUGH', - 'vld_id': 'public_0', + 'vld_id': 'downlink_0', 'driver': "i40e", 'netmask': '255.255.255.0', 'dpdk_port_num': 1, @@ -1281,7 +1281,7 @@ class TestProxResourceHelper(unittest.TestCase): 'vpci': '0000:05:00.0', 'local_ip': '152.16.100.19', 'type': 'PCI-PASSTHROUGH', - 'vld_id': 'private_0', + 'vld_id': 'uplink_0', 'netmask': '255.255.255.0', 'dpdk_port_num': 0, 'bandwidth': '10 Gbps', @@ -1300,7 +1300,7 @@ class TestProxResourceHelper(unittest.TestCase): 'vpci': '0000:05:00.1', 'local_ip': '152.16.40.19', 'type': 'PCI-PASSTHROUGH', - 'vld_id': 'public_0', + 'vld_id': 'downlink_0', 'driver': "i40e", 'netmask': '255.255.255.0', 'dpdk_port_num': 1, @@ -1755,7 +1755,7 @@ class TestProxResourceHelper(unittest.TestCase): 'vpci': '0000:06:00.0', 'local_ip': '152.16.100.20', 'type': 'PCI-PASSTHROUGH', - 'vld_id': 'private_1', + 'vld_id': 'uplink_1', 'netmask': '255.255.255.0', 'dpdk_port_num': 0, 'bandwidth': '10 Gbps', -- cgit 1.2.3-korg