Bug 1234: OSM reports successful deployment when a charm relation fails
[osm/LCM.git] / osm_lcm / tests / test_ns.py
index 1441e72..2dbc006 100644 (file)
 
 import asynctest  # pip3 install asynctest --user
 import asyncio
+from copy import deepcopy
 import yaml
 import copy
+from n2vc.exceptions import N2VCException
 from os import getenv
 from osm_lcm import ns
 from osm_common.msgkafka import MsgKafka
+
+from osm_lcm.data_utils.lcm_config import LcmCfg
 from osm_lcm.lcm_utils import TaskRegistry
 from osm_lcm.ng_ro import NgRoClient
 from osm_lcm.data_utils.database.database import Database
 from osm_lcm.data_utils.filesystem.filesystem import Filesystem
+from osm_lcm.data_utils.vca import Relation, EERelation
 from osm_lcm.data_utils.vnfd import find_software_version
 from osm_lcm.lcm_utils import check_juju_bundle_existence, get_charm_artifact_path
 from osm_lcm.lcm_utils import LcmException
@@ -53,7 +58,7 @@ It allows, if some testing ENV are supplied, testing without mocking some extern
     OSMLCM_RO_XXX: configuration of RO
 """
 
-lcm_config = {
+lcm_config_dict = {
     "global": {"loglevel": "DEBUG"},
     "timeout": {},
     "VCA": {  # TODO replace with os.get_env to get other configurations
@@ -65,7 +70,7 @@ lcm_config = {
         "ca_cert": getenv("OSMLCM_VCA_CACERT", None),
         "apiproxy": getenv("OSMLCM_VCA_APIPROXY", "192.168.1.1"),
     },
-    "ro_config": {
+    "RO": {
         "uri": "http://{}:{}/openmano".format(
             getenv("OSMLCM_RO_HOST", "ro"), getenv("OSMLCM_RO_PORT", "9090")
         ),
@@ -76,8 +81,25 @@ lcm_config = {
     },
 }
 
+lcm_config = LcmCfg()
+lcm_config.set_from_dict(lcm_config_dict)
+lcm_config.transform()
+
+nsr_id = descriptors.test_ids["TEST-A"]["ns"]
+nslcmop_id = descriptors.test_ids["TEST-A"]["update"]
+vnfr_id = "6421c7c9-d865-4fb4-9a13-d4275d243e01"
+vnfd_id = "7637bcf8-cf14-42dc-ad70-c66fcf1e6e77"
+update_fs = Mock(autospec=True)
+update_fs.path.__add__ = Mock()
+update_fs.path.side_effect = ["/", "/", "/", "/"]
+update_fs.sync.side_effect = [None, None]
+
 
-class TestMyNS(asynctest.TestCase):
+def callable(a):
+    return a
+
+
+class TestBaseNS(asynctest.TestCase):
     async def _n2vc_DeployCharms(
         self,
         model_name,
@@ -87,7 +109,7 @@ class TestMyNS(asynctest.TestCase):
         params={},
         machine_spec={},
         callback=None,
-        *callback_args
+        *callback_args,
     ):
         if callback:
             for status, message in (
@@ -122,15 +144,11 @@ class TestMyNS(asynctest.TestCase):
         print("kwargs > {}".format(kwargs))
         if args:
             if "update" in args:
-                ro_ns_desc = yaml.safe_load(
-                    descriptors.ro_update_action_text
-                )
+                ro_ns_desc = yaml.safe_load(descriptors.ro_update_action_text)
                 while True:
                     yield ro_ns_desc
         if kwargs.get("delete"):
-            ro_ns_desc = yaml.safe_load(
-                descriptors.ro_delete_action_text
-            )
+            ro_ns_desc = yaml.safe_load(descriptors.ro_delete_action_text)
             while True:
                 yield ro_ns_desc
 
@@ -169,48 +187,44 @@ class TestMyNS(asynctest.TestCase):
         return str(uuid4())
 
     async def setUp(self):
-
-        # Mock DB
+        self.mock_db()
+        self.mock_kafka()
+        self.mock_filesystem()
+        self.mock_task_registry()
+        self.mock_vca_k8s()
+        self.create_nslcm_class()
+        self.mock_logging()
+        self.mock_vca_n2vc()
+        self.mock_ro()
+
+    def mock_db(self):
         if not getenv("OSMLCMTEST_DB_NOMOCK"):
             # Cleanup singleton Database instance
             Database.instance = None
 
             self.db = Database({"database": {"driver": "memory"}}).instance.db
+            self.db.create_list("vnfds", yaml.safe_load(descriptors.db_vnfds_text))
             self.db.create_list(
-                "vnfds", yaml.safe_load(descriptors.db_vnfds_text)
-            )
-            self.db.create_list(
-                "vnfds_revisions",
-                yaml.safe_load(descriptors.db_vnfds_revisions_text),
+                "vnfds_revisions", yaml.safe_load(descriptors.db_vnfds_revisions_text)
             )
+            self.db.create_list("nsds", yaml.safe_load(descriptors.db_nsds_text))
+            self.db.create_list("nsrs", yaml.safe_load(descriptors.db_nsrs_text))
             self.db.create_list(
-                "nsds", yaml.safe_load(descriptors.db_nsds_text)
+                "vim_accounts", yaml.safe_load(descriptors.db_vim_accounts_text)
             )
             self.db.create_list(
-                "nsrs", yaml.safe_load(descriptors.db_nsrs_text)
-            )
-            self.db.create_list(
-                "vim_accounts",
-                yaml.safe_load(descriptors.db_vim_accounts_text),
-            )
-            self.db.create_list(
-                "k8sclusters",
-                yaml.safe_load(descriptors.db_k8sclusters_text),
+                "k8sclusters", yaml.safe_load(descriptors.db_k8sclusters_text)
             )
             self.db.create_list(
                 "nslcmops", yaml.safe_load(descriptors.db_nslcmops_text)
             )
-            self.db.create_list(
-                "vnfrs", yaml.safe_load(descriptors.db_vnfrs_text)
-            )
-            self.db_vim_accounts = yaml.safe_load(
-                descriptors.db_vim_accounts_text
-            )
+            self.db.create_list("vnfrs", yaml.safe_load(descriptors.db_vnfrs_text))
+            self.db_vim_accounts = yaml.safe_load(descriptors.db_vim_accounts_text)
 
-        # Mock kafka
+    def mock_kafka(self):
         self.msg = asynctest.Mock(MsgKafka())
 
-        # Mock filesystem
+    def mock_filesystem(self):
         if not getenv("OSMLCMTEST_FS_NOMOCK"):
             self.fs = asynctest.Mock(
                 Filesystem({"storage": {"driver": "local", "path": "/"}}).instance.fs
@@ -222,13 +236,13 @@ class TestMyNS(asynctest.TestCase):
             # self.fs.file_open.return_value.__enter__.return_value = asynctest.MagicMock()  # called on a python "with"
             # self.fs.file_open.return_value.__enter__.return_value.read.return_value = ""   # empty file
 
-        # Mock TaskRegistry
+    def mock_task_registry(self):
         self.lcm_tasks = asynctest.Mock(TaskRegistry())
         self.lcm_tasks.lock_HA.return_value = True
         self.lcm_tasks.waitfor_related_HA.return_value = None
         self.lcm_tasks.lookfor_related.return_value = ("", [])
 
-        # Mock VCA - K8s
+    def mock_vca_k8s(self):
         if not getenv("OSMLCMTEST_VCA_K8s_NOMOCK"):
             ns.K8sJujuConnector = asynctest.MagicMock(ns.K8sJujuConnector)
             ns.K8sHelmConnector = asynctest.MagicMock(ns.K8sHelmConnector)
@@ -238,17 +252,17 @@ class TestMyNS(asynctest.TestCase):
             ns.N2VCJujuConnector = asynctest.MagicMock(ns.N2VCJujuConnector)
             ns.LCMHelmConn = asynctest.MagicMock(ns.LCMHelmConn)
 
-        # Create NsLCM class
+    def create_nslcm_class(self):
         self.my_ns = ns.NsLcm(self.msg, self.lcm_tasks, lcm_config, self.loop)
         self.my_ns.fs = self.fs
         self.my_ns.db = self.db
         self.my_ns._wait_dependent_n2vc = asynctest.CoroutineMock()
 
-        # Mock logging
+    def mock_logging(self):
         if not getenv("OSMLCMTEST_LOGGING_NOMOCK"):
             self.my_ns.logger = asynctest.Mock(self.my_ns.logger)
 
-        # Mock VCA - N2VC
+    def mock_vca_n2vc(self):
         if not getenv("OSMLCMTEST_VCA_NOMOCK"):
             pub_key = getenv("OSMLCMTEST_NS_PUBKEY", "ssh-rsa test-pub-key t@osm.com")
             # self.my_ns.n2vc = asynctest.Mock(N2VC())
@@ -292,11 +306,14 @@ class TestMyNS(asynctest.TestCase):
             self.my_ns.n2vc.delete_namespace = asynctest.CoroutineMock(
                 return_value=None
             )
+            self.my_ns.n2vc.register_execution_environment = asynctest.CoroutineMock(
+                return_value="model-name.application-name.k8s"
+            )
 
-        # Mock RO
+    def mock_ro(self):
         if not getenv("OSMLCMTEST_RO_NOMOCK"):
             self.my_ns.RO = asynctest.Mock(
-                NgRoClient(self.loop, **lcm_config["ro_config"])
+                NgRoClient(self.loop, **lcm_config.RO.to_dict())
             )
             # TODO first time should be empty list, following should return a dict
             # self.my_ns.RO.get_list = asynctest.CoroutineMock(self.my_ns.RO.get_list, return_value=[])
@@ -390,6 +407,8 @@ class TestMyNS(asynctest.TestCase):
     #     await self.test_instantiate()
     #     # this will check that the initial-congig-primitive 'not_to_be_called' is not called
 
+
+class TestMyNS(TestBaseNS):
     @asynctest.fail_on(active_handles=True)
     async def test_start_stop_rebuild_pass(self):
         nsr_id = descriptors.test_ids["TEST-OP-VNF"]["ns"]
@@ -839,7 +858,10 @@ class TestMyNS(asynctest.TestCase):
             self.assertEqual(return_value, expected_value)
             with self.assertRaises(Exception) as context:
                 self.db.get_one("vnfrs", {"_id": vnf_instance_id})
-            self.assertTrue("database exception Not found entry with filter" in str(context.exception))
+            self.assertTrue(
+                "database exception Not found entry with filter"
+                in str(context.exception)
+            )
 
     # test vertical scale executes sucessfully
     # @patch("osm_lcm.ng_ro.status.response")
@@ -954,747 +976,653 @@ class TestMyNS(asynctest.TestCase):
     #     self.assertEqual(db_nsr.get("errorDescription "), None, "errorDescription different than None")
     #     self.assertEqual(db_nsr.get("errorDetail"), None, "errorDetail different than None")
 
-    # Test update method
-
-    async def test_update(self):
-
-        nsr_id = descriptors.test_ids["TEST-A"]["ns"]
-        nslcmop_id = descriptors.test_ids["TEST-A"]["update"]
-        vnfr_id = "6421c7c9-d865-4fb4-9a13-d4275d243e01"
-        vnfd_id = "7637bcf8-cf14-42dc-ad70-c66fcf1e6e77"
-
-        def mock_reset():
-            mock_charm_hash.reset_mock()
-            mock_juju_bundle.reset_mock()
-            fs.sync.reset_mock()
-            mock_charm_upgrade.reset_mock()
-            mock_software_version.reset_mock()
-
-        with self.subTest(
-            i=1,
-            t="Update type: CHANGE_VNFPKG, latest_vnfd revision changed,"
-            "Charm package changed, sw-version is not changed.",
-        ):
-
-            self.db.set_one(
-                "vnfds",
-                q_filter={"_id": vnfd_id},
-                update_dict={"_admin.revision": 3, "kdu": []},
-            )
-
-            self.db.set_one(
-                "vnfds_revisions",
-                q_filter={"_id": vnfd_id + ":1"},
-                update_dict={"_admin.revision": 1, "kdu": []},
-            )
-
-            self.db.set_one(
-                "vnfrs", q_filter={"_id": vnfr_id}, update_dict={"revision": 1}
-            )
-
-            mock_charm_hash = Mock(autospec=True)
-            mock_charm_hash.return_value = True
-
-            mock_juju_bundle = Mock(return_value=None)
-
-            mock_software_version = Mock(autospec=True)
-            mock_software_version.side_effect = ["1.0", "1.0"]
-
-            mock_charm_upgrade = asynctest.Mock(autospec=True)
-            task = asyncio.Future()
-            task.set_result(("COMPLETED", "some_output"))
-            mock_charm_upgrade.return_value = task
-
-            fs = Mock(autospec=True)
-            fs.path.__add__ = Mock()
-            fs.path.side_effect = ["/", "/", "/", "/"]
-            fs.sync.side_effect = [None, None]
-
-            instance = self.my_ns
-
-            expected_operation_state = "COMPLETED"
-            expected_operation_error = ""
-            expected_vnfr_revision = 3
-            expected_ns_state = "INSTANTIATED"
-            expected_ns_operational_state = "running"
-
-            with patch.object(instance, "fs", fs), patch(
-                "osm_lcm.lcm_utils.LcmBase.check_charm_hash_changed", mock_charm_hash
-            ), patch("osm_lcm.ns.NsLcm._ns_charm_upgrade", mock_charm_upgrade), patch(
-                "osm_lcm.data_utils.vnfd.find_software_version", mock_software_version
-            ), patch(
-                "osm_lcm.lcm_utils.check_juju_bundle_existence", mock_juju_bundle
-            ):
-
-                await instance.update(nsr_id, nslcmop_id)
-                return_operation_state = self.db.get_one(
-                    "nslcmops", {"_id": nslcmop_id}
-                ).get("operationState")
-                return_operation_error = self.db.get_one(
-                    "nslcmops", {"_id": nslcmop_id}
-                ).get("errorMessage")
-                return_ns_operational_state = self.db.get_one(
-                    "nsrs", {"_id": nsr_id}
-                ).get("operational-status")
-
-                return_vnfr_revision = self.db.get_one("vnfrs", {"_id": vnfr_id}).get(
-                    "revision"
-                )
-
-                return_ns_state = self.db.get_one("nsrs", {"_id": nsr_id}).get(
-                    "nsState"
-                )
-
-                mock_charm_hash.assert_called_with(
-                    "7637bcf8-cf14-42dc-ad70-c66fcf1e6e77:1/hackfest_3charmed_vnfd/charms/simple",
-                    "7637bcf8-cf14-42dc-ad70-c66fcf1e6e77:3/hackfest_3charmed_vnfd/charms/simple",
-                )
-
-                self.assertEqual(fs.sync.call_count, 2)
-                self.assertEqual(return_ns_state, expected_ns_state)
-                self.assertEqual(return_operation_state, expected_operation_state)
-                self.assertEqual(return_operation_error, expected_operation_error)
-                self.assertEqual(
-                    return_ns_operational_state, expected_ns_operational_state
-                )
-                self.assertEqual(return_vnfr_revision, expected_vnfr_revision)
-
-            mock_reset()
-
-        with self.subTest(
-            i=2, t="Update type: CHANGE_VNFPKG, latest_vnfd revision not changed"
-        ):
-
-            self.db.set_one(
-                "vnfds", q_filter={"_id": vnfd_id}, update_dict={"_admin.revision": 1}
-            )
-
-            self.db.set_one(
-                "vnfrs", q_filter={"_id": vnfr_id}, update_dict={"revision": 1}
-            )
-
-            mock_charm_hash = Mock(autospec=True)
-            mock_charm_hash.return_value = True
-
-            mock_juju_bundle = Mock(return_value=None)
-            mock_software_version = Mock(autospec=True)
-
-            mock_charm_upgrade = asynctest.Mock(autospec=True)
-            task = asyncio.Future()
-            task.set_result(("COMPLETED", "some_output"))
-            mock_charm_upgrade.return_value = task
-
-            fs = Mock(autospec=True)
-            fs.path.__add__ = Mock()
-            fs.path.side_effect = ["/", "/", "/", "/"]
-            fs.sync.side_effect = [None, None]
-
-            instance = self.my_ns
-
-            expected_operation_state = "COMPLETED"
-            expected_operation_error = ""
-            expected_vnfr_revision = 1
-            expected_ns_state = "INSTANTIATED"
-            expected_ns_operational_state = "running"
-
-            with patch.object(instance, "fs", fs), patch(
-                "osm_lcm.lcm_utils.LcmBase.check_charm_hash_changed", mock_charm_hash
-            ), patch("osm_lcm.ns.NsLcm._ns_charm_upgrade", mock_charm_upgrade), patch(
-                "osm_lcm.lcm_utils.check_juju_bundle_existence", mock_juju_bundle
-            ):
-
-                await instance.update(nsr_id, nslcmop_id)
-
-                return_operation_state = self.db.get_one(
-                    "nslcmops", {"_id": nslcmop_id}
-                ).get("operationState")
-
-                return_operation_error = self.db.get_one(
-                    "nslcmops", {"_id": nslcmop_id}
-                ).get("errorMessage")
-
-                return_ns_operational_state = self.db.get_one(
-                    "nsrs", {"_id": nsr_id}
-                ).get("operational-status")
-
-                return_ns_state = self.db.get_one("nsrs", {"_id": nsr_id}).get(
-                    "nsState"
-                )
-
-                return_vnfr_revision = self.db.get_one("vnfrs", {"_id": vnfr_id}).get(
-                    "revision"
-                )
-
-                mock_charm_hash.assert_not_called()
-                mock_software_version.assert_not_called()
-                mock_juju_bundle.assert_not_called()
-                mock_charm_upgrade.assert_not_called()
-                fs.sync.assert_not_called()
-
-                self.assertEqual(return_ns_state, expected_ns_state)
-                self.assertEqual(return_operation_state, expected_operation_state)
-                self.assertEqual(return_operation_error, expected_operation_error)
-                self.assertEqual(
-                    return_ns_operational_state, expected_ns_operational_state
-                )
-                self.assertEqual(return_vnfr_revision, expected_vnfr_revision)
-
-            mock_reset()
-
-        with self.subTest(
-            i=3,
-            t="Update type: CHANGE_VNFPKG, latest_vnfd revision changed, "
-            "Charm package is not changed, sw-version is not changed.",
-        ):
-
-            self.db.set_one(
-                "vnfds", q_filter={"_id": vnfd_id}, update_dict={"_admin.revision": 3}
-            )
-
-            self.db.set_one(
-                "vnfds_revisions",
-                q_filter={"_id": vnfd_id + ":1"},
-                update_dict={"_admin.revision": 1},
-            )
-
-            self.db.set_one(
-                "vnfrs", q_filter={"_id": vnfr_id}, update_dict={"revision": 1}
-            )
-
-            mock_charm_hash = Mock(autospec=True)
-            mock_charm_hash.return_value = False
-
-            mock_juju_bundle = Mock(return_value=None)
-
-            mock_software_version = Mock(autospec=True)
-
-            mock_charm_upgrade = asynctest.Mock(autospec=True)
-            task = asyncio.Future()
-            task.set_result(("COMPLETED", "some_output"))
-            mock_charm_upgrade.return_value = task
-            mock_software_version.side_effect = ["1.0", "1.0"]
-
-            fs = Mock(autospec=True)
-            fs.path.__add__ = Mock()
-            fs.path.side_effect = ["/", "/", "/", "/"]
-            fs.sync.side_effect = [None, None]
-
-            instance = self.my_ns
-
-            expected_operation_state = "COMPLETED"
-            expected_operation_error = ""
-            expected_vnfr_revision = 3
-            expected_ns_state = "INSTANTIATED"
-            expected_ns_operational_state = "running"
-
-            with patch.object(instance, "fs", fs), patch(
-                "osm_lcm.lcm_utils.LcmBase.check_charm_hash_changed", mock_charm_hash
-            ), patch("osm_lcm.ns.NsLcm._ns_charm_upgrade", mock_charm_upgrade), patch(
-                "osm_lcm.lcm_utils.check_juju_bundle_existence", mock_juju_bundle
-            ):
-
-                await instance.update(nsr_id, nslcmop_id)
-
-                return_operation_state = self.db.get_one(
-                    "nslcmops", {"_id": nslcmop_id}
-                ).get("operationState")
-
-                return_operation_error = self.db.get_one(
-                    "nslcmops", {"_id": nslcmop_id}
-                ).get("errorMessage")
-
-                return_ns_operational_state = self.db.get_one(
-                    "nsrs", {"_id": nsr_id}
-                ).get("operational-status")
-
-                return_vnfr_revision = self.db.get_one("vnfrs", {"_id": vnfr_id}).get(
-                    "revision"
-                )
-
-                return_ns_state = self.db.get_one("nsrs", {"_id": nsr_id}).get(
-                    "nsState"
-                )
-
-                mock_charm_hash.assert_called_with(
-                    "7637bcf8-cf14-42dc-ad70-c66fcf1e6e77:1/hackfest_3charmed_vnfd/charms/simple",
-                    "7637bcf8-cf14-42dc-ad70-c66fcf1e6e77:3/hackfest_3charmed_vnfd/charms/simple",
-                )
-
-                self.assertEqual(fs.sync.call_count, 2)
-                self.assertEqual(mock_charm_hash.call_count, 1)
-
-                mock_juju_bundle.assert_not_called()
-                mock_charm_upgrade.assert_not_called()
-
-                self.assertEqual(return_ns_state, expected_ns_state)
-                self.assertEqual(return_operation_state, expected_operation_state)
-                self.assertEqual(return_operation_error, expected_operation_error)
-                self.assertEqual(
-                    return_ns_operational_state, expected_ns_operational_state
-                )
-                self.assertEqual(return_vnfr_revision, expected_vnfr_revision)
-
-            mock_reset()
-
-        with self.subTest(
-            i=4,
-            t="Update type: CHANGE_VNFPKG, latest_vnfd revision changed, "
-            "Charm package exists, sw-version changed.",
-        ):
-
-            self.db.set_one(
-                "vnfds",
-                q_filter={"_id": vnfd_id},
-                update_dict={"_admin.revision": 3, "software-version": "3.0"},
-            )
-
-            self.db.set_one(
-                "vnfds_revisions",
-                q_filter={"_id": vnfd_id + ":1"},
-                update_dict={"_admin.revision": 1},
-            )
-
-            self.db.set_one(
-                "vnfrs",
-                q_filter={"_id": vnfr_id},
-                update_dict={"revision": 1},
-            )
-
-            mock_charm_hash = Mock(autospec=True)
-            mock_charm_hash.return_value = False
-
-            mock_juju_bundle = Mock(return_value=None)
-
-            mock_charm_upgrade = asynctest.Mock(autospec=True)
-            task = asyncio.Future()
-            task.set_result(("COMPLETED", "some_output"))
-            mock_charm_upgrade.return_value = task
-
-            mock_charm_artifact = Mock(autospec=True)
-            mock_charm_artifact.side_effect = [
-                "7637bcf8-cf14-42dc-ad70-c66fcf1e6e77:1/hackfest_3charmed_vnfd/charms/simple",
-                "7637bcf8-cf14-42dc-ad70-c66fcf1e6e77/hackfest_3charmed_vnfd/charms/simple",
-            ]
-
-            fs = Mock(autospec=True)
-            fs.path.__add__ = Mock()
-            fs.path.side_effect = ["/", "/", "/", "/"]
-            fs.sync.side_effect = [None, None]
-
-            instance = self.my_ns
-
-            expected_operation_state = "FAILED"
-            expected_operation_error = "FAILED Checking if existing VNF has charm: Software version change is not supported as VNF instance 6421c7c9-d865-4fb4-9a13-d4275d243e01 has charm."
-            expected_vnfr_revision = 1
-            expected_ns_state = "INSTANTIATED"
-            expected_ns_operational_state = "running"
-
-            with patch.object(instance, "fs", fs), patch(
-                "osm_lcm.lcm_utils.LcmBase.check_charm_hash_changed", mock_charm_hash
-            ), patch("osm_lcm.ns.NsLcm._ns_charm_upgrade", mock_charm_upgrade), patch(
-                "osm_lcm.lcm_utils.get_charm_artifact_path", mock_charm_artifact
-            ):
+    @patch("osm_lcm.lcm_utils.LcmBase.check_charm_hash_changed")
+    @patch(
+        "osm_lcm.ns.NsLcm._ns_charm_upgrade", new_callable=asynctest.Mock(autospec=True)
+    )
+    @patch("osm_lcm.data_utils.vnfd.find_software_version")
+    @patch("osm_lcm.lcm_utils.check_juju_bundle_existence")
+    async def test_update_change_vnfpkg_sw_version_not_changed(
+        self,
+        mock_juju_bundle,
+        mock_software_version,
+        mock_charm_upgrade,
+        mock_charm_hash,
+    ):
+        """Update type: CHANGE_VNFPKG, latest_vnfd revision changed,
+        Charm package changed, sw-version is not changed"""
+        self.db.set_one(
+            "vnfds",
+            q_filter={"_id": vnfd_id},
+            update_dict={"_admin.revision": 3, "kdu": []},
+        )
 
-                await instance.update(nsr_id, nslcmop_id)
-
-                return_operation_state = self.db.get_one(
-                    "nslcmops", {"_id": nslcmop_id}
-                ).get("operationState")
-
-                return_operation_error = self.db.get_one(
-                    "nslcmops", {"_id": nslcmop_id}
-                ).get("errorMessage")
-
-                return_ns_operational_state = self.db.get_one(
-                    "nsrs", {"_id": nsr_id}
-                ).get("operational-status")
-
-                return_vnfr_revision = self.db.get_one("vnfrs", {"_id": vnfr_id}).get(
-                    "revision"
-                )
-
-                return_ns_state = self.db.get_one("nsrs", {"_id": nsr_id}).get(
-                    "nsState"
-                )
-
-                self.assertEqual(fs.sync.call_count, 2)
-                mock_charm_hash.assert_not_called()
-
-                mock_juju_bundle.assert_not_called()
-                mock_charm_upgrade.assert_not_called()
-
-                self.assertEqual(return_ns_state, expected_ns_state)
-                self.assertEqual(return_operation_state, expected_operation_state)
-                self.assertEqual(return_operation_error, expected_operation_error)
-                self.assertEqual(
-                    return_ns_operational_state, expected_ns_operational_state
-                )
-                self.assertEqual(return_vnfr_revision, expected_vnfr_revision)
-
-            mock_reset()
-
-        with self.subTest(
-            i=5,
-            t="Update type: CHANGE_VNFPKG, latest_vnfd revision changed,"
-            "Charm package exists, sw-version not changed, juju-bundle exists",
-        ):
-
-            self.db.set_one(
-                "vnfds",
-                q_filter={"_id": vnfd_id},
-                update_dict={
-                    "_admin.revision": 3,
-                    "software-version": "1.0",
-                    "kdu.0.juju-bundle": "stable/native-kdu",
-                },
-            )
+        self.db.set_one(
+            "vnfds_revisions",
+            q_filter={"_id": vnfd_id + ":1"},
+            update_dict={"_admin.revision": 1, "kdu": []},
+        )
 
-            self.db.set_one(
-                "vnfds_revisions",
-                q_filter={"_id": vnfd_id + ":1"},
-                update_dict={
-                    "_admin.revision": 1,
-                    "software-version": "1.0",
-                    "kdu.0.juju-bundle": "stable/native-kdu",
-                },
-            )
+        self.db.set_one("vnfrs", q_filter={"_id": vnfr_id}, update_dict={"revision": 1})
 
-            self.db.set_one(
-                "vnfrs", q_filter={"_id": vnfr_id}, update_dict={"revision": 1}
-            )
+        mock_charm_hash.return_value = True
+        mock_software_version.side_effect = ["1.0", "1.0"]
 
-            mock_charm_hash = Mock(autospec=True)
-            mock_charm_hash.return_value = True
-
-            mock_charm_artifact = Mock(autospec=True)
-            mock_charm_artifact.side_effect = [
-                "7637bcf8-cf14-42dc-ad70-c66fcf1e6e77:1/hackfest_3charmed_vnfd/charms/simple",
-                "7637bcf8-cf14-42dc-ad70-c66fcf1e6e77/hackfest_3charmed_vnfd/charms/simple",
-            ]
-
-            fs = Mock(autospec=True)
-            fs.path.__add__ = Mock()
-            fs.path.side_effect = ["/", "/", "/", "/"]
-            fs.sync.side_effect = [None, None]
-
-            instance = self.my_ns
-
-            expected_operation_state = "FAILED"
-            expected_operation_error = "FAILED Checking whether VNF uses juju bundle: Charm upgrade is not supported for the instance which uses juju-bundle: stable/native-kdu"
-            expected_vnfr_revision = 1
-            expected_ns_state = "INSTANTIATED"
-            expected_ns_operational_state = "running"
-
-            with patch.object(instance, "fs", fs), patch(
-                "osm_lcm.lcm_utils.LcmBase.check_charm_hash_changed", mock_charm_hash
-            ), patch("osm_lcm.lcm_utils.get_charm_artifact_path", mock_charm_artifact):
-
-                await instance.update(nsr_id, nslcmop_id)
-
-                return_operation_state = self.db.get_one(
-                    "nslcmops", {"_id": nslcmop_id}
-                ).get("operationState")
-
-                return_operation_error = self.db.get_one(
-                    "nslcmops", {"_id": nslcmop_id}
-                ).get("errorMessage")
-
-                return_ns_operational_state = self.db.get_one(
-                    "nsrs", {"_id": nsr_id}
-                ).get("operational-status")
-
-                return_vnfr_revision = self.db.get_one("vnfrs", {"_id": vnfr_id}).get(
-                    "revision"
-                )
-
-                return_ns_state = self.db.get_one("nsrs", {"_id": nsr_id}).get(
-                    "nsState"
-                )
-
-                self.assertEqual(fs.sync.call_count, 2)
-                self.assertEqual(mock_charm_hash.call_count, 1)
-                self.assertEqual(mock_charm_hash.call_count, 1)
-
-                mock_charm_upgrade.assert_not_called()
-
-                self.assertEqual(return_ns_state, expected_ns_state)
-                self.assertEqual(return_operation_state, expected_operation_state)
-                self.assertEqual(return_operation_error, expected_operation_error)
-                self.assertEqual(
-                    return_ns_operational_state, expected_ns_operational_state
-                )
-                self.assertEqual(return_vnfr_revision, expected_vnfr_revision)
-
-            mock_reset()
-
-        with self.subTest(
-            i=6,
-            t="Update type: CHANGE_VNFPKG, latest_vnfd revision changed,"
-            "Charm package exists, sw-version not changed, charm-upgrade failed",
-        ):
-
-            self.db.set_one(
-                "vnfds",
-                q_filter={"_id": vnfd_id},
-                update_dict={
-                    "_admin.revision": 3,
-                    "software-version": "1.0",
-                    "kdu": [],
-                },
-            )
+        task = asyncio.Future()
+        task.set_result(("COMPLETED", "some_output"))
+        mock_charm_upgrade.return_value = task
 
-            self.db.set_one(
-                "vnfds_revisions",
-                q_filter={"_id": vnfd_id + ":1"},
-                update_dict={
-                    "_admin.revision": 1,
-                    "software-version": "1.0",
-                    "kdu": [],
-                },
-            )
+        instance = self.my_ns
+        fs = deepcopy(update_fs)
+        instance.fs = fs
 
-            self.db.set_one(
-                "vnfrs", q_filter={"_id": vnfr_id}, update_dict={"revision": 1}
-            )
+        expected_operation_state = "COMPLETED"
+        expected_operation_error = ""
+        expected_vnfr_revision = 3
+        expected_ns_state = "INSTANTIATED"
+        expected_ns_operational_state = "running"
 
-            mock_charm_hash = Mock(autospec=True)
-            mock_charm_hash.return_value = True
-
-            mock_charm_upgrade = asynctest.Mock(autospec=True)
-            task = asyncio.Future()
-            task.set_result(("FAILED", "some_error"))
-            mock_charm_upgrade.return_value = task
-
-            mock_charm_artifact = Mock(autospec=True)
-            mock_charm_artifact.side_effect = [
-                "7637bcf8-cf14-42dc-ad70-c66fcf1e6e77:1/hackfest_3charmed_vnfd/charms/simple",
-                "7637bcf8-cf14-42dc-ad70-c66fcf1e6e77/hackfest_3charmed_vnfd/charms/simple",
-            ]
-
-            fs = Mock(autospec=True)
-            fs.path.__add__ = Mock()
-            fs.path.side_effect = ["/", "/", "/", "/"]
-            fs.sync.side_effect = [None, None]
-
-            instance = self.my_ns
-
-            expected_operation_state = "FAILED"
-            expected_operation_error = "some_error"
-            expected_vnfr_revision = 1
-            expected_ns_state = "INSTANTIATED"
-            expected_ns_operational_state = "running"
-
-            with patch.object(instance, "fs", fs), patch(
-                "osm_lcm.lcm_utils.LcmBase.check_charm_hash_changed", mock_charm_hash
-            ), patch("osm_lcm.ns.NsLcm._ns_charm_upgrade", mock_charm_upgrade):
-
-                await instance.update(nsr_id, nslcmop_id)
-
-                return_operation_state = self.db.get_one(
-                    "nslcmops", {"_id": nslcmop_id}
-                ).get("operationState")
-
-                return_operation_error = self.db.get_one(
-                    "nslcmops", {"_id": nslcmop_id}
-                ).get("errorMessage")
-
-                return_ns_operational_state = self.db.get_one(
-                    "nsrs", {"_id": nsr_id}
-                ).get("operational-status")
-
-                return_vnfr_revision = self.db.get_one("vnfrs", {"_id": vnfr_id}).get(
-                    "revision"
-                )
-
-                return_ns_state = self.db.get_one("nsrs", {"_id": nsr_id}).get(
-                    "nsState"
-                )
-
-                self.assertEqual(fs.sync.call_count, 2)
-                self.assertEqual(mock_charm_hash.call_count, 1)
-                self.assertEqual(mock_charm_upgrade.call_count, 1)
-
-                self.assertEqual(return_ns_state, expected_ns_state)
-                self.assertEqual(return_operation_state, expected_operation_state)
-                self.assertEqual(return_operation_error, expected_operation_error)
-                self.assertEqual(
-                    return_ns_operational_state, expected_ns_operational_state
-                )
-                self.assertEqual(return_vnfr_revision, expected_vnfr_revision)
-
-            mock_reset()
-
-    def test_ns_update_helper_methods(self):
-        def mock_reset():
-            fs.mock_reset()
-            mock_path.mock_reset()
-            mock_checksumdir.mock_reset()
-
-        with self.subTest(
-            i=1, t="Find software version, VNFD does not have have software version"
-        ):
-            # Testing method find_software_version
-
-            db_vnfd = self.db.get_one(
-                "vnfds", {"_id": "7637bcf8-cf14-42dc-ad70-c66fcf1e6e77"}
-            )
-            expected_result = "1.0"
-            result = find_software_version(db_vnfd)
-            self.assertEqual(
-                result, expected_result, "Default sw version should be 1.0"
-            )
+        await instance.update(nsr_id, nslcmop_id)
+        return_operation_state = self.db.get_one("nslcmops", {"_id": nslcmop_id}).get(
+            "operationState"
+        )
+        return_operation_error = self.db.get_one("nslcmops", {"_id": nslcmop_id}).get(
+            "errorMessage"
+        )
+        return_ns_operational_state = self.db.get_one("nsrs", {"_id": nsr_id}).get(
+            "operational-status"
+        )
+        return_vnfr_revision = self.db.get_one("vnfrs", {"_id": vnfr_id}).get(
+            "revision"
+        )
+        return_ns_state = self.db.get_one("nsrs", {"_id": nsr_id}).get("nsState")
+        mock_charm_hash.assert_called_with(
+            f"{vnfd_id}:1/hackfest_3charmed_vnfd/charms/simple",
+            f"{vnfd_id}:3/hackfest_3charmed_vnfd/charms/simple",
+        )
+        self.assertEqual(fs.sync.call_count, 2)
+        self.assertEqual(return_ns_state, expected_ns_state)
+        self.assertEqual(return_operation_state, expected_operation_state)
+        self.assertEqual(return_operation_error, expected_operation_error)
+        self.assertEqual(return_ns_operational_state, expected_ns_operational_state)
+        self.assertEqual(return_vnfr_revision, expected_vnfr_revision)
+
+    @patch("osm_lcm.lcm_utils.LcmBase.check_charm_hash_changed")
+    @patch(
+        "osm_lcm.ns.NsLcm._ns_charm_upgrade", new_callable=asynctest.Mock(autospec=True)
+    )
+    @patch("osm_lcm.data_utils.vnfd.find_software_version")
+    @patch("osm_lcm.lcm_utils.check_juju_bundle_existence")
+    async def test_update_change_vnfpkg_vnfd_revision_not_changed(
+        self,
+        mock_juju_bundle,
+        mock_software_version,
+        mock_charm_upgrade,
+        mock_charm_hash,
+    ):
+        """Update type: CHANGE_VNFPKG, latest_vnfd revision not changed"""
+        self.db.set_one(
+            "vnfds", q_filter={"_id": vnfd_id}, update_dict={"_admin.revision": 1}
+        )
+        self.db.set_one("vnfrs", q_filter={"_id": vnfr_id}, update_dict={"revision": 1})
 
-        with self.subTest(
-            i=2, t="Find software version, VNFD includes software version"
-        ):
-            # Testing method find_software_version
+        mock_charm_hash.return_value = True
 
-            db_vnfd = self.db.get_one(
-                "vnfds", {"_id": "7637bcf8-cf14-42dc-ad70-c66fcf1e6e77"}
-            )
-            db_vnfd["software-version"] = "3.1"
-            expected_result = "3.1"
-            result = find_software_version(db_vnfd)
-            self.assertEqual(result, expected_result, "VNFD software version is wrong")
+        task = asyncio.Future()
+        task.set_result(("COMPLETED", "some_output"))
+        mock_charm_upgrade.return_value = task
 
-        with self.subTest(i=3, t="Check charm hash, Hash has did not change"):
-            # Testing method check_charm_hash_changed
+        instance = self.my_ns
 
-            current_path, target_path = "/tmp/charm1", "/tmp/charm1"
-            fs = Mock(autospec=True)
-            fs.path.__add__ = Mock()
-            fs.path.side_effect = ["/", "/", "/", "/"]
+        expected_operation_state = "COMPLETED"
+        expected_operation_error = ""
+        expected_vnfr_revision = 1
+        expected_ns_state = "INSTANTIATED"
+        expected_ns_operational_state = "running"
 
-            mock_path = Mock(autospec=True)
-            mock_path.exists.side_effect = [True, True]
+        await instance.update(nsr_id, nslcmop_id)
+        return_operation_state = self.db.get_one("nslcmops", {"_id": nslcmop_id}).get(
+            "operationState"
+        )
+        return_operation_error = self.db.get_one("nslcmops", {"_id": nslcmop_id}).get(
+            "errorMessage"
+        )
+        return_ns_operational_state = self.db.get_one("nsrs", {"_id": nsr_id}).get(
+            "operational-status"
+        )
+        return_ns_state = self.db.get_one("nsrs", {"_id": nsr_id}).get("nsState")
+        return_vnfr_revision = self.db.get_one("vnfrs", {"_id": vnfr_id}).get(
+            "revision"
+        )
+        mock_charm_hash.assert_not_called()
+        mock_software_version.assert_not_called()
+        mock_juju_bundle.assert_not_called()
+        mock_charm_upgrade.assert_not_called()
+        update_fs.sync.assert_not_called()
+        self.assertEqual(return_ns_state, expected_ns_state)
+        self.assertEqual(return_operation_state, expected_operation_state)
+        self.assertEqual(return_operation_error, expected_operation_error)
+        self.assertEqual(return_ns_operational_state, expected_ns_operational_state)
+        self.assertEqual(return_vnfr_revision, expected_vnfr_revision)
+
+    @patch("osm_lcm.lcm_utils.LcmBase.check_charm_hash_changed")
+    @patch(
+        "osm_lcm.ns.NsLcm._ns_charm_upgrade", new_callable=asynctest.Mock(autospec=True)
+    )
+    @patch("osm_lcm.data_utils.vnfd.find_software_version")
+    @patch("osm_lcm.lcm_utils.check_juju_bundle_existence")
+    async def test_update_change_vnfpkg_charm_is_not_changed(
+        self,
+        mock_juju_bundle,
+        mock_software_version,
+        mock_charm_upgrade,
+        mock_charm_hash,
+    ):
+        """Update type: CHANGE_VNFPKG, latest_vnfd revision changed
+        Charm package is not changed, sw-version is not changed"""
+        self.db.set_one(
+            "vnfds",
+            q_filter={"_id": vnfd_id},
+            update_dict={"_admin.revision": 3, "kdu": []},
+        )
+        self.db.set_one(
+            "vnfds_revisions",
+            q_filter={"_id": vnfd_id + ":1"},
+            update_dict={"_admin.revision": 1, "kdu": []},
+        )
+        self.db.set_one("vnfrs", q_filter={"_id": vnfr_id}, update_dict={"revision": 1})
+
+        mock_charm_hash.return_value = False
+        mock_software_version.side_effect = ["1.0", "1.0"]
+
+        instance = self.my_ns
+        fs = deepcopy(update_fs)
+        instance.fs = fs
+        expected_operation_state = "COMPLETED"
+        expected_operation_error = ""
+        expected_vnfr_revision = 3
+        expected_ns_state = "INSTANTIATED"
+        expected_ns_operational_state = "running"
+
+        await instance.update(nsr_id, nslcmop_id)
+        return_operation_state = self.db.get_one("nslcmops", {"_id": nslcmop_id}).get(
+            "operationState"
+        )
+        return_operation_error = self.db.get_one("nslcmops", {"_id": nslcmop_id}).get(
+            "errorMessage"
+        )
+        return_ns_operational_state = self.db.get_one("nsrs", {"_id": nsr_id}).get(
+            "operational-status"
+        )
+        return_vnfr_revision = self.db.get_one("vnfrs", {"_id": vnfr_id}).get(
+            "revision"
+        )
+        return_ns_state = self.db.get_one("nsrs", {"_id": nsr_id}).get("nsState")
+        mock_charm_hash.assert_called_with(
+            f"{vnfd_id}:1/hackfest_3charmed_vnfd/charms/simple",
+            f"{vnfd_id}:3/hackfest_3charmed_vnfd/charms/simple",
+        )
+        self.assertEqual(fs.sync.call_count, 2)
+        self.assertEqual(mock_charm_hash.call_count, 1)
+        mock_juju_bundle.assert_not_called()
+        mock_charm_upgrade.assert_not_called()
+        self.assertEqual(return_ns_state, expected_ns_state)
+        self.assertEqual(return_operation_state, expected_operation_state)
+        self.assertEqual(return_operation_error, expected_operation_error)
+        self.assertEqual(return_ns_operational_state, expected_ns_operational_state)
+        self.assertEqual(return_vnfr_revision, expected_vnfr_revision)
+
+    @patch("osm_lcm.lcm_utils.check_juju_bundle_existence")
+    @patch("osm_lcm.lcm_utils.LcmBase.check_charm_hash_changed")
+    @patch(
+        "osm_lcm.ns.NsLcm._ns_charm_upgrade", new_callable=asynctest.Mock(autospec=True)
+    )
+    @patch("osm_lcm.lcm_utils.get_charm_artifact_path")
+    async def test_update_change_vnfpkg_sw_version_changed(
+        self, mock_charm_artifact, mock_charm_upgrade, mock_charm_hash, mock_juju_bundle
+    ):
+        """Update type: CHANGE_VNFPKG, latest_vnfd revision changed
+        Charm package exists, sw-version changed."""
+        self.db.set_one(
+            "vnfds",
+            q_filter={"_id": vnfd_id},
+            update_dict={"_admin.revision": 3, "software-version": "3.0", "kdu": []},
+        )
+        self.db.set_one(
+            "vnfds_revisions",
+            q_filter={"_id": vnfd_id + ":1"},
+            update_dict={"_admin.revision": 1, "kdu": []},
+        )
+        self.db.set_one("vnfrs", q_filter={"_id": vnfr_id}, update_dict={"revision": 1})
+        mock_charm_hash.return_value = False
 
-            mock_checksumdir = Mock(autospec=True)
-            mock_checksumdir.dirhash.side_effect = ["hash_value", "hash_value"]
+        mock_charm_artifact.side_effect = [
+            f"{vnfd_id}:1/hackfest_3charmed_vnfd/charms/simple",
+            f"{vnfd_id}:3/hackfest_3charmed_vnfd/charms/simple",
+        ]
 
-            instance = self.my_ns
-            expected_result = False
+        instance = self.my_ns
+        fs = deepcopy(update_fs)
+        instance.fs = fs
+        expected_operation_state = "FAILED"
+        expected_operation_error = "FAILED Checking if existing VNF has charm: Software version change is not supported as VNF instance 6421c7c9-d865-4fb4-9a13-d4275d243e01 has charm."
+        expected_vnfr_revision = 1
+        expected_ns_state = "INSTANTIATED"
+        expected_ns_operational_state = "running"
+
+        await instance.update(nsr_id, nslcmop_id)
+        return_operation_state = self.db.get_one("nslcmops", {"_id": nslcmop_id}).get(
+            "operationState"
+        )
+        return_operation_error = self.db.get_one("nslcmops", {"_id": nslcmop_id}).get(
+            "errorMessage"
+        )
+        return_ns_operational_state = self.db.get_one("nsrs", {"_id": nsr_id}).get(
+            "operational-status"
+        )
+        return_vnfr_revision = self.db.get_one("vnfrs", {"_id": vnfr_id}).get(
+            "revision"
+        )
+        return_ns_state = self.db.get_one("nsrs", {"_id": nsr_id}).get("nsState")
+        self.assertEqual(fs.sync.call_count, 2)
+        mock_charm_hash.assert_not_called()
+        mock_juju_bundle.assert_not_called()
+        mock_charm_upgrade.assert_not_called()
+        self.assertEqual(return_ns_state, expected_ns_state)
+        self.assertEqual(return_operation_state, expected_operation_state)
+        self.assertEqual(return_operation_error, expected_operation_error)
+        self.assertEqual(return_ns_operational_state, expected_ns_operational_state)
+        self.assertEqual(return_vnfr_revision, expected_vnfr_revision)
+
+    @patch("osm_lcm.lcm_utils.check_juju_bundle_existence")
+    @patch("osm_lcm.lcm_utils.LcmBase.check_charm_hash_changed")
+    @patch(
+        "osm_lcm.ns.NsLcm._ns_charm_upgrade", new_callable=asynctest.Mock(autospec=True)
+    )
+    @patch("osm_lcm.data_utils.vnfd.find_software_version")
+    async def test_update_change_vnfpkg_juju_bundle_exists(
+        self,
+        mock_software_version,
+        mock_charm_upgrade,
+        mock_charm_hash,
+        mock_juju_bundle,
+    ):
+        """Update type: CHANGE_VNFPKG, latest_vnfd revision changed
+        Charm package exists, sw-version not changed, juju-bundle exists"""
+        # Upgrade is not allowed with juju bundles, this will cause TypeError
+        self.db.set_one(
+            "vnfds",
+            q_filter={"_id": vnfd_id},
+            update_dict={
+                "_admin.revision": 5,
+                "software-version": "1.0",
+                "kdu": [{"kdu_name": "native-kdu", "juju-bundle": "stable/native-kdu"}],
+            },
+        )
+        self.db.set_one(
+            "vnfds_revisions",
+            q_filter={"_id": vnfd_id + ":1"},
+            update_dict={
+                "_admin.revision": 1,
+                "software-version": "1.0",
+                "kdu": [{"kdu_name": "native-kdu", "juju-bundle": "stable/native-kdu"}],
+            },
+        )
+        self.db.set_one(
+            "nsrs",
+            q_filter={"_id": nsr_id},
+            update_dict={"_admin.deployed.VCA.0.kdu_name": "native-kdu"},
+        )
+        self.db.set_one("vnfrs", q_filter={"_id": vnfr_id}, update_dict={"revision": 1})
+
+        mock_charm_hash.side_effect = [True]
+        mock_software_version.side_effect = ["1.0", "1.0"]
+        mock_juju_bundle.return_value = True
+        instance = self.my_ns
+        fs = deepcopy(update_fs)
+        instance.fs = fs
+
+        expected_vnfr_revision = 1
+        expected_ns_state = "INSTANTIATED"
+        expected_ns_operational_state = "running"
+
+        await instance.update(nsr_id, nslcmop_id)
+        return_ns_operational_state = self.db.get_one("nsrs", {"_id": nsr_id}).get(
+            "operational-status"
+        )
+        return_vnfr_revision = self.db.get_one("vnfrs", {"_id": vnfr_id}).get(
+            "revision"
+        )
+        return_ns_state = self.db.get_one("nsrs", {"_id": nsr_id}).get("nsState")
+        self.assertEqual(fs.sync.call_count, 2)
+        mock_charm_upgrade.assert_not_called()
+        mock_charm_hash.assert_not_called()
+        self.assertEqual(return_ns_state, expected_ns_state)
+        self.assertEqual(return_ns_operational_state, expected_ns_operational_state)
+        self.assertEqual(return_vnfr_revision, expected_vnfr_revision)
+
+    @patch("osm_lcm.lcm_utils.LcmBase.check_charm_hash_changed")
+    @patch(
+        "osm_lcm.ns.NsLcm._ns_charm_upgrade", new_callable=asynctest.Mock(autospec=True)
+    )
+    async def test_update_change_vnfpkg_charm_upgrade_failed(
+        self, mock_charm_upgrade, mock_charm_hash
+    ):
+        """ "Update type: CHANGE_VNFPKG, latest_vnfd revision changed"
+        Charm package exists, sw-version not changed, charm-upgrade failed"""
+        self.db.set_one(
+            "vnfds",
+            q_filter={"_id": vnfd_id},
+            update_dict={"_admin.revision": 3, "software-version": "1.0", "kdu": []},
+        )
+        self.db.set_one(
+            "vnfds_revisions",
+            q_filter={"_id": vnfd_id + ":1"},
+            update_dict={"_admin.revision": 1, "software-version": "1.0", "kdu": []},
+        )
+        self.db.set_one("vnfrs", q_filter={"_id": vnfr_id}, update_dict={"revision": 1})
 
-            with patch.object(instance, "fs", fs), patch(
-                "checksumdir.dirhash", mock_checksumdir.dirhash
-            ), patch("os.path.exists", mock_path.exists):
+        mock_charm_hash.return_value = True
 
-                result = instance.check_charm_hash_changed(current_path, target_path)
-                self.assertEqual(
-                    result, expected_result, "Wrong charm hash control value"
-                )
-                self.assertEqual(mock_path.exists.call_count, 2)
-                self.assertEqual(mock_checksumdir.dirhash.call_count, 2)
+        task = asyncio.Future()
+        task.set_result(("FAILED", "some_error"))
+        mock_charm_upgrade.return_value = task
 
-            mock_reset()
+        instance = self.my_ns
+        fs = deepcopy(update_fs)
+        instance.fs = fs
+        expected_operation_state = "FAILED"
+        expected_operation_error = "some_error"
+        expected_vnfr_revision = 1
+        expected_ns_state = "INSTANTIATED"
+        expected_ns_operational_state = "running"
 
-        with self.subTest(i=4, t="Check charm hash, Hash has changed"):
-            # Testing method check_charm_hash_changed
+        await instance.update(nsr_id, nslcmop_id)
+        return_operation_state = self.db.get_one("nslcmops", {"_id": nslcmop_id}).get(
+            "operationState"
+        )
+        return_operation_error = self.db.get_one("nslcmops", {"_id": nslcmop_id}).get(
+            "errorMessage"
+        )
+        return_ns_operational_state = self.db.get_one("nsrs", {"_id": nsr_id}).get(
+            "operational-status"
+        )
+        return_vnfr_revision = self.db.get_one("vnfrs", {"_id": vnfr_id}).get(
+            "revision"
+        )
+        return_ns_state = self.db.get_one("nsrs", {"_id": nsr_id}).get("nsState")
+        self.assertEqual(fs.sync.call_count, 2)
+        self.assertEqual(mock_charm_hash.call_count, 1)
+        self.assertEqual(mock_charm_upgrade.call_count, 1)
+        self.assertEqual(return_ns_state, expected_ns_state)
+        self.assertEqual(return_operation_state, expected_operation_state)
+        self.assertEqual(return_operation_error, expected_operation_error)
+        self.assertEqual(return_ns_operational_state, expected_ns_operational_state)
+        self.assertEqual(return_vnfr_revision, expected_vnfr_revision)
+
+    def test_ns_update_find_sw_version_vnfd_not_includes(self):
+        """Find software version, VNFD does not have software version"""
+
+        db_vnfd = self.db.get_one("vnfds", {"_id": vnfd_id})
+        expected_result = "1.0"
+        result = find_software_version(db_vnfd)
+        self.assertEqual(result, expected_result, "Default sw version should be 1.0")
+
+    def test_ns_update_find_sw_version_vnfd_includes(self):
+        """Find software version, VNFD includes software version"""
+
+        db_vnfd = self.db.get_one("vnfds", {"_id": vnfd_id})
+        db_vnfd["software-version"] = "3.1"
+        expected_result = "3.1"
+        result = find_software_version(db_vnfd)
+        self.assertEqual(result, expected_result, "VNFD software version is wrong")
+
+    @patch("os.path.exists")
+    @patch("osm_lcm.lcm_utils.LcmBase.compare_charmdir_hash")
+    @patch("osm_lcm.lcm_utils.LcmBase.compare_charm_hash")
+    def test_ns_update_check_charm_hash_not_changed(
+        self, mock_compare_charm_hash, mock_compare_charmdir_hash, mock_path_exists
+    ):
+        """Check charm hash, Hash did not change"""
 
-            current_path, target_path = "/tmp/charm1", "/tmp/charm2"
-            fs = Mock(autospec=True)
-            fs.path.__add__ = Mock()
-            fs.path.side_effect = ["/", "/", "/", "/"]
+        current_path, target_path = "/tmp/charm1", "/tmp/charm1"
 
-            mock_path = Mock(autospec=True)
-            mock_path.exists.side_effect = [True, True]
+        fs = Mock()
+        fs.path.__add__ = Mock()
+        fs.path.side_effect = [current_path, target_path]
+        fs.path.__add__.side_effect = [current_path, target_path]
 
-            mock_checksumdir = Mock(autospec=True)
-            mock_checksumdir.dirhash.side_effect = ["hash_value", "another_hash_value"]
+        mock_path_exists.side_effect = [True, True]
 
-            instance = self.my_ns
-            expected_result = True
+        mock_compare_charmdir_hash.return_value = callable(False)
+        mock_compare_charm_hash.return_value = callable(False)
 
-            with patch.object(instance, "fs", fs), patch(
-                "checksumdir.dirhash", mock_checksumdir.dirhash
-            ), patch("os.path.exists", mock_path.exists):
+        instance = self.my_ns
+        instance.fs = fs
+        expected_result = False
 
-                result = instance.check_charm_hash_changed(current_path, target_path)
-                self.assertEqual(
-                    result, expected_result, "Wrong charm hash control value"
-                )
-                self.assertEqual(mock_path.exists.call_count, 2)
-                self.assertEqual(mock_checksumdir.dirhash.call_count, 2)
+        result = instance.check_charm_hash_changed(current_path, target_path)
+        self.assertEqual(result, expected_result, "Wrong charm hash control value")
+        self.assertEqual(mock_path_exists.call_count, 2)
+        self.assertEqual(mock_compare_charmdir_hash.call_count, 1)
+        self.assertEqual(mock_compare_charm_hash.call_count, 0)
 
-            mock_reset()
+    @patch("os.path.exists")
+    @patch("osm_lcm.lcm_utils.LcmBase.compare_charmdir_hash")
+    @patch("osm_lcm.lcm_utils.LcmBase.compare_charm_hash")
+    def test_ns_update_check_charm_hash_changed(
+        self, mock_compare_charm_hash, mock_compare_charmdir_hash, mock_path_exists
+    ):
+        """Check charm hash, Hash has changed"""
+
+        current_path, target_path = "/tmp/charm1", "/tmp/charm2"
+
+        fs = Mock()
+        fs.path.__add__ = Mock()
+        fs.path.side_effect = [current_path, target_path, current_path, target_path]
+        fs.path.__add__.side_effect = [
+            current_path,
+            target_path,
+            current_path,
+            target_path,
+        ]
 
-        with self.subTest(i=5, t="Check charm hash, Charm path does not exists"):
-            # Testing method check_charm_hash_changed
+        mock_path_exists.side_effect = [True, True]
+        mock_compare_charmdir_hash.return_value = callable(True)
+        mock_compare_charm_hash.return_value = callable(True)
+
+        instance = self.my_ns
+        instance.fs = fs
+        expected_result = True
+
+        result = instance.check_charm_hash_changed(current_path, target_path)
+        self.assertEqual(result, expected_result, "Wrong charm hash control value")
+        self.assertEqual(mock_path_exists.call_count, 2)
+        self.assertEqual(mock_compare_charmdir_hash.call_count, 1)
+        self.assertEqual(mock_compare_charm_hash.call_count, 0)
+
+    @patch("os.path.exists")
+    @patch("osm_lcm.lcm_utils.LcmBase.compare_charmdir_hash")
+    @patch("osm_lcm.lcm_utils.LcmBase.compare_charm_hash")
+    def test_ns_update_check_no_charm_path(
+        self, mock_compare_charm_hash, mock_compare_charmdir_hash, mock_path_exists
+    ):
+        """Check charm hash, Charm path does not exist"""
+
+        current_path, target_path = "/tmp/charm1", "/tmp/charm2"
+
+        fs = Mock()
+        fs.path.__add__ = Mock()
+        fs.path.side_effect = [current_path, target_path, current_path, target_path]
+        fs.path.__add__.side_effect = [
+            current_path,
+            target_path,
+            current_path,
+            target_path,
+        ]
 
-            current_path, target_path = "/tmp/charm1", "/tmp/charm2"
-            fs = Mock(autospec=True)
-            fs.path.__add__ = Mock()
-            fs.path.side_effect = ["/", "/", "/", "/"]
+        mock_path_exists.side_effect = [True, False]
 
-            mock_path = Mock(autospec=True)
-            mock_path.exists.side_effect = [True, False]
+        mock_compare_charmdir_hash.return_value = callable(False)
+        mock_compare_charm_hash.return_value = callable(False)
+        instance = self.my_ns
+        instance.fs = fs
 
-            mock_checksumdir = Mock(autospec=True)
-            mock_checksumdir.dirhash.side_effect = ["hash_value", "hash_value"]
+        with self.assertRaises(LcmException):
+            instance.check_charm_hash_changed(current_path, target_path)
+            self.assertEqual(mock_path_exists.call_count, 2)
+            self.assertEqual(mock_compare_charmdir_hash.call_count, 0)
+            self.assertEqual(mock_compare_charm_hash.call_count, 0)
 
-            instance = self.my_ns
+    def test_ns_update_check_juju_bundle_existence_bundle_exists(self):
+        """Check juju bundle existence"""
+        test_vnfd2 = self.db.get_one(
+            "vnfds", {"_id": "d96b1cdf-5ad6-49f7-bf65-907ada989293"}
+        )
+        expected_result = "stable/native-kdu"
+        result = check_juju_bundle_existence(test_vnfd2)
+        self.assertEqual(result, expected_result, "Wrong juju bundle name")
+
+    def test_ns_update_check_juju_bundle_existence_bundle_does_not_exist(self):
+        """Check juju bundle existence"""
+        test_vnfd1 = self.db.get_one("vnfds", {"_id": vnfd_id})
+        expected_result = None
+        result = check_juju_bundle_existence(test_vnfd1)
+        self.assertEqual(result, expected_result, "Wrong juju bundle name")
+
+    def test_ns_update_check_juju_bundle_existence_empty_vnfd(self):
+        """Check juju bundle existence"""
+        test_vnfd1 = {}
+        expected_result = None
+        result = check_juju_bundle_existence(test_vnfd1)
+        self.assertEqual(result, expected_result, "Wrong juju bundle name")
+
+    def test_ns_update_check_juju_bundle_existence_invalid_vnfd(self):
+        """Check juju bundle existence"""
+        test_vnfd1 = [{"_id": vnfd_id}]
+        with self.assertRaises(AttributeError):
+            check_juju_bundle_existence(test_vnfd1)
+
+    def test_ns_update_check_juju_charm_artifacts_base_folder_wth_pkgdir(self):
+        """Check charm artifacts"""
+        base_folder = {"folder": vnfd_id, "pkg-dir": "hackfest_3charmed_vnfd"}
+        charm_name = "simple"
+        charm_type = "lxc_proxy_charm"
+        revision = 3
+        expected_result = f"{vnfd_id}:3/hackfest_3charmed_vnfd/charms/simple"
+        result = get_charm_artifact_path(base_folder, charm_name, charm_type, revision)
+        self.assertEqual(result, expected_result, "Wrong charm artifact path")
+
+    def test_ns_update_check_juju_charm_artifacts_base_folder_wthout_pkgdir(self):
+        """Check charm artifacts, SOL004 packages"""
+        base_folder = {"folder": vnfd_id}
+        charm_name = "basic"
+        charm_type, revision = "", ""
+        expected_result = f"{vnfd_id}/Scripts/helm-charts/basic"
+        result = get_charm_artifact_path(base_folder, charm_name, charm_type, revision)
+        self.assertEqual(result, expected_result, "Wrong charm artifact path")
+
+
+class TestInstantiateN2VC(TestBaseNS):
+    async def setUp(self):
+        await super().setUp()
+        self.db_nsr = yaml.safe_load(descriptors.db_nsrs_text)[0]
+        self.db_vnfr = yaml.safe_load(descriptors.db_vnfrs_text)[0]
+        self.vca_index = 1
+        self.my_ns._write_configuration_status = Mock()
+
+    async def call_instantiate_N2VC(self):
+        logging_text = "N2VC Instantiation"
+        config_descriptor = {"config-access": {"ssh-access": {"default-user": "admin"}}}
+        base_folder = {"pkg-dir": "", "folder": "~"}
+        stage = ["Stage", "Message"]
+
+        await self.my_ns.instantiate_N2VC(
+            logging_text=logging_text,
+            vca_index=self.vca_index,
+            nsi_id="nsi_id",
+            db_nsr=self.db_nsr,
+            db_vnfr=self.db_vnfr,
+            vdu_id=None,
+            kdu_name=None,
+            vdu_index=None,
+            kdu_index=None,
+            config_descriptor=config_descriptor,
+            deploy_params={},
+            base_folder=base_folder,
+            nslcmop_id="nslcmop_id",
+            stage=stage,
+            vca_type="native_charm",
+            vca_name="vca_name",
+            ee_config_descriptor={},
+        )
 
-            with patch.object(instance, "fs", fs), patch(
-                "checksumdir.dirhash", mock_checksumdir.dirhash
-            ), patch("os.path.exists", mock_path.exists):
+    def check_config_status(self, expected_status):
+        self.my_ns._write_configuration_status.assert_called_with(
+            nsr_id=self.db_nsr["_id"], vca_index=self.vca_index, status=expected_status
+        )
 
-                with self.assertRaises(LcmException):
+    async def call_ns_add_relation(self):
+        ee_relation = EERelation(
+            {
+                "nsr-id": self.db_nsr["_id"],
+                "vdu-profile-id": None,
+                "kdu-resource-profile-id": None,
+                "vnf-profile-id": "hackfest_vnf1",
+                "execution-environment-ref": "f48163a6-c807-47bc-9682-f72caef5af85.alf-c-ab",
+                "endpoint": "127.0.0.1",
+            }
+        )
 
-                    instance.check_charm_hash_changed(current_path, target_path)
-                    self.assertEqual(mock_path.exists.call_count, 2)
-                    self.assertEqual(mock_checksumdir.dirhash.call_count, 0)
+        relation = Relation("relation-name", ee_relation, ee_relation)
+        cached_vnfrs = {"hackfest_vnf1": self.db_vnfr}
 
-            mock_reset()
+        return await self.my_ns._add_relation(
+            relation=relation,
+            vca_type="native_charm",
+            db_nsr=self.db_nsr,
+            cached_vnfds={},
+            cached_vnfrs=cached_vnfrs,
+        )
 
-        with self.subTest(i=6, t="Check juju bundle existence"):
-            # Testing method check_juju_bundle_existence
+    async def test_add_relation_ok(self):
+        await self.call_instantiate_N2VC()
+        self.check_config_status(expected_status="READY")
 
-            test_vnfd1 = self.db.get_one(
-                "vnfds", {"_id": "7637bcf8-cf14-42dc-ad70-c66fcf1e6e77"}
-            )
-            test_vnfd2 = self.db.get_one(
-                "vnfds", {"_id": "d96b1cdf-5ad6-49f7-bf65-907ada989293"}
-            )
+    async def test_add_relation_returns_false_raises_exception(self):
+        self.my_ns._add_vca_relations = asynctest.CoroutineMock(return_value=False)
 
-            expected_result = None
-            result = check_juju_bundle_existence(test_vnfd1)
-            self.assertEqual(result, expected_result, "Wrong juju bundle name")
+        with self.assertRaises(LcmException) as exception:
+            await self.call_instantiate_N2VC()
 
-            expected_result = "stable/native-kdu"
-            result = check_juju_bundle_existence(test_vnfd2)
-            self.assertEqual(result, expected_result, "Wrong juju bundle name")
+        exception_msg = "Relations could not be added to VCA."
+        self.assertTrue(exception_msg in str(exception.exception))
+        self.check_config_status(expected_status="BROKEN")
 
-        with self.subTest(i=7, t="Check charm artifacts"):
-            # Testing method check_juju_bundle_existence
+    async def test_add_relation_raises_lcm_exception(self):
+        exception_msg = "Relations FAILED"
+        self.my_ns._add_vca_relations = asynctest.CoroutineMock(
+            side_effect=LcmException(exception_msg)
+        )
 
-            base_folder = {
-                "folder": "7637bcf8-cf14-42dc-ad70-c66fcf1e6e77",
-                "pkg-dir": "hackfest_3charmed_vnfd",
-            }
-            charm_name = "simple"
-            charm_type = "lxc_proxy_charm"
-            revision = 3
+        with self.assertRaises(LcmException) as exception:
+            await self.call_instantiate_N2VC()
 
-            expected_result = "7637bcf8-cf14-42dc-ad70-c66fcf1e6e77:3/hackfest_3charmed_vnfd/charms/simple"
-            result = get_charm_artifact_path(
-                base_folder, charm_name, charm_type, revision
-            )
-            self.assertEqual(result, expected_result, "Wrong charm artifact path")
+        self.assertTrue(exception_msg in str(exception.exception))
+        self.check_config_status(expected_status="BROKEN")
 
-            # SOL004 packages
-            base_folder = {
-                "folder": "7637bcf8-cf14-42dc-ad70-c66fcf1e6e77",
-            }
-            charm_name = "basic"
-            charm_type = ""
-            revision = ""
+    async def test_n2vc_add_relation_fails_raises_exception(self):
+        exception_msg = "N2VC failed to add relations"
+        self.my_ns.n2vc.add_relation = asynctest.CoroutineMock(
+            side_effect=N2VCException(exception_msg)
+        )
+        with self.assertRaises(LcmException) as exception:
+            await self.call_ns_add_relation()
+        self.assertTrue(exception_msg in str(exception.exception))
 
-            expected_result = (
-                "7637bcf8-cf14-42dc-ad70-c66fcf1e6e77/Scripts/helm-charts/basic"
-            )
-            result = get_charm_artifact_path(
-                base_folder, charm_name, charm_type, revision
-            )
-            self.assertEqual(result, expected_result, "Wrong charm artifact path")
+    async def test_n2vc_add_relation_ok_returns_true(self):
+        self.my_ns.n2vc.add_relation = asynctest.CoroutineMock(return_value=None)
+        self.assertTrue(await self.call_ns_add_relation())
 
 
 if __name__ == "__main__":