Fixes deployment on CentOS 7.6

[apex.git] / apex / tests / test_apex_overcloud_deploy.py

diff --git a/apex/tests/test_apex_overcloud_deploy.py b/apex/tests/test_apex_overcloud_deploy.py
index a70057b..79dbf54 100644 (file)
--- a/apex/tests/test_apex_overcloud_deploy.py
+++ b/apex/tests/test_apex_overcloud_deploy.py
@@ -156,7 +156,6 @@ class TestOvercloudDeploy(unittest.TestCase):
         assert_in('--control-scale 3', result_cmd)
         assert_in('--compute-scale 2', result_cmd)
         assert_in('docker-images.yaml', result_cmd)
-        assert_in('sdn-images.yaml', result_cmd)
         assert_in('/usr/share/openstack-tripleo-heat-templates/environments'
                   '/docker.yaml', result_cmd)
         assert_in('/usr/share/openstack-tripleo-heat-templates/environments/'
@@ -234,6 +233,7 @@ 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_ovs_nsh')
     @patch('apex.overcloud.deploy.utils.fetch_upstream_and_unpack')
     @patch('apex.builders.overcloud_builder.inject_opendaylight')
     @patch('apex.overcloud.deploy.virt_utils')
@@ -241,7 +241,8 @@ class TestOvercloudDeploy(unittest.TestCase):
     @patch('apex.overcloud.deploy.os.path.isfile')
     @patch('builtins.open', mock_open())
     def test_prep_image_sdn_odl(self, mock_is_file, mock_shutil,
-                                mock_virt_utils, mock_inject_odl, mock_fetch):
+                                mock_virt_utils, mock_inject_odl,
+                                mock_fetch, mock_ovs_nsh):
         mock_is_file.return_value = True
         ds_opts = {'dataplane': 'ovs',
                    'sdn_controller': 'opendaylight',
@@ -259,6 +260,7 @@ class TestOvercloudDeploy(unittest.TestCase):
         prep_image(ds, ns, 'undercloud.qcow2', '/tmp', root_pw='test')
         mock_virt_utils.virt_customize.assert_called()
         mock_inject_odl.assert_called()
+        # mock_ovs_nsh.assert_called()
 
     @patch('apex.overcloud.deploy.c_builder')
     @patch('apex.overcloud.deploy.oc_builder')
@@ -340,12 +342,13 @@ class TestOvercloudDeploy(unittest.TestCase):
         mock_virt_utils.virt_customize.assert_called()
         mock_oc_builder.inject_opendaylight.assert_called()
 
+    @patch('apex.builders.overcloud_builder.inject_ovs_nsh')
     @patch('apex.overcloud.deploy.virt_utils')
     @patch('apex.overcloud.deploy.shutil')
     @patch('apex.overcloud.deploy.os.path.isfile')
     @patch('builtins.open', mock_open())
     def test_prep_image_sdn_ovn(self, mock_is_file, mock_shutil,
-                                mock_virt_utils):
+                                mock_virt_utils, mock_ovs_nsh):
         mock_is_file.return_value = True
         ds_opts = {'dataplane': 'ovs',
                    'vpn': False,
@@ -358,7 +361,9 @@ class TestOvercloudDeploy(unittest.TestCase):
         ns = MagicMock()
         prep_image(ds, ns, 'undercloud.qcow2', '/tmp', root_pw='test')
         mock_virt_utils.virt_customize.assert_called()
+        # mock_ovs_nsh.assert_called()
 
+    @patch('apex.builders.overcloud_builder.inject_ovs_nsh')
     @patch('apex.overcloud.deploy.utils.fetch_upstream_and_unpack')
     @patch('apex.builders.overcloud_builder.inject_quagga')
     @patch('apex.builders.overcloud_builder.inject_opendaylight')
@@ -368,7 +373,8 @@ class TestOvercloudDeploy(unittest.TestCase):
     @patch('builtins.open', mock_open())
     def test_prep_image_sdn_odl_vpn(self, mock_is_file, mock_shutil,
                                     mock_virt_utils, mock_inject_odl,
-                                    mock_inject_quagga, mock_fetch):
+                                    mock_inject_quagga, mock_fetch,
+                                    mock_ovs_nsh):
         mock_is_file.return_value = True
         ds_opts = {'dataplane': 'ovs',
                    'sdn_controller': 'opendaylight',
@@ -387,6 +393,7 @@ class TestOvercloudDeploy(unittest.TestCase):
         mock_virt_utils.virt_customize.assert_called()
         mock_inject_odl.assert_called()
         mock_inject_quagga.assert_called()
+        # mock_ovs_nsh.assert_called()
 
         @patch('apex.builders.overcloud_builder.inject_ovs_nsh')
         @patch('apex.builders.overcloud_builder.inject_opendaylight')
@@ -414,7 +421,7 @@ class TestOvercloudDeploy(unittest.TestCase):
             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()
+            # mock_inject_ovs_nsh.assert_called()
 
     @patch('apex.overcloud.deploy.os.path.isfile')
     def test_prep_image_no_image(self, mock_isfile):