From 29cfa602d40ff4d3e7f611414cf66d4cc62a2be6 Mon Sep 17 00:00:00 2001 From: tierno Date: Wed, 19 Jun 2019 08:46:07 +0000 Subject: [PATCH] fix bug 770. Execute initial-config-primitive for NS-charm Change-Id: I638b749dda47abe11c45bf0802ae9c45b5649358 Signed-off-by: tierno --- osm_lcm/lcm.py | 4 ++-- osm_lcm/ns.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/osm_lcm/lcm.py b/osm_lcm/lcm.py index 3c7a205..8f66055 100644 --- a/osm_lcm/lcm.py +++ b/osm_lcm/lcm.py @@ -46,8 +46,8 @@ min_RO_version = [0, 6, 3] min_n2vc_version = "0.0.2" min_common_version = "0.1.19" # uncomment if LCM is installed as library and installed, and get them from __init__.py -lcm_version = '0.1.40' -lcm_version_date = '2019-06-13' +lcm_version = '0.1.41' +lcm_version_date = '2019-06-19' health_check_file = path.expanduser("~") + "/time_last_ping" # TODO find better location for this file diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py index caadce1..4a16835 100644 --- a/osm_lcm/ns.py +++ b/osm_lcm/ns.py @@ -1228,6 +1228,7 @@ class NsLcm(LcmBase): if isinstance(v, str) and v.startswith("!!yaml "): add_params[k] = yaml.safe_load(v[7:]) add_params["rw_mgmt_ip"] = None + initial_config_primitive_list = nsd["ns-configuration"].get('initial-config-primitive', []) # add primitive verify-ssh-credentials to the list after config only when is a vnf or vdu charm initial_config_primitive_list = initial_config_primitive_list.copy() @@ -1396,6 +1397,7 @@ class NsLcm(LcmBase): # waiting all charms are ok configuration_failed = False if number_to_configure: + step = "Waiting all charms are active" old_status = "configuring: init: {}".format(number_to_configure) db_nsr_update["config-status"] = old_status db_nsr_update["detailed-status"] = old_status -- 2.17.1