X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=huawei%2Fvnfmadapter%2FVnfmadapterService%2Fservice%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fvfc%2Fnfvo%2Fvnfm%2Fsvnfm%2Fvnfmadapter%2Fservice%2Fadapter%2Fimpl%2FAdapterResourceManager.java;h=67e2497d389ca1e8416c2eeb33a67984167f6fcb;hb=7e053f4792b4e2d63c773356f46fa63354573571;hp=e3bc1b291a7fb42a9999c4f9fe945afe61f39699;hpb=05e444d9445dbe21d5f427a3b5cd49edfd4eefbd;p=vfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm.git

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 e3bc1b29..67e2497d 100644
--- 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);