From eb55b01cdde7a68e06e32e24dc381f477f152ea1 Mon Sep 17 00:00:00 2001 From: tierno Date: Thu, 29 Nov 2018 08:10:04 +0000 Subject: [PATCH] Bug 585 : change charm model_name to ns_id and adding index to application_name to ensure it is unique. Bug 602 ensure terminating is set in a sooner stage Change-Id: If1633d7a0a8d39ceabd8bc7a16a9452bf8e80684 Signed-off-by: tierno --- osm_lcm/lcm.py | 4 ++-- osm_lcm/ns.py | 22 ++++++++++++---------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/osm_lcm/lcm.py b/osm_lcm/lcm.py index a88e785..4bc2ca8 100644 --- a/osm_lcm/lcm.py +++ b/osm_lcm/lcm.py @@ -44,8 +44,8 @@ min_RO_version = [0, 5, 84] min_n2vc_version = "0.0.2" min_common_version = "0.1.11" # uncomment if LCM is installed as library and installed, and get them from __init__.py -lcm_version = '0.1.27' -lcm_version_date = '2018-11-27' +lcm_version = '0.1.28' +lcm_version_date = '2018-11-29' class Lcm: diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py index 6589e22..173ad88 100644 --- a/osm_lcm/ns.py +++ b/osm_lcm/ns.py @@ -805,20 +805,18 @@ class NsLcm(LcmBase): # ns_name will be ignored in the current version of N2VC # but will be implemented for the next point release. - model_name = 'default' # TODO bug 581 : change to nsr_id + model_name = "default" # TODO bug 585 nsr_id if vdu_id: - vdu_id_text = vdu_id + vdu_id_text = vdu_id + "-" else: - vdu_id_text = "vnfd" # TODO bug 581 remove and add just an empty string "" + vdu_id_text = "-" application_name = self.n2vc.FormatApplicationName(nsr_name, vnf_index, vdu_id_text) - # TODO bug 581 Add "-" as a final argument vca_index = len(vca_deployed_list) # trunk name and add two char index at the end to ensure that it is unique. It is assumed no more than # 26*26 charm in the same NS - # TODO bug 581 uncoment - # application_name = application_name[0:48] - # application_name += chr(97 + vca_index / 26) + chr(97 + vca_index % 26) + application_name = application_name[0:48] + application_name += chr(97 + vca_index // 26) + chr(97 + vca_index % 26) vca_deployed_ = { "member-vnf-index": vnf_index, "vdu_id": vdu_id, @@ -1103,6 +1101,8 @@ class NsLcm(LcmBase): try: if RO_nsr_id: step = db_nsr_update["detailed-status"] = db_nslcmop_update["detailed-status"] = "Deleting ns at RO" + self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update) + self.update_db_2("nsrs", nsr_id, db_nsr_update) self.logger.debug(logging_text + step) desc = await RO.delete("ns", RO_nsr_id) RO_delete_action = desc["action_id"] @@ -1128,11 +1128,13 @@ class NsLcm(LcmBase): break else: assert False, "ROclient.check_action_status returns unknown {}".format(ns_status) - await asyncio.sleep(5, loop=self.loop) - delete_timeout -= 5 if detailed_status != detailed_status_old: - detailed_status_old = db_nslcmop_update["detailed-status"] = detailed_status + detailed_status_old = db_nslcmop_update["detailed-status"] = \ + db_nsr_update["detailed-status"] = detailed_status self.update_db_2("nslcmops", nslcmop_id, db_nslcmop_update) + self.update_db_2("nsrs", nsr_id, db_nsr_update) + await asyncio.sleep(5, loop=self.loop) + delete_timeout -= 5 else: # delete_timeout <= 0: raise ROclient.ROClientException("Timeout waiting ns deleted from VIM") -- 2.17.1