commit 9bc63ac2c1365535af344954b951b1ff04868ea1
author aticig <gulsum.atici@canonical.com> Wed Jul 27 09:32:06 2022 +0300
committer cubag <gcuba@whitestack.com> Fri Aug 19 01:35:00 2022 +0200
tree fbc7ff6cdf7f90f04725a93c664ed3d72f3ddb88
parent ef91e081388b7eb99bd359c6eca0b757285f584a

Feature 10944 Change naming of charms

Adding find_charm_name method and
changing _deploy_n2vc and _heal_n2vc methods in LCM

Change-Id: I62fdf3e66493c26e07e80ba7874badbe7c74c95e
Signed-off-by: aticig <gulsum.atici@canonical.com>

osm_lcm/ns.py

diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py
index 118b31e..b1c027a 100644
--- a/osm_lcm/ns.py
+++ b/osm_lcm/ns.py
@@ -3735,10 +3735,16 @@
         self.logger.debug(
             logging_text + "_deploy_n2vc vnfd_id={}, vdu_id={}".format(vnfd_id, vdu_id)
         )
+
+        charm_name = ""
+        get_charm_name = False
         if "execution-environment-list" in descriptor_config:
             ee_list = descriptor_config.get("execution-environment-list", [])
         elif "juju" in descriptor_config:
             ee_list = [descriptor_config]  # ns charms
+            if "execution-environment-list" not in descriptor_config:
+                # charm name is only required for ns charms
+                get_charm_name = True
         else:  # other types as script are not supported
             ee_list = []
 
@@ -3752,6 +3758,8 @@
             ee_descriptor_id = ee_item.get("id")
             if ee_item.get("juju"):
                 vca_name = ee_item["juju"].get("charm")
+                if get_charm_name:
+                    charm_name = self.find_charm_name(db_nsr, str(vca_name))
                 vca_type = (
                     "lxc_proxy_charm"
                     if ee_item["juju"].get("charm") is not None
@@ -3810,6 +3818,7 @@
                     "vdu_name": vdu_name,
                     "type": vca_type,
                     "ee_descriptor_id": ee_descriptor_id,
+                    "charm_name": charm_name,
                 }
                 vca_index += 1
 
@@ -7832,10 +7841,16 @@
         self.logger.debug(
             logging_text + "_deploy_n2vc vnfd_id={}, vdu_id={}".format(vnfd_id, vdu_id)
         )
+
+        charm_name = ""
+        get_charm_name = False
         if "execution-environment-list" in descriptor_config:
             ee_list = descriptor_config.get("execution-environment-list", [])
         elif "juju" in descriptor_config:
             ee_list = [descriptor_config]  # ns charms
+            if "execution-environment-list" not in descriptor_config:
+                # charm name is only required for ns charms
+                get_charm_name = True
         else:  # other types as script are not supported
             ee_list = []
 
@@ -7849,6 +7864,8 @@
             ee_descriptor_id = ee_item.get("id")
             if ee_item.get("juju"):
                 vca_name = ee_item["juju"].get("charm")
+                if get_charm_name:
+                    charm_name = self.find_charm_name(db_nsr, str(vca_name))
                 vca_type = (
                     "lxc_proxy_charm"
                     if ee_item["juju"].get("charm") is not None
@@ -7907,6 +7924,7 @@
                     "vdu_name": vdu_name,
                     "type": vca_type,
                     "ee_descriptor_id": ee_descriptor_id,
+                    "charm_name": charm_name,
                 }
                 vca_index += 1