diff options
author | Ricardo Noriega <rnoriega@redhat.com> | 2018-08-07 18:29:54 +0200 |
---|---|---|
committer | Ricardo Noriega <rnoriega@redhat.com> | 2018-08-22 17:48:28 +0200 |
commit | 14de5d725e74cb885a48146217e2fc9d8f093df6 (patch) | |
tree | bc189f9ce4c5bb2d8d21d48b174a54da21df8bbd /apex/tests | |
parent | c0a4aa96bbe70eefb179d59a1267b8115651bba5 (diff) |
Enable SFC scenarios for Gambia
- This patch will install OVS 2.9.2 including
its kernel module which allows native NSH
headers.
- Fix Custom OVS due to bug:
https://bugzilla.redhat.com/show_bug.cgi?id=1544892
- Tacker is disable for the time being, tacker-conductor
needs to be enabled.
JIRA: APEX-630
Change-Id: Ia410309fd7053602ce78eae919839d0f57c9742a
Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
Diffstat (limited to 'apex/tests')
-rw-r--r-- | apex/tests/test_apex_overcloud_deploy.py | 30 | ||||
-rw-r--r-- | apex/tests/test_apex_undercloud.py | 3 |
2 files changed, 32 insertions, 1 deletions
diff --git a/apex/tests/test_apex_overcloud_deploy.py b/apex/tests/test_apex_overcloud_deploy.py index 9dd5289d..c2d17408 100644 --- a/apex/tests/test_apex_overcloud_deploy.py +++ b/apex/tests/test_apex_overcloud_deploy.py @@ -242,6 +242,7 @@ class TestOvercloudDeploy(unittest.TestCase): ds_opts = {'dataplane': 'ovs', 'sdn_controller': 'opendaylight', 'vpn': False, + 'sfc': False, 'odl_version': con.DEFAULT_ODL_VERSION, 'odl_vpp_netvirt': True} ds = {'deploy_options': MagicMock(), @@ -340,6 +341,7 @@ class TestOvercloudDeploy(unittest.TestCase): mock_virt_utils): ds_opts = {'dataplane': 'ovs', 'vpn': False, + 'sfc': False, 'sdn_controller': 'ovn'} ds = {'deploy_options': MagicMock(), 'global_params': MagicMock()} @@ -361,6 +363,7 @@ class TestOvercloudDeploy(unittest.TestCase): ds_opts = {'dataplane': 'ovs', 'sdn_controller': 'opendaylight', 'vpn': True, + 'sfc': False, 'odl_version': con.DEFAULT_ODL_VERSION, 'odl_vpp_netvirt': True} ds = {'deploy_options': MagicMock(), @@ -375,6 +378,33 @@ class TestOvercloudDeploy(unittest.TestCase): mock_inject_odl.assert_called() mock_inject_quagga.assert_called() + @patch('apex.builders.overcloud_builder.inject_ovs_nsh') + @patch('apex.builders.overcloud_builder.inject_opendaylight') + @patch('apex.overcloud.deploy.virt_utils') + @patch('apex.overcloud.deploy.shutil') + @patch('apex.overcloud.deploy.os.path') + @patch('builtins.open', mock_open()) + def test_prep_image_sdn_odl_sfc(self, mock_os_path, mock_shutil, + mock_virt_utils, mock_inject_odl, + mock_inject_ovs_nsh): + ds_opts = {'dataplane': 'ovs', + 'sdn_controller': 'opendaylight', + 'vpn': False, + 'sfc': True, + 'odl_version': con.DEFAULT_ODL_VERSION, + 'odl_vpp_netvirt': True} + ds = {'deploy_options': MagicMock(), + 'global_params': MagicMock()} + ds['deploy_options'].__getitem__.side_effect = \ + lambda i: ds_opts.get(i, MagicMock()) + ds['deploy_options'].__contains__.side_effect = \ + lambda i: True if i in ds_opts else MagicMock() + ns = MagicMock() + prep_image(ds, ns, 'undercloud.qcow2', '/tmp', root_pw='test') + mock_virt_utils.virt_customize.assert_called() + mock_inject_odl.assert_called() + mock_inject_ovs_nsh.assert_called() + @patch('apex.overcloud.deploy.os.path.isfile') def test_prep_image_no_image(self, mock_isfile): mock_isfile.return_value = False diff --git a/apex/tests/test_apex_undercloud.py b/apex/tests/test_apex_undercloud.py index 9bc91e51..5c33bf03 100644 --- a/apex/tests/test_apex_undercloud.py +++ b/apex/tests/test_apex_undercloud.py @@ -309,7 +309,8 @@ class TestUndercloud(unittest.TestCase): } ns.__getitem__.side_effect = ns_dict.__getitem__ ns.__contains__.side_effect = ns_dict.__contains__ - ds = {'global_params': {}} + ds = {'global_params': {}, + 'deploy_options': {}} Undercloud('img_path', 'tplt_path').generate_config(ns, ds) |