From: ying.yunlong Date: Thu, 14 Dec 2017 07:07:43 +0000 (+0800) Subject: Add vfc-nslcm query vnfm/vim log X-Git-Tag: v1.1.0~256 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e390605fe7d0cf04b8e69c101544ab2c9eff2086;p=vfc%2Fnfvo%2Flcm.git Add vfc-nslcm query vnfm/vim log Change-Id: Id77c57d9e7999341074d9d2194a8b4045e55cee5 Issue-ID: VFC-620 Signed-off-by: ying.yunlong --- diff --git a/lcm/ns/tests/vnfs/tests.py b/lcm/ns/tests/vnfs/tests.py index 4a898ba0..57924822 100644 --- a/lcm/ns/tests/vnfs/tests.py +++ b/lcm/ns/tests/vnfs/tests.py @@ -516,7 +516,7 @@ class TestGetVnfmInfoViews(TestCase): "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": "" } response = self.client.get("/api/nslcm/v1/vnfms/%s" % self.vnfm_id) @@ -551,7 +551,7 @@ class TestGetVimInfoViews(TestCase): "description": "vim", "domain": "", "type": ignore_case_get(esr_system_info[0], "type"), - "createTime": "2016-07-18 12:22:53" + "createTime": "" } response = self.client.get("/api/nslcm/v1/vims/%s" % self.vim_id) diff --git a/lcm/pub/msapi/extsys.py b/lcm/pub/msapi/extsys.py index 85a40d73..e7f83d65 100644 --- a/lcm/pub/msapi/extsys.py +++ b/lcm/pub/msapi/extsys.py @@ -34,6 +34,7 @@ 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 @@ -83,7 +84,7 @@ def convert_vim_info(vim_info_aai): "description": "vim", "domain": "", "type": ignore_case_get(esr_system_info[0], "type"), - "createTime": "2016-07-18 12:22:53", + "createTime": "", "sslCacert": ignore_case_get(esr_system_info[0], "ssl-cacert"), "sslInsecure": ignore_case_get(esr_system_info[0], "ssl-insecure"), "status": ignore_case_get(esr_system_info[0], "system-status") @@ -100,6 +101,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 @@ -117,7 +119,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 @@ -131,6 +133,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 @@ -148,7 +151,7 @@ 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