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=e3bc1b291a7fb42a9999c4f9fe945afe61f39699;hb=ad168f1c43063da685c3745bffe62283cf7f2bd3;hp=420d8eb0c57027999978da479f29cd5b577babc6;hpb=4afd4ca9884405638160ea3062fbef1214381552;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 420d8eb0..e3bc1b29 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
@@ -32,6 +32,7 @@ import org.apache.commons.net.ftp.FTPReply;
 import org.apache.commons.net.ftp.FTPSClient;
 import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.DownloadCsarManager;
 import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmException;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmUtil;
 import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.restclient.RestfulResponse;
 import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.restclient.SystemEnvVariablesFactory;
 import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.servicetoken.VNFRestfulUtil;
@@ -145,7 +146,8 @@ public class AdapterResourceManager implements IResourceManager {
         vnfmMap.put("methodType", Constant.GET);
 
         // get VNFM connection info
-        JSONObject vnfmObject = getVnfmConnInfo(vnfmMap);
+        // 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());
@@ -297,7 +299,7 @@ public class AdapterResourceManager implements IResourceManager {
             LOG.info("makeDirectory: " + ftpClient.makeDirectory(vnfpkg.getString(VNFD_FILE_PATH)));
             ftpClient.changeWorkingDirectory(vnfpkg.getString(VNFD_FILE_PATH));
             LOG.info("changeWorkingDirectory: " + ftpClient.changeWorkingDirectory(vnfpkg.getString(VNFD_FILE_PATH)));
-            String vnfdPath = csarfilepath + "Artifacts/Other/";
+            String vnfdPath = csarfilepath + "Artifacts/Deployment/OTHER/";
             LOG.info("vnfd_file_name: " + vnfdPath + vnfpkg.getString("vnfd_file_name"));
             InputStream inputStream = new FileInputStream(new File(vnfdPath + vnfpkg.getString("vnfd_file_name")));
             flag = ftpClient.storeFile(vnfpkg.getString("vnfd_file_name"), inputStream);