summaryrefslogtreecommitdiffstats
path: root/apex/tests
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-10-16 13:17:49 -0400
committerFeng Pan <fpan@redhat.com>2017-10-18 16:18:02 -0400
commitda99ee8cf99824a7ee5ff19544d3eec4788edd68 (patch)
treec704dbb5ce28af7904d74fdcb4d3a8f43f3e9d83 /apex/tests
parent37155cf6521e7cf7cb2d61a269f3a9992fa0a6c0 (diff)
Fix interface role mapping config for odl-fdio scenarios
This patch fixes a bug in deploy config function that will make performance parameters overwrite interface role mapping config for honeycomb. apex-os-net-config: Ifa3b18aa6370c79ad6ad3ce983f1648ff0d1d79d Change-Id: Icdb7603577bc7edf1959238ddd3d686c310544ce Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'apex/tests')
-rw-r--r--apex/tests/test_apex_overcloud_deploy.py30
1 files changed, 23 insertions, 7 deletions
diff --git a/apex/tests/test_apex_overcloud_deploy.py b/apex/tests/test_apex_overcloud_deploy.py
index 1df10e4..59e9048 100644
--- a/apex/tests/test_apex_overcloud_deploy.py
+++ b/apex/tests/test_apex_overcloud_deploy.py
@@ -245,9 +245,14 @@ class TestOvercloudDeploy(unittest.TestCase):
'networks':
{'tenant':
{'nic_mapping': {'controller':
- {'members': ['test']},
+ {'members': ['tenant_nic']},
'compute':
- {'members': ['test']}}}}}
+ {'members': ['tenant_nic']}}},
+ 'external':
+ [{'nic_mapping': {'controller':
+ {'members': ['ext_nic']},
+ 'compute':
+ {'members': ['ext_nic']}}}]}}
inv = None
try:
# Swap stdout
@@ -279,9 +284,14 @@ class TestOvercloudDeploy(unittest.TestCase):
'networks':
{'tenant':
{'nic_mapping': {'controller':
- {'members': ['test']},
+ {'members': ['tenant_nic']},
'compute':
- {'members': ['test']}}}}}
+ {'members': ['tenant_nic']}}},
+ 'external':
+ [{'nic_mapping': {'controller':
+ {'members': ['ext_nic']},
+ 'compute':
+ {'members': ['ext_nic']}}}]}}
inv = None
try:
# Swap stdout
@@ -291,7 +301,8 @@ class TestOvercloudDeploy(unittest.TestCase):
# run test
prep_env(ds, ns, inv, 'opnfv-env.yml', '/net-env.yml', '/tmp')
output = out.getvalue().strip()
- assert_in('NeutronVPPAgentPhysnets: \'datacentre:test\'', output)
+ assert_in('NeutronVPPAgentPhysnets: \'datacentre:tenant_nic\'',
+ output)
assert_in('NeutronVPPAgentPhysnets', output)
finally:
# put stdout back
@@ -311,9 +322,14 @@ class TestOvercloudDeploy(unittest.TestCase):
'networks':
{'tenant':
{'nic_mapping': {'controller':
- {'members': ['test']},
+ {'members': ['tenant_nic']},
'compute':
- {'members': ['test']}}}}}
+ {'members': ['tenant_nic']}}},
+ 'external':
+ [{'nic_mapping': {'controller':
+ {'members': ['ext_nic']},
+ 'compute':
+ {'members': ['ext_nic']}}}]}}
inv = MagicMock()
inv.get_node_counts.return_value = (3, 2)
try: