Merge "Improve to FT-related items"

tacker/tests/functional/sol/vnflcm_userdata/test_vnf_instance_with_user_data.py

@@ -325,7 +325,7 @@ class VnfLcmWithUserDataTest(vnflcm_base.BaseVnfLcmTest):
         self.assertEqual(404, resp.status_code)
 
     def test_vnfdid_filter_in_subscription(self):
-        """Test notification when virtual storage absent in VNFD.
+        """Test notification when filter exists in subscription.
 
             In this test case, we do following steps.
                 - Create VNF package.
@@ -2062,7 +2062,7 @@ class VnfLcmWithUserDataTest(vnflcm_base.BaseVnfLcmTest):
         self.assertEqual(204, resp.status_code)
 
     def test_retry_chgextconn(self):
-        """Test retry operation for instantiation.
+        """Test retry operation for change ext conn.
 
         In this test case, we do following steps.
             - Create subscription.

tacker/tests/functional/sol_encrypt_cred_v2/test_encrypt_credentials.py

@@ -238,10 +238,6 @@ class VnfLcmTest(test_vnflcm_basic_common.CommonVnfLcmTest):
           - 15. Terminate VNF instance
           - 16. Delete VNF instance
           - 17. Delete subscription
-          - 18. Create VNF instance
-          - 19. Instantiate VNF (will fail)
-          - 20. Rollback instantiation operation
-          - 21. Delete VNF instance
         """
 
         # setup

tacker/tests/functional/sol_enhanced_policy/sol/test_policy_vnflcm_apis_v2.py

@@ -13,7 +13,6 @@
 
 import os
 import time
-import unittest
 import yaml
 
 from oslo_utils import uuidutils
@@ -77,7 +76,7 @@ class VnflcmAPIsV2VNFBase(CommonVnfLcmTest, BaseEnhancedPolicyTest):
         # for update vnf test
         update_vnf_path = base_utils.test_sample(
             "functional/sol_v2_common/update_vnf")
-        # for change ext conn
+        # for change current vnf package
         change_vnfpkg_from_image_to_image_path_2 = base_utils.test_sample(
             "functional/sol_v2_common/test_change_vnf_pkg_with_new_image")
 
@@ -814,11 +813,6 @@ class VnflcmAPIsV2VNFInstantiateWithoutArea(VnflcmAPIsV2VNFBase):
     @classmethod
     def setUpClass(cls):
 
-        # TODO(yasufum): Skip this class until the failure is fixed.
-        unittest.SkipTest(
-            "Cancel because setUpClass is failed and test is timeouted "
-            "for unknown failure while creating vnfpackages.")
-
         super().setUpClass()
 
         vim_type = 'openstack'

tacker/tests/functional/sol_enhanced_policy/sol_kubernetes/test_policy_cnflcm_apis_v2.py

@@ -584,9 +584,9 @@ class VnflcmAPIsV2CNFBase(BaseVnfLcmKubernetesV2Test, BaseEnhancedPolicyTest):
         self._step_lcm_delete('user_all', inst_id_b, 204)
 
 
-class VnflcmAPIsV2VNFInstantiateWithArea(VnflcmAPIsV2CNFBase):
+class VnflcmAPIsV2CNFInstantiateWithArea(VnflcmAPIsV2CNFBase):
 
-    def test_vnflcm_apis_v2_cnf_without_area_in_vim_conn_info(self):
+    def test_vnflcm_apis_v2_cnf_with_area_in_vim_conn_info(self):
 
         inst_id_a, inst_id_b = (
             self.vnflcm_apis_v2_cnf_test_before_instantiate())
@@ -606,7 +606,7 @@ class VnflcmAPIsV2VNFInstantiateWithArea(VnflcmAPIsV2CNFBase):
         self.vnflcm_apis_v2_cnf_test_after_instantiate(inst_id_a, inst_id_b)
 
 
-class VnflcmAPIsV2CNFInstantiateWithoutArea(VnflcmAPIsV2CNFBase):
+class VnflcmAPIsV2CNFInstantiateWithAreaInRegisteredVim(VnflcmAPIsV2CNFBase):
 
     @classmethod
     def setUpClass(cls):
@@ -638,7 +638,7 @@ class VnflcmAPIsV2CNFInstantiateWithoutArea(VnflcmAPIsV2CNFBase):
 
         super().tearDownClass()
 
-    def test_vnflcm_apis_v2_cnf_with_area_in_vim_conn_info(self):
+    def test_vnflcm_apis_v2_cnf_with_area_in_registered_vim(self):
         inst_id_a, inst_id_b = (
             self.vnflcm_apis_v2_cnf_test_before_instantiate())
 

tacker/tests/functional/sol_enhanced_policy/sol_kubernetes/test_policy_vim_apis_kubernetes.py

@@ -15,7 +15,7 @@ from tacker.tests.functional.sol_enhanced_policy.base import (
     VimAPIsTest)
 
 
-class VimAPIsOpenstackTest(VimAPIsTest):
+class VimAPIsKubernetesTest(VimAPIsTest):
 
     def test_vim_apis_vim_with_area_kubernetes(self):
         self._test_vim_apis_enhanced_policy('kubernetes', 'local-k8s-vim.yaml')

tacker/tests/functional/sol_terraform_v2/test_terraform.py

@@ -197,7 +197,7 @@ class VnfLcmTerraformTest(base_v2.BaseVnfLcmTerraformV2Test):
         self.check_package_usage(self.basic_pkg, state='NOT_IN_USE')
 
     def test_change_vnfpkg_rollback(self):
-        """Test basic LCM operations
+        """Test rollback operation for change current vnf package
 
         * About LCM operations:
           This test includes the following operations.
@@ -334,7 +334,7 @@ class VnfLcmTerraformTest(base_v2.BaseVnfLcmTerraformV2Test):
         self.check_package_usage(self.basic_pkg, state='NOT_IN_USE')
 
     def test_instantiate_rollback(self):
-        """Test rollback operation for instantiation.
+        """Test rollback operation for instantiation
 
         * About LCM operations:
           This test includes the following operations.

tacker/tests/functional/sol_v2/notification/test_server_notification.py

@@ -49,28 +49,6 @@ class ServerNotificationTest(test_vnflcm_basic_common.CommonVnfLcmTest):
     @classmethod
     def setUpClass(cls):
         super(ServerNotificationTest, cls).setUpClass()
-        image_path = utils.test_etc_sample("etsi/nfv/common/Files/images",
-            "cirros-0.5.2-x86_64-disk.img")
-
-        # for basic lcms tests max pattern
-        basic_lcms_max_path = utils.test_sample("functional/sol_v2_common",
-                                                "basic_lcms_max")
-        cls.max_pkg, cls.max_vnfd_id = cls.create_vnf_package(
-            basic_lcms_max_path, image_path=image_path)
-
-        # for basic lcms tests min pattern
-        basic_lcms_min_path = utils.test_sample("functional/sol_v2_common",
-                                                "basic_lcms_min")
-        # no image contained
-        cls.min_pkg, cls.min_vnfd_id = cls.create_vnf_package(
-            basic_lcms_min_path)
-
-        # for update vnf test
-        update_vnf_path = utils.test_sample("functional/sol_v2_common",
-                                            "update_vnf")
-        # no image contained
-        cls.upd_pkg, cls.upd_vnfd_id = cls.create_vnf_package(
-            update_vnf_path)
 
         # for server_notification test
         server_notification_path = utils.test_sample(
@@ -82,9 +60,6 @@ class ServerNotificationTest(test_vnflcm_basic_common.CommonVnfLcmTest):
     @classmethod
     def tearDownClass(cls):
         super(ServerNotificationTest, cls).tearDownClass()
-        cls.delete_vnf_package(cls.max_pkg)
-        cls.delete_vnf_package(cls.min_pkg)
-        cls.delete_vnf_package(cls.upd_pkg)
         cls.delete_vnf_package(cls.svn_pkg)
 
     def setUp(self):