Merge "Fix bug for ns inst"

diff --git a/lcm/ns/biz/ns_instant.py b/lcm/ns/biz/ns_instant.py
index c16a21b..1340790 100644 (file)
--- a/lcm/ns/biz/ns_instant.py
+++ b/lcm/ns/biz/ns_instant.py
@@ -97,7 +97,10 @@ class InstantNSService(object):
                 if isinstance(vnfm_type_temp, list):
                     vnfm_type = vnfm_type_temp[0]
                 vimid = self.get_vnf_vim_id(vim_id, location_constraints, vnfd_id)
-                vnfm_info = extsys.select_vnfm(vnfm_type=vnfm_type, vim_id=vimid)
+                s_vimid = vimid
+                if isinstance(vimid, dict):
+                    s_vimid = "%s_%s" % (vimid["cloud_owner"], vimid["cloud_regionid"])
+                vnfm_info = extsys.select_vnfm(vnfm_type=vnfm_type, vim_id=s_vimid)
 
                 params_vnf.append({
                     "vnfProfileId": vnf["vnf_id"],

diff --git a/lcm/ns/tests/data/vnfm_in_aai.json b/lcm/ns/tests/data/vnfm_in_aai.json
index 6b5acc8..3d5ff47 100644 (file)
--- a/lcm/ns/tests/data/vnfm_in_aai.json
+++ b/lcm/ns/tests/data/vnfm_in_aai.json
@@ -1,6 +1,6 @@
 {
     "type": "gvnfm",
-    "vim-id": {"cloud_owner": "VCPE", "cloud_regionid": "RegionOne"},
+    "vim-id": "VCPE_RegionOne",
     "vnfm-id": "4",
     "certificate-url": "http://127.0.0.0/ztevnfm/v1/auth",
     "esr-system-info-list": {

diff --git a/lcm/ns/tests/data/vnfm_list_in_aai.json b/lcm/ns/tests/data/vnfm_list_in_aai.json
index a1a3678..3db3a1a 100644 (file)
--- a/lcm/ns/tests/data/vnfm_list_in_aai.json
+++ b/lcm/ns/tests/data/vnfm_list_in_aai.json
@@ -1,7 +1,7 @@
 {
     "esr-vnfm": [{
         "type": "gvnfm",
-        "vim-id": {"cloud_owner": "VCPE", "cloud_regionid": "RegionOne"},
+        "vim-id": "VCPE_RegionOne",
         "vnfm-id": "4",
         "certificate-url": "http://127.0.0.0/ztevnfm/v1/auth",
         "esr-system-info-list": {