diff options
author | Tim Rozet <trozet@redhat.com> | 2018-06-25 15:21:07 -0400 |
---|---|---|
committer | Tim Rozet <trozet@redhat.com> | 2018-06-25 20:08:47 +0000 |
commit | 107c1c3d73ee689eb09ae8851e3048428456fe2e (patch) | |
tree | 39c6b889bca16e14962d87f94f26087a6b2fc1e3 /apex/tests/test_apex_overcloud_deploy.py | |
parent | 6cb6b372fc0f74daf952e04b9d5712c6930cee42 (diff) |
Deprecates the use of '--upstream' argument
We only support the use of upstream deployments from Gambia onwards.
Therefore deprecating the parameter and forcing upstream to always be
used.
Change-Id: I7926a65a2c32bca2272855ba45fdb6005f67616f
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'apex/tests/test_apex_overcloud_deploy.py')
-rw-r--r-- | apex/tests/test_apex_overcloud_deploy.py | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/apex/tests/test_apex_overcloud_deploy.py b/apex/tests/test_apex_overcloud_deploy.py index f1db91ad..83e2b02d 100644 --- a/apex/tests/test_apex_overcloud_deploy.py +++ b/apex/tests/test_apex_overcloud_deploy.py @@ -207,11 +207,13 @@ class TestOvercloudDeploy(unittest.TestCase): assert_raises(ApexDeployException, create_deploy_cmd, ds, ns, inv, '/tmp', virt) + @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(self, mock_os_path, mock_shutil, mock_virt_utils): + def test_prep_image(self, mock_os_path, mock_shutil, mock_virt_utils, + mock_inject_odl): ds_opts = {'dataplane': 'fdio', 'sdn_controller': 'opendaylight', 'odl_version': 'master', @@ -223,6 +225,7 @@ class TestOvercloudDeploy(unittest.TestCase): ns = MagicMock() prep_image(ds, ns, 'undercloud.qcow2', '/tmp', root_pw='test') mock_virt_utils.virt_customize.assert_called() + mock_inject_odl.assert_called() @patch('apex.overcloud.deploy.virt_utils') @patch('apex.overcloud.deploy.shutil') @@ -240,12 +243,13 @@ class TestOvercloudDeploy(unittest.TestCase): prep_image(ds, ns, 'undercloud.qcow2', '/tmp', root_pw='test') mock_virt_utils.virt_customize.assert_called() + @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(self, mock_os_path, mock_shutil, - mock_virt_utils): + mock_virt_utils, mock_inject_odl): ds_opts = {'dataplane': 'ovs', 'sdn_controller': 'opendaylight', 'odl_version': con.DEFAULT_ODL_VERSION, @@ -259,6 +263,7 @@ class TestOvercloudDeploy(unittest.TestCase): ns = MagicMock() prep_image(ds, ns, 'undercloud.qcow2', '/tmp', root_pw='test') mock_virt_utils.virt_customize.assert_called() + mock_inject_odl.assert_called() @patch('apex.overcloud.deploy.c_builder') @patch('apex.overcloud.deploy.oc_builder') @@ -283,18 +288,20 @@ class TestOvercloudDeploy(unittest.TestCase): mock_c_builder.add_upstream_patches.return_value = ['nova-api'] patches = ['dummy_nova_patch'] rv = prep_image(ds, ns, 'undercloud.qcow2', '/tmp', root_pw='test', - docker_tag='latest', patches=patches, upstream=True) - mock_oc_builder.inject_opendaylight.assert_called + docker_tag='latest', patches=patches) + mock_oc_builder.inject_opendaylight.assert_called() mock_virt_utils.virt_customize.assert_called() - mock_c_builder.add_upstream_patches.assert_called + mock_c_builder.add_upstream_patches.assert_called() self.assertListEqual(sorted(rv), ['nova-api', 'opendaylight']) + @patch('apex.overcloud.deploy.oc_builder') @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_not_def(self, mock_os_path, - mock_shutil, mock_virt_utils): + mock_shutil, mock_virt_utils, + mock_oc_builder): ds_opts = {'dataplane': 'ovs', 'sdn_controller': 'opendaylight', 'odl_version': 'uncommon'} @@ -305,6 +312,7 @@ class TestOvercloudDeploy(unittest.TestCase): ns = MagicMock() prep_image(ds, ns, 'undercloud.qcow2', '/tmp', root_pw='test') mock_virt_utils.virt_customize.assert_called() + mock_oc_builder.inject_opendaylight.assert_called() @patch('apex.overcloud.deploy.virt_utils') @patch('apex.overcloud.deploy.shutil') |