From: kbsub Date: Thu, 17 Oct 2019 16:28:48 +0000 (+0000) Subject: VCD feature 7193-provider_nerwork X-Git-Tag: v7.0.0rc1~22 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=4d761ebb95fc7a809ccf63d8d86ceb1edd106c8f;p=osm%2FLCM.git VCD feature 7193-provider_nerwork Change-Id: I3a1a14c499768bb3d5a66d0326e2e30f025b2d5c Signed-off-by: kbsub --- diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py index 724b22d..1a48cfb 100644 --- a/osm_lcm/ns.py +++ b/osm_lcm/ns.py @@ -414,6 +414,11 @@ class NsLcm(LcmBase): populate_dict(RO_ns_params, ("vnfs", vnf_params["member-vnf-index"], "networks", internal_vld_params["name"], "ip-profile"), ip_profile_2_RO(internal_vld_params["ip-profile"])) + if internal_vld_params.get("provider-network"): + + populate_dict(RO_ns_params, ("vnfs", vnf_params["member-vnf-index"], "networks", + internal_vld_params["name"], "provider-network"), + internal_vld_params["provider-network"].copy()) for icp_params in get_iterable(internal_vld_params, "internal-connection-point"): # look for interface @@ -447,6 +452,11 @@ class NsLcm(LcmBase): populate_dict(RO_ns_params, ("networks", vld_params["name"], "ip-profile"), ip_profile_2_RO(vld_params["ip-profile"])) + if vld_params.get("provider-network"): + + populate_dict(RO_ns_params, ("networks", vld_params["name"], "provider-network"), + vld_params["provider-network"].copy()) + if "wimAccountId" in vld_params and vld_params["wimAccountId"] is not None: populate_dict(RO_ns_params, ("networks", vld_params["name"], "wim_account"), wim_account_2_RO(vld_params["wimAccountId"])), @@ -462,6 +472,7 @@ class NsLcm(LcmBase): RO_vld_sites.append({"netmap-use": vld_params["vim-network-name"]}) if RO_vld_sites: populate_dict(RO_ns_params, ("networks", vld_params["name"], "sites"), RO_vld_sites) + if vld_params.get("vim-network-id"): RO_vld_sites = [] if isinstance(vld_params["vim-network-id"], dict):