Code Review / vfc / nfvo / lcm.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Update python2 to python3
[vfc/nfvo/lcm.git] / lcm / pub / msapi / extsys.py
diff --git a/lcm/pub/msapi/extsys.py b/lcm/pub/msapi/extsys.py
index 0214406..7b04665 100644 (file)
--- a/lcm/pub/msapi/extsys.py
+++ b/lcm/pub/msapi/extsys.py
@@ -34,31 +34,62 @@ def get_vims():
     for vim in vims_aai:
         vim = convert_vim_info(vim)
         vims_info.append(vim)
+    logger.debug("vims_info=%s", vims_info)
     return vims_info
 
 
+def get_vim_by_id_vim_info(cloudowner, cloudregionid):
+    cloud_owner = cloudowner
+    cloud_regionid = cloudregionid
+    ret = call_aai("/cloud-infrastructure/cloud-regions/cloud-region/%s/%s?depth=all"
+                   % (cloud_owner, cloud_regionid), "GET")
+    if ret[0] != 0:
+        logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
+        raise NSLCMException("Failed to query vim(%s__%s) from extsys." % (cloudowner, cloudregionid))
+    # convert vim_info_aai to internal vim_info
+    vim_info_aai = json.JSONDecoder().decode(ret[1])
+    vim_info = convert_vim_info(vim_info_aai)
+    logger.debug("cloud_owner=%s, cloud_regionid=%s, vim_info=%s", cloudowner, cloudregionid, vim_info)
+    return vim_info
+
+
 def get_vim_by_id(vim_id):
-    cloud_owner, cloud_region = split_vim_to_owner_region(vim_id)
+    # cloud_owner, cloud_region = split_vim_to_owner_region(vim_id)
+    vim_id = json.JSONDecoder().decode(vim_id) if isinstance(vim_id, str) else vim_id
+    cloud_owner = vim_id['cloud_owner']
+    cloud_regionid = vim_id['cloud_regionid']
     ret = call_aai("/cloud-infrastructure/cloud-regions/cloud-region/%s/%s?depth=all"
-                   % (cloud_owner, cloud_region), "GET")
+                   % (cloud_owner, cloud_regionid), "GET")
     if ret[0] != 0:
         logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
         raise NSLCMException("Failed to query vim(%s) from extsys." % vim_id)
     # convert vim_info_aai to internal vim_info
     vim_info_aai = json.JSONDecoder().decode(ret[1])
     vim_info = convert_vim_info(vim_info_aai)
+    logger.debug("vim_id=%s, vim_info=%s", vim_id, vim_info)
     return vim_info
 
+
 def split_vim_to_owner_region(vim_id):
     split_vim = vim_id.split('_')
     cloud_owner = split_vim[0]
     cloud_region = "".join(split_vim[1:])
     return cloud_owner, cloud_region
 
+
 def convert_vim_info(vim_info_aai):
     vim_id = vim_info_aai["cloud-owner"] + "_" + vim_info_aai["cloud-region-id"]
+    vim_type_aai = vim_info_aai["cloud-type"]
+    vim_type = vim_type_aai if vim_type_aai else "openstack"
     esr_system_info = ignore_case_get(ignore_case_get(vim_info_aai, "esr-system-info-list"), "esr-system-info")
     # tenants = ignore_case_get(vim_info_aai, "tenants")
+    default_tenant = ignore_case_get(esr_system_info[0], "default-tenant")
+    tenants = ignore_case_get(ignore_case_get(vim_info_aai, "tenants"), "tenant")
+    tenant_id = ""
+    for tenant_info in tenants:
+        if tenant_info["tenant-name"] == default_tenant:
+            tenant_id = tenant_info["tenant-id"]
+            break
     vim_info = {
         "vimId": vim_id,
         "name": vim_id,
@@ -66,13 +97,17 @@ def convert_vim_info(vim_info_aai):
         "userName": ignore_case_get(esr_system_info[0], "user-name"),
         "password": ignore_case_get(esr_system_info[0], "password"),
         # "tenant": ignore_case_get(tenants[0], "tenant-id"),
-        "tenant": ignore_case_get(esr_system_info[0], "default-tenant"),
+        "tenantId": tenant_id,
+        "tenant": default_tenant,
         "vendor": ignore_case_get(esr_system_info[0], "vendor"),
         "version": ignore_case_get(esr_system_info[0], "version"),
         "description": "vim",
-        "domain": "",
-        "type": ignore_case_get(esr_system_info[0], "type"),
-        "createTime": "2016-07-18 12:22:53"
+        "domain": ignore_case_get(esr_system_info[0], "cloud-domain"),
+        "type": vim_type,
+        "createTime": "",
+        "sslCacert": ignore_case_get(esr_system_info[0], "ssl-cacert"),
+        "sslInsecure": str(ignore_case_get(esr_system_info[0], "ssl-insecure")),
+        "status": ignore_case_get(esr_system_info[0], "system-status")
     }
     return vim_info
 
@@ -86,6 +121,7 @@ def get_sdn_controller_by_id(sdn_ontroller_id):
     # convert vim_info_aai to internal vim_info
     sdnc_info_aai = json.JSONDecoder().decode(ret[1])
     sdnc_info = convert_sdnc_info(sdnc_info_aai)
+    logger.debug("sdn_ontroller_id=%s, sdnc_info=%s", sdn_ontroller_id, sdnc_info)
     return sdnc_info
 
 
@@ -103,7 +139,7 @@ def convert_sdnc_info(sdnc_info_aai):
         "protocol": ignore_case_get(esr_system_info[0], "protocal"),
         "productName": ignore_case_get(sdnc_info_aai, "product-name"),
         "type": ignore_case_get(esr_system_info[0], "type"),
-        "createTime": "2016-07-18 12:22:53"
+        "createTime": ""
     }
     return sdnc_info
 
@@ -117,6 +153,7 @@ def get_vnfm_by_id(vnfm_inst_id):
     # convert vnfm_info_aai to internal vnfm_info
     vnfm_info_aai = json.JSONDecoder().decode(ret[1])
     vnfm_info = convert_vnfm_info(vnfm_info_aai)
+    logger.debug("vnfm_inst_id=%s, vnfm_info=%s", vnfm_inst_id, vnfm_info)
     return vnfm_info
 
 
@@ -134,13 +171,13 @@ def convert_vnfm_info(vnfm_info_aai):
         "url": ignore_case_get(esr_system_info[0], "service-url"),
         "userName": ignore_case_get(esr_system_info[0], "user-name"),
         "password": ignore_case_get(esr_system_info[0], "password"),
-        "createTime": "2016-07-06 15:33:18"
+        "createTime": ""
     }
     return vnfm_info
 
 
 def select_vnfm(vnfm_type, vim_id):
-    uri = "/external-system/esr-vnfm-list?depth=all"
+    uri = "/external-system/esr-vnfm-list"
     ret = call_aai(uri, "GET")
     if ret[0] > 0:
         logger.error("Failed to call %s: %s", uri, ret[1])
@@ -148,11 +185,37 @@ def select_vnfm(vnfm_type, vim_id):
     vnfms = json.JSONDecoder().decode(ret[1])
     vnfms = ignore_case_get(vnfms, "esr-vnfm")
     for vnfm in vnfms:
-        esr_system_info = ignore_case_get(vnfm, "esr-system-info")
-        type = ignore_case_get(esr_system_info, "type")
-        vimId = vnfm["vnfm-id"]
-        if type == vnfm_type and vimId == vim_id:
-            # convert vnfm_info_aai to internal vnfm_info
-            vnfm = convert_vnfm_info(vnfm)
-            return vnfm
+        vnfm_info = get_vnfm_by_id(vnfm.get("vnfm-id"))
+        vnfmtype = ignore_case_get(vnfm_info, "type")
+        vimid = ignore_case_get(vnfm_info, "vimId")
+        if vnfmtype == vnfm_type and vimid == vim_id:
+            return vnfm_info
     raise NSLCMException('No vnfm found with %s in vim(%s)' % (vnfm_type, vim_id))
+
+
+def get_ems_by_id(ems_inst_id):
+    uri = "/external-system/esr-ems-list/esr-ems/%s?depth=all" % ems_inst_id
+    ret = call_aai(uri, "GET")
+    if ret[0] > 0:
+        logger.error('Send get EMS information request to extsys failed.')
+        raise NSLCMException('Send get EMS information request to extsys failed.')
+    # convert vnfm_info_aai to internal vnfm_info
+    ems_info_aai = json.JSONDecoder().decode(ret[1])
+    ems_info = convert_ems_info(ems_info_aai)
+    logger.debug("ems_inst_id=%s, ems_info=%s", ems_inst_id, ems_info)
+    return ems_info
+
+
+def convert_ems_info(ems_info_aai):
+    esr_system_info = ignore_case_get(ignore_case_get(ems_info_aai, "esr-system-info-list"), "esr-system-info")
+    ems_info_aai = {
+        "emsId": ems_info_aai["ems-id"],
+        "type": ignore_case_get(esr_system_info[0], "type"),
+        "vendor": ignore_case_get(esr_system_info[0], "vendor"),
+        "version": ignore_case_get(esr_system_info[0], "version"),
+        "url": ignore_case_get(esr_system_info[0], "service-url"),
+        "userName": ignore_case_get(esr_system_info[0], "user-name"),
+        "password": ignore_case_get(esr_system_info[0], "password"),
+        "createTime": ""
+    }
+    return ems_info_aai
NS lifecycle management