X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Flcm_utils.py;h=12fd7fbb0d6624397dc9e1f8a69e833aef3c79ed;hb=refs%2Fchanges%2F76%2F13876%2F7;hp=579a2a5b2b7a49a343ba773e8085e86f64135f1e;hpb=c773744f338d3c019b4978b0fc591d14c614b4cf;p=osm%2FLCM.git

diff --git a/osm_lcm/lcm_utils.py b/osm_lcm/lcm_utils.py
index 579a2a5..12fd7fb 100644
--- a/osm_lcm/lcm_utils.py
+++ b/osm_lcm/lcm_utils.py
@@ -40,10 +40,6 @@ class LcmException(Exception):
     pass
 
 
-class LcmExceptionNoMgmtIP(LcmException):
-    pass
-
-
 class LcmExceptionExit(LcmException):
     pass
 
@@ -196,6 +192,9 @@ def vld_to_ro_ip_profile(source_data):
             "dhcp_count": source_data["dhcp-params"].get("count")
             if source_data.get("dhcp-params")
             else None,
+            "ipv6_address_mode": source_data["ipv6-address-mode"]
+            if "ipv6-address-mode" in source_data
+            else None,
         }
 
 
@@ -237,7 +236,7 @@ class LcmBase:
         Returns:
             hex digest  (str): The hash of the charm file
         """
-        filehash = hashlib.md5()
+        filehash = hashlib.sha256()
         with open(zipped_file, mode="rb") as file:
             contents = file.read()
             filehash.update(contents)
@@ -568,17 +567,19 @@ class TaskRegistry(LcmBase):
         """
         Cancel all active tasks of a concrete ns, nsi, vim_account, sdn identified for _id. If op_id is supplied only
         this is cancelled, and the same with task_name
+        :return: cancelled task to be awaited if needed
         """
         if not self.task_registry[topic].get(_id):
             return
         for op_id in reversed(self.task_registry[topic][_id]):
             if target_op_id and target_op_id != op_id:
                 continue
-            for task_name, task in self.task_registry[topic][_id][op_id].items():
+            for task_name, task in list(self.task_registry[topic][_id][op_id].items()):
                 if target_task_name and target_task_name != task_name:
                     continue
                 # result =
                 task.cancel()
+                yield task
                 # if result:
                 #     self.logger.debug("{} _id={} order_id={} task={} cancelled".format(topic, _id, op_id, task_name))