X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Fns.py;h=fda67221b268f0a7c8b3037305ebccbe3d17174a;hb=a8165d1d2f0386430c4781873debc4fef976cc7a;hp=999aee670f1c9b818144e50b9160b954689da3d8;hpb=eb07672618920bcb12befd795a13ed41a231ef86;p=osm%2FLCM.git diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py index 999aee6..fda6722 100644 --- a/osm_lcm/ns.py +++ b/osm_lcm/ns.py @@ -904,7 +904,7 @@ class NsLcm(LcmBase): ) vdur = next((vdur for vdur in target_vnf.get("vdur", ())), None) if not vdur: - return + continue for a_index, a_vld in enumerate(target["ns"]["vld"]): target_vld = find_in_list( get_iterable(vdur, "interfaces"), @@ -3220,6 +3220,12 @@ class NsLcm(LcmBase): "nsr_id": nsr_id, "nslcmop_id": nslcmop_id, "operationState": nslcmop_operation_state, + "startTime": db_nslcmop["startTime"], + "links": db_nslcmop["links"], + "operationParams": { + "nsInstanceId": nsr_id, + "nsdId": db_nsr["nsd-id"], + }, }, ) except Exception as e: @@ -7713,10 +7719,11 @@ class NsLcm(LcmBase): f"Timeout waiting KDU with name={kdu_name} and index={kdu_index} to be intantiated" ) - # TODO get_service if ee_id is not None: - _, _, service = ee_id.partition(".") # remove prefix "namespace." - host_name = "{}-{}".format(service, ee_config_descriptor["metric-service"]) + _, namespace, helm_id = get_ee_id_parts( + ee_id + ) # get namespace and EE gRPC service name + host_name = f'{helm_id}-{ee_config_descriptor["metric-service"]}.{namespace}.svc' # svc_name.namespace.svc host_port = "80" vnfr_id = vnfr_id.replace("-", "") variables = {