Fix bug 1442: set SDN target in vim_info for NS VLD

[osm/LCM.git] / osm_lcm / ns.py

diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py
index 81fdee5..f5bdff3 100644 (file)
--- a/osm_lcm/ns.py
+++ b/osm_lcm/ns.py
@@ -645,10 +645,13 @@ class NsLcm(LcmBase):
             }
             # check if this network needs SDN assist
             if vld.get("pci-interfaces"):
-                db_vim = VimAccountDB.get_vim_account_with_id(target_vld["vim_info"][0]["vim_account_id"])
+                db_vim = get_vim_account(ns_params["vimAccountId"])
                 sdnc_id = db_vim["config"].get("sdn-controller")
                 if sdnc_id:
-                    target_vld["vim_info"].append({"sdnc_id": sdnc_id})
+                    sdn_vld = "nsrs:{}:vld.{}".format(nsr_id, vld["id"])
+                    target_sdn = "sdn:{}".format(sdnc_id)
+                    target_vld["vim_info"][target_sdn] = {
+                        "sdn": True, "target_vim": target_vim, "vlds": [sdn_vld], "type": vld.get("type")}
 
             nsd_vnf_profiles = get_vnf_profiles(nsd)
             for nsd_vnf_profile in nsd_vnf_profiles: