- for vld_id_ref in nsd["connection-point"]:
- name = vld_id_ref["vld-id-ref"]
- vnm = nsi_vld.get("vim-network-name")
- if type(vnm) is not dict:
- vnm = {slice_request.get("vimAccountId"): vnm}
- if vld_id_ref["name"] == nsi_vld["nsd-connection-point-ref"]:
- if list(vnm.values())[0] is None:
- networkName = "default"
+ for cp_item in nsd["connection-point"]:
+ if cp_item["name"] == nsi_vld["nsd-connection-point-ref"]:
+ vld_id_ref = cp_item["vld-id-ref"]
+ # Mapping the vim-network-name or vim-network-id instantiation parameters
+ if nsi_vld.get("vim-network-id"):
+ vnid = nsi_vld.get("vim-network-id")
+ if type(vnid) is not dict:
+ vim_network_id = {slice_request.get("vimAccountId"): vnid}
+ else: # is string
+ vim_network_id = vnid
+ indata_ns_list.append({"name": vld_id_ref, "vim-network-id": vim_network_id})
+ # Case not vim-network-name instantiation parameter
+ elif nsi_vld.get("vim-network-name"):
+ vnm = nsi_vld.get("vim-network-name")
+ if type(vnm) is not dict:
+ vim_network_name = {slice_request.get("vimAccountId"): vnm}
+ else: # is string
+ vim_network_name = vnm
+ indata_ns_list.append({"name": vld_id_ref,
+ "vim-network-name": vim_network_name})
+ # Case neither vim-network-name nor vim-network-id provided