Standardized vfc-vnflcm log output

Change-Id: I79fd49e964d0ef77e84f69e14673691e67da2283
Issue-ID: VFC-873
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>

diff --git a/lcm/lcm/jobs/job_get.py b/lcm/lcm/jobs/job_get.py
index 0953df9..4614b95 100644 (file)
--- a/lcm/lcm/jobs/job_get.py
+++ b/lcm/lcm/jobs/job_get.py
@@ -12,12 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import logging
-
 from lcm.pub.utils.jobutil import JobUtil
 
-logger = logging.getLogger(__name__)
-
 
 class GetJobInfoService(object):
     def __init__(self, job_id, response_id=0):

diff --git a/lcm/lcm/nf/vnf_query/query_vnf.py b/lcm/lcm/nf/vnf_query/query_vnf.py
index 70727b1..1a6bdd9 100644 (file)
--- a/lcm/lcm/nf/vnf_query/query_vnf.py
+++ b/lcm/lcm/nf/vnf_query/query_vnf.py
@@ -43,7 +43,7 @@ class QueryVnf:
         return resp_data
 
     def fill_resp_data(self, vnf):
-        logger.info('Get the list of vloumes')
+        logger.info('Get storages')
         storage_inst = StorageInstModel.objects.filter(instid=vnf.nfinstid)
         arr = []
         for s in storage_inst:
@@ -55,7 +55,7 @@ class QueryVnf:
                 }
             }
             arr.append(storage)
-        logger.info('Get the VLInstModel of list.')
+        logger.info('Get networks')
         vl_inst = VLInstModel.objects.filter(ownerid=vnf.nfinstid)
         vl_arr = []
         for v in vl_inst:
@@ -71,7 +71,7 @@ class QueryVnf:
                 }
             }
             vl_arr.append(v_dic)
-        logger.info('Get VNFCInstModel of list.')
+        logger.info('Get vnfcs')
         vnfc_insts = VNFCInstModel.objects.filter(instid=vnf.nfinstid)
         vnfc_arr = []
         for vnfc in vnfc_insts:
@@ -91,7 +91,7 @@ class QueryVnf:
                 "storageResourceIds": [s.storageid for s in storage]
             }
             vnfc_arr.append(vnfc_dic)
-        logger.info('Get the VimInstModel of list.')
+        logger.info('Get vms')
         vms = VmInstModel.objects.filter(instid=vnf.nfinstid)
         vm_arr = []
         for vm in vms:

diff --git a/lcm/lcm/v2/vnf_query/query_vnf.py b/lcm/lcm/v2/vnf_query/query_vnf.py
index a8fc4d1..016b1a9 100644 (file)
--- a/lcm/lcm/v2/vnf_query/query_vnf.py
+++ b/lcm/lcm/v2/vnf_query/query_vnf.py
@@ -43,7 +43,7 @@ class QueryVnf:
         return resp_data
 
     def fill_resp_data(self, vnf):
-        logger.info('Get the list of vloumes')
+        logger.info('Get storages')
         storage_inst = StorageInstModel.objects.filter(instid=vnf.nfinstid)
         arr = []
         for s in storage_inst:
@@ -55,7 +55,7 @@ class QueryVnf:
                 }
             }
             arr.append(storage)
-        logger.info('Get the VLInstModel of list.')
+        logger.info('Get networks')
         vl_inst = VLInstModel.objects.filter(ownerid=vnf.nfinstid)
         vl_arr = []
         for v in vl_inst:
@@ -71,7 +71,7 @@ class QueryVnf:
                 }
             }
             vl_arr.append(v_dic)
-        logger.info('Get VNFCInstModel of list.')
+        logger.info('Get vnfcs')
         vnfc_insts = VNFCInstModel.objects.filter(instid=vnf.nfinstid)
         vnfc_arr = []
         for vnfc in vnfc_insts:
@@ -91,7 +91,7 @@ class QueryVnf:
                 "storageResourceIds": [s.storageid for s in storage]
             }
             vnfc_arr.append(vnfc_dic)
-        logger.info('Get the VimInstModel of list.')
+        logger.info('Get vms')
         vms = VmInstModel.objects.filter(instid=vnf.nfinstid)
         vm_arr = []
         for vm in vms: