Fix catalog query csar url

[vfc/nfvo/driver/vnfm/svnfm.git] / huawei / vnfmadapter / VnfmadapterService / service / src / main / java / org / onap / vfc / nfvo / vnfm / svnfm / vnfmadapter / service / adapter / impl / AdapterResourceManager.java

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/AdapterResourceManager.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/AdapterResourceManager.java
index e3bc1b2..67e2497 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/AdapterResourceManager.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/AdapterResourceManager.java
@@ -104,7 +104,7 @@ public class AdapterResourceManager implements IResourceManager {
         String downloadUri = "";
         if(Integer.valueOf(csarobj.get(Constant.RETCODE).toString()) == Constant.HTTP_OK) {
             LOG.info("get CSAR info successful.", csarobj.get(Constant.RETCODE));
-            downloadUri = csarobj.getString("downloadUri");
+            downloadUri = csarobj.getJSONObject("packageInfo").getString("downloadUrl");
         } else {
             LOG.error("get CSAR info fail.", csarobj.get(Constant.RETCODE));
             resultObj.put(Constant.REASON, csarobj.get(Constant.REASON).toString());
@@ -148,13 +148,7 @@ public class AdapterResourceManager implements IResourceManager {
         // get VNFM connection info
         // getVnfmConnInfo(vnfmMap)
         JSONObject vnfmObject = VnfmUtil.getVnfmById(vnfmid);
-        if(Integer.valueOf(vnfmObject.get(Constant.RETCODE).toString()) != Constant.HTTP_OK) {
-            LOG.error("get Vnfm Connection Info fail.", vnfmObject.get(Constant.RETCODE));
-            resultObj.put(Constant.REASON, vnfmObject.get(Constant.REASON).toString());
-            resultObj.put(Constant.RETCODE, vnfmObject.get(Constant.RETCODE).toString());
-            return resultObj;
-        }
-        LOG.info("get Vnfm Connection Info successful.", vnfmObject.get(Constant.RETCODE));
+        LOG.info("get Vnfm Connection Info successful.");
 
         String vnfmUrl = vnfmObject.getString("url");
         String userName = vnfmObject.getString(Constant.USERNAME);