diff options
| author |   Ross Brattain <ross.b.brattain@intel.com> | 2017-09-12 09:57:38 -0700 |
|---|---|---|
| committer | Ross Brattain <ross.b.brattain@intel.com> | 2017-09-19 07:42:43 -0700 |
| commit | 9b0b8ae33541c0ad8925521b1c3f1bc559fefbe6 (patch) | |
| tree | 24c3e5279786bd0ccf9816e9d1076d067b6cee43 /tests/unit/benchmark/core | |
| parent | 51ecde958cbaaedcb443bd7845eb1da9a1c013af (diff) | |
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>
Diffstat (limited to 'tests/unit/benchmark/core')
| -rw-r--r-- | tests/unit/benchmark/core/test_task.py | 24 |
1 files changed, 12 insertions, 12 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) |