diff options
| author |   Feng Pan <fpan@redhat.com> | 2017-10-16 13:17:49 -0400 |
|---|---|---|
| committer |   Tim Rozet <trozet@redhat.com> | 2017-10-19 13:28:03 +0000 |
| commit | 909f355dd5195e81b45a14f88f6f879ee4c8867d (patch) | |
| tree | ac81eee192a9061b61b7715c7475a053d27b07e7 /apex/tests/test_apex_overcloud_deploy.py | |
| parent | e675928d02d66928f291b83ef805b56a5fc41010 (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>
(cherry picked from commit da99ee8cf99824a7ee5ff19544d3eec4788edd68)
Diffstat (limited to 'apex/tests/test_apex_overcloud_deploy.py')
| -rw-r--r-- | apex/tests/test_apex_overcloud_deploy.py | 30 |
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 1df10e4e..59e9048f 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: |