diff options
author | Gao Weitao <victor.gao@huawei.com> | 2018-04-21 09:10:09 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-04-21 09:10:09 +0000 |
commit | ef890d3b0f4ce1068aabc2fa05d72eff9559d43d (patch) | |
tree | 829860238e3043c6f5cab058bf7d9fd9cea2c63b /huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/AdapterResourceManager.java | |
parent | 4ed278fe7fabd119400fa056e0086701cecf8508 (diff) | |
parent | 8ab4ae0a340b12bc6c09a29ab9e81382536a5c65 (diff) |
Merge "addvnf support emsUuid"
Diffstat (limited to 'huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/AdapterResourceManager.java')
-rw-r--r-- | huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/AdapterResourceManager.java | 8 |
1 files changed, 8 insertions, 0 deletions
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 a7329e39..f6f1f5e1 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 @@ -27,6 +27,7 @@ import java.util.Map; import org.apache.commons.httpclient.HttpMethod; import org.apache.commons.httpclient.HttpStatus; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.net.ftp.FTPClient; import org.apache.commons.net.ftp.FTPReply; import org.apache.commons.net.ftp.FTPSClient; @@ -113,11 +114,15 @@ public class AdapterResourceManager implements IResourceManager { resultObj.put(Constant.RETCODE, Constant.REST_FAIL); return resultObj; } + String emsUuid = ""; String vnfdName = transferFromCsar(csarName); JSONObject vnfpkg = vnfpkgJson.getJSONObject(vnfdName); JSONObject csarTempObj = vnfpkg.getJSONObject("template"); String csarfilepath = csarTempObj.getString("csar_file_path"); String csarfilename = csarTempObj.getString("csar_file_name"); + if (csarTempObj.containsKey("emsUuid")) { + emsUuid = csarTempObj.getString("emsUuid"); + } // download csar package and save in location. JSONObject downloadObject = downloadCsar(downloadUri, csarfilepath + csarfilename); @@ -269,6 +274,9 @@ public class AdapterResourceManager implements IResourceManager { resultObj.put("vnfdVersion", vnfdVersion); resultObj.put("planName", planName); resultObj.put("planId", planId); + if (StringUtils.isNotEmpty(emsUuid)) { + resultObj.put("emsUuid", emsUuid); + } resultObj.put("parameters", inputsObj); LOG.info("resultObj:" + resultObj.toString()); |