Merge "Reduce the time for UT"

tacker/tests/unit/conductor/test_conductor_server.py

@@ -104,6 +104,8 @@ class TestConductor(SqlTestCase, unit_base.FixturedTestCase):
         self.body_data = self._create_body_data()
         self.vnf_lcm_opoccs = self._create_vnf_lcm_opoccs()
         self.vnfd_pkg_data = self._create_vnfd_pkg_data()
+        cfg.CONF.set_override('retry_wait', 0, group='vnf_lcm')
+        self.addCleanup(cfg.CONF.clear_override, 'retry_wait', group='vnf_lcm')
 
     def _mock_vnfm_plugin(self):
         self.vnfm_plugin = mock.Mock(wraps=FakeVNFMPlugin())
@@ -3260,7 +3262,6 @@ class TestConductor(SqlTestCase, unit_base.FixturedTestCase):
                        'vnf_lcm_subscriptions_get')
     def test_send_notification_timeout(self, mock_subscriptions_get,
             mock_vnf_by_id):
-        cfg.CONF.set_override('retry_wait', 0, group='vnf_lcm')
         self.requests_mock.register_uri(
             'POST',
             "https://localhost/callback",
@@ -3280,7 +3281,6 @@ class TestConductor(SqlTestCase, unit_base.FixturedTestCase):
 
         # return value when timeout for POST method is 0
         self.assertEqual(result, 0)
-        cfg.CONF.clear_override('retry_wait', group='vnf_lcm')
 
     def test_get_notification(self):
         cfg.CONF.set_override('test_callback_uri', True,
@@ -3360,7 +3360,6 @@ class TestConductor(SqlTestCase, unit_base.FixturedTestCase):
 
     def test_get_notification_retry(self):
         cfg.CONF.set_override('test_callback_uri', True, group='vnf_lcm')
-        cfg.CONF.set_override('retry_wait', 0, group='vnf_lcm')
         self.requests_mock.register_uri('GET',
             "https://localhost/callback",
             headers={
@@ -3386,11 +3385,9 @@ class TestConductor(SqlTestCase, unit_base.FixturedTestCase):
         self.assertEqual(3, req_count)
         cfg.CONF.set_override('test_callback_uri', False,
                               group='vnf_lcm')
-        cfg.CONF.clear_override('retry_wait', group='vnf_lcm')
 
     def test_get_notification_timeout(self):
         cfg.CONF.set_override('test_callback_uri', True, group='vnf_lcm')
-        cfg.CONF.set_override('retry_wait', 0, group='vnf_lcm')
         self.requests_mock.register_uri(
             'GET',
             "https://localhost/callback",
@@ -3415,7 +3412,6 @@ class TestConductor(SqlTestCase, unit_base.FixturedTestCase):
         self.assertEqual(3, req_count)
         cfg.CONF.set_override('test_callback_uri', False,
                               group='vnf_lcm')
-        cfg.CONF.clear_override('retry_wait', group='vnf_lcm')
 
     @mock.patch.object(conductor_server, 'revert_update_lcm')
     @mock.patch.object(t_context.get_admin_context().session, "add")

tacker/tests/unit/vnfm/infra_drivers/kubernetes/test_kubernetes_driver.py

@@ -49,7 +49,7 @@ class TestKubernetes(base.TestCase):
         super(TestKubernetes, self).setUp()
         self.kubernetes = kubernetes_driver.Kubernetes()
         self.kubernetes.STACK_RETRIES = 1
-        self.kubernetes.STACK_RETRY_WAIT = 5
+        self.kubernetes.STACK_RETRY_WAIT = 0
         self.k8s_client_dict = fakes.fake_k8s_client_dict()
         self.context = context.get_admin_context()
         self.vnf_instance = fd_utils.get_vnf_instance_object()

tacker/tests/unit/vnfm/infra_drivers/kubernetes/test_kubernetes_driver_helm.py

@@ -85,7 +85,7 @@ class TestKubernetesHelm(base.TestCase):
         super(TestKubernetesHelm, self).setUp()
         self.kubernetes = kubernetes_driver.Kubernetes()
         self.kubernetes.STACK_RETRIES = 1
-        self.kubernetes.STACK_RETRY_WAIT = 5
+        self.kubernetes.STACK_RETRY_WAIT = 0
         self.k8s_client_dict = fakes.fake_k8s_client_dict()
         self.context = context.get_admin_context()
         self.vnf_instance = fd_utils.get_vnf_instance_object()
@@ -96,6 +96,11 @@ class TestKubernetesHelm(base.TestCase):
         self._mock_transport()
         self.helm_client = helm_client.HelmClient('127.0.0.1', 'user', 'pass')
         self.helm_client.commander = FakeCommander()
+        mock.patch('tacker.vnfm.infra_drivers.kubernetes'
+                   '.helm.helm_client.HELM_CMD_INTERVAL', 0).start()
+        mock.patch('tacker.vnfm.infra_drivers.kubernetes'
+                   '.helm.helm_client.TRANSPORT_WAIT', 0).start()
+        self.addClassCleanup(mock.patch.stopall)
 
     def _mock_remote_command_executor(self):
         self.commander = mock.Mock(wraps=FakeRemoteCommandExecutor())

tacker/tests/unit/vnfm/test_plugin.py

@@ -19,6 +19,7 @@ from unittest.mock import patch
 
 import ddt
 import iso8601
+from oslo_config import cfg
 from oslo_utils import uuidutils
 import yaml
 
@@ -149,6 +150,10 @@ class TestVNFMPluginMonitor(db_base.SqlTestCase):
 @ddt.ddt
 class TestVNFMPlugin(db_base.SqlTestCase):
     def setUp(self):
+        # NOTE(h-asahina): set timer to 0 to reduce test time.
+        cfg.CONF.set_override('boot_wait', 0, 'tacker')
+        self.addClassCleanup(cfg.CONF.clear_override, 'boot_wait', 'tacker')
+
         super(TestVNFMPlugin, self).setUp()
         self.addCleanup(mock.patch.stopall)
         self.context = context.get_admin_context()

tacker/vnfm/infra_drivers/kubernetes/helm/helm_client.py

@@ -25,6 +25,7 @@ from tacker.common import cmd_executer
 from tacker.extensions import vnfm
 
 LOG = logging.getLogger(__name__)
+HELM_CMD_INTERVAL = 30
 HELM_CMD_TIMEOUT = 30
 HELM_INSTALL_TIMEOUT = 120
 HELM_UPGRADE_TIMEOUT = 120
@@ -64,7 +65,7 @@ class HelmClient():
                     LOG.error(error_message)
                     raise vnfm.HelmClientOtherError(
                         error_message=error_message)
-                time.sleep(30)
+                time.sleep(HELM_CMD_INTERVAL)
         if result.get_return_code():
             self.close_session()
             err = result.get_stderr()