Always update OVS to 2.9.2

[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 a9e4bda..d4d9083 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/'
@@ -197,10 +196,11 @@ class TestOvercloudDeploy(unittest.TestCase):
     @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('apex.overcloud.deploy.os.path.isfile')
     @patch('builtins.open', mock_open())
-    def test_prep_image(self, mock_os_path, mock_shutil, mock_virt_utils,
+    def test_prep_image(self, mock_is_file, mock_shutil, mock_virt_utils,
                         mock_inject_odl):
+        mock_is_file.return_value = True
         ds_opts = {'dataplane': 'fdio',
                    'sdn_controller': 'opendaylight',
                    'odl_version': 'master',
@@ -217,10 +217,11 @@ class TestOvercloudDeploy(unittest.TestCase):
 
     @patch('apex.overcloud.deploy.virt_utils')
     @patch('apex.overcloud.deploy.shutil')
-    @patch('apex.overcloud.deploy.os.path')
+    @patch('apex.overcloud.deploy.os.path.isfile')
     @patch('builtins.open', mock_open())
-    def test_prep_image_sdn_false(self, mock_os_path, mock_shutil,
+    def test_prep_image_sdn_false(self, mock_is_file, mock_shutil,
                                   mock_virt_utils):
+        mock_is_file.return_value = True
         ds_opts = {'dataplane': 'fdio',
                    'vpn': False,
                    'sdn_controller': False}
@@ -232,16 +233,21 @@ 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')
     @patch('apex.overcloud.deploy.shutil')
-    @patch('apex.overcloud.deploy.os.path')
+    @patch('apex.overcloud.deploy.os.path.isfile')
     @patch('builtins.open', mock_open())
-    def test_prep_image_sdn_odl(self, mock_os_path, mock_shutil,
-                                mock_virt_utils, mock_inject_odl):
+    def test_prep_image_sdn_odl(self, mock_is_file, mock_shutil,
+                                mock_virt_utils, mock_inject_odl,
+                                mock_fetch, mock_ovs_nsh):
+        mock_is_file.return_value = True
         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(),
@@ -254,16 +260,18 @@ 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')
     @patch('apex.overcloud.deploy.virt_utils')
     @patch('apex.overcloud.deploy.shutil')
-    @patch('apex.overcloud.deploy.os.path')
+    @patch('apex.overcloud.deploy.os.path.isfile')
     @patch('builtins.open', mock_open())
     def test_prep_image_sdn_odl_upstream_containers_patches(
-            self, mock_os_path, mock_shutil, mock_virt_utils,
+            self, mock_is_file, mock_shutil, mock_virt_utils,
             mock_oc_builder, mock_c_builder):
+        mock_is_file.return_value = True
         ds_opts = {'dataplane': 'ovs',
                    'sdn_controller': 'opendaylight',
                    'odl_version': con.DEFAULT_ODL_VERSION,
@@ -284,14 +292,44 @@ class TestOvercloudDeploy(unittest.TestCase):
         mock_c_builder.add_upstream_patches.assert_called()
         self.assertListEqual(sorted(rv), ['nova-api', 'opendaylight'])
 
+    @patch('apex.overcloud.deploy.c_builder')
     @patch('apex.overcloud.deploy.oc_builder')
     @patch('apex.overcloud.deploy.virt_utils')
     @patch('apex.overcloud.deploy.shutil')
-    @patch('apex.overcloud.deploy.os.path')
+    @patch('apex.overcloud.deploy.os.path.isfile')
     @patch('builtins.open', mock_open())
-    def test_prep_image_sdn_odl_not_def(self, mock_os_path,
+    def test_prep_image_nosdn_upstream_containers_patches(
+            self, mock_is_file, mock_shutil, mock_virt_utils,
+            mock_oc_builder, mock_c_builder):
+        mock_is_file.return_value = True
+        ds_opts = {'dataplane': 'ovs',
+                   'sdn_controller': False,
+                   'odl_version': con.DEFAULT_ODL_VERSION,
+                   'odl_vpp_netvirt': False}
+        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()
+        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)
+        mock_virt_utils.virt_customize.assert_called()
+        mock_c_builder.add_upstream_patches.assert_called()
+        self.assertListEqual(sorted(rv), ['nova-api'])
+
+    @patch('apex.overcloud.deploy.oc_builder')
+    @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_odl_not_def(self, mock_is_file,
                                         mock_shutil, mock_virt_utils,
                                         mock_oc_builder):
+        mock_is_file.return_value = True
         ds_opts = {'dataplane': 'ovs',
                    'sdn_controller': 'opendaylight',
                    'odl_version': 'uncommon'}
@@ -304,14 +342,17 @@ 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')
+    @patch('apex.overcloud.deploy.os.path.isfile')
     @patch('builtins.open', mock_open())
-    def test_prep_image_sdn_ovn(self, mock_os_path, mock_shutil,
-                                mock_virt_utils):
+    def test_prep_image_sdn_ovn(self, mock_is_file, mock_shutil,
+                                mock_virt_utils, mock_ovs_nsh):
+        mock_is_file.return_value = True
         ds_opts = {'dataplane': 'ovs',
                    'vpn': False,
+                   'sfc': False,
                    'sdn_controller': 'ovn'}
         ds = {'deploy_options': MagicMock(),
               'global_params': MagicMock()}
@@ -320,19 +361,25 @@ 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')
     @patch('apex.overcloud.deploy.virt_utils')
     @patch('apex.overcloud.deploy.shutil')
-    @patch('apex.overcloud.deploy.os.path')
+    @patch('apex.overcloud.deploy.os.path.isfile')
     @patch('builtins.open', mock_open())
-    def test_prep_image_sdn_odl_vpn(self, mock_os_path, mock_shutil,
+    def test_prep_image_sdn_odl_vpn(self, mock_is_file, mock_shutil,
                                     mock_virt_utils, mock_inject_odl,
-                                    mock_inject_quagga):
+                                    mock_inject_quagga, mock_fetch,
+                                    mock_ovs_nsh):
+        mock_is_file.return_value = True
         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(),
@@ -346,6 +393,35 @@ 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')
+        @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_odl_sfc(self, mock_is_file, mock_shutil,
+                                        mock_virt_utils, mock_inject_odl,
+                                        mock_inject_ovs_nsh):
+            mock_is_file.return_value = True
+            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):
@@ -426,6 +502,7 @@ class TestOvercloudDeploy(unittest.TestCase):
 
     @patch('apex.overcloud.deploy.fileinput')
     @patch('apex.overcloud.deploy.shutil')
+    @patch('builtins.open', mock_open())
     def test_prep_env_round_two(self, mock_shutil, mock_fileinput):
         mock_fileinput.input.return_value = \
             ['NeutronVPPAgentPhysnets']
@@ -471,6 +548,7 @@ class TestOvercloudDeploy(unittest.TestCase):
 
     @patch('apex.overcloud.deploy.fileinput')
     @patch('apex.overcloud.deploy.shutil')
+    @patch('builtins.open', mock_open())
     def test_prep_env_round_three(self, mock_shutil, mock_fileinput):
         mock_fileinput.input.return_value = \
             ['OS::TripleO::Services::NeutronDhcpAgent',
@@ -513,6 +591,7 @@ class TestOvercloudDeploy(unittest.TestCase):
 
     @patch('apex.overcloud.deploy.fileinput')
     @patch('apex.overcloud.deploy.shutil')
+    @patch('builtins.open', mock_open())
     def test_prep_env_tenant_vlan(self, mock_shutil, mock_fileinput):
         mock_fileinput.input.return_value = \
             ['NeutronNetworkVLANRanges',
@@ -563,6 +642,7 @@ class TestOvercloudDeploy(unittest.TestCase):
 
     @patch('apex.overcloud.deploy.fileinput')
     @patch('apex.overcloud.deploy.shutil')
+    @patch('builtins.open', mock_open())
     def test_prep_env_tenant_vlan_odl(self, mock_shutil, mock_fileinput):
         mock_fileinput.input.return_value = \
             ['NeutronNetworkVLANRanges',