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;
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());
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);
JSONArray resArray = new JSONArray();
if(url == null || url.equals("")) {
- url = "http://127.0.0.1:31943";
+ url = "http://" + Constant.LOCAL_HOST + ":31943";
}
// get vim_id