From ab865b1b302a3c4d33073bcf09391d1057cbe438 Mon Sep 17 00:00:00 2001 From: luxin Date: Tue, 6 Feb 2018 19:48:30 +0800 Subject: [PATCH] Add query job status from vnfm Change-Id: Ie66a58061ac25e0b1d0713aab7855f2f6ec2ac23 Issue-ID: VFC-749 Signed-off-by: luxin --- .../vnfmadapter/service/csm/vnf/VnfMgrVnfm.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/VnfMgrVnfm.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/VnfMgrVnfm.java index d1508ba0..fae1e98d 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/VnfMgrVnfm.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/VnfMgrVnfm.java @@ -19,6 +19,7 @@ package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.vnf; import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.ResultRequestUtil; import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant; import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.ParamConstants; +import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.UrlConstant; import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.inf.InterfaceVnfMgr; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -265,4 +266,27 @@ public class VnfMgrVnfm implements InterfaceVnfMgr { return restJson; } + + public JSONObject getJobFromVnfm(JSONObject vnfmObjcet, String jobId) { + LOG.warn("function=getJobFromVnfm, jobId: {}", jobId); + JSONObject restJson = new JSONObject(); + restJson.put(Constant.RETCODE, Constant.REST_FAIL); + + JSONObject queryResult = ResultRequestUtil.call(vnfmObjcet, String.format(UrlConstant.URL_JOBSTATUS_GET, jobId), + Constant.GET, null, Constant.CERTIFICATE); + + int statusCode = queryResult.getInt(Constant.RETCODE); + if(statusCode == Constant.HTTP_OK || statusCode == Constant.HTTP_CREATED) { + if((queryResult.get("data")) == null) { + LOG.warn("function=getJobFromVnfm, msg=query is null {}", queryResult.get("data")); + return restJson; + } + restJson.put(Constant.RETCODE, Constant.REST_SUCCESS); + restJson.put("data", JSONObject.fromObject(queryResult.getString("data"))); + } else { + LOG.error("function=getJobFromVnfm, msg=query job from vnfm wrong status: {}", statusCode); + } + + return restJson; + } } -- 2.16.6