From d5e5b50b23aa14efa9f07176cedc3a3688102c2a Mon Sep 17 00:00:00 2001 From: liuqian Date: Sat, 21 Apr 2018 15:28:23 +0800 Subject: addvnf support emsUuid Change-Id: Ie77988a5bd10847bd45fe404c0344ac169d638bb Issue-ID: VFC-868 Signed-off-by: liuqian --- .../adapter/impl/AdapterResourceManager.java | 1316 ++++++++++---------- .../svnfm/vnfmadapter/service/process/VnfMgr.java | 7 +- .../svnfm/vnfmadapter/service/rest/AuthRoa.java | 202 +-- 3 files changed, 763 insertions(+), 762 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 f6f1f5e1..f9bafb68 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 @@ -57,663 +57,663 @@ import net.sf.json.JSONObject; */ public class AdapterResourceManager implements IResourceManager { - private static final Logger LOG = LoggerFactory.getLogger(AdapterResourceManager.class); - - private static final String VNFD_FILE_PATH = "vnfd_file_path"; - - @Override - public JSONObject uploadVNFPackage(JSONObject vnfpkge, Map paramsMap) { - JSONObject resultObj = new JSONObject(); - String vnfDescriptorId = paramsMap.get("vnfDescriptorId"); - JSONObject vnfpkgJson = new JSONObject(); - try { - // if upper layer do not provide vnfpackage info,then get the - // vnfpackage info from JSON file. - if (vnfpkge == null || vnfpkge.isEmpty()) { - String vnfPkgInfo = readVfnPkgInfoFromJson(); - vnfpkgJson = JSONObject.fromObject(vnfPkgInfo); - - } - } catch (IOException e) { - LOG.error("function=uploadVNFPackage", e); - } - - // check if parameters are null. - if (paramsMap == null || paramsMap.isEmpty()) { - resultObj.put(Constant.REASON, "csarid and vnfmid are null."); - resultObj.put(Constant.RETCODE, Constant.REST_FAIL); - return resultObj; - } - - String csarid = paramsMap.get("csarid"); - String vnfmid = paramsMap.get("vnfmid"); - String vnfdid = ""; - - if (null == csarid || "".equals(csarid)) { - resultObj.put(Constant.REASON, "csarid is null."); - resultObj.put(Constant.RETCODE, Constant.REST_FAIL); - return resultObj; - } - if (null == vnfmid || "".equals(vnfmid)) { - resultObj.put(Constant.REASON, "vnfmid is null."); - resultObj.put(Constant.RETCODE, Constant.REST_FAIL); - return resultObj; - } - - // obtain CSAR package info - JSONObject csarobj = getVnfmCsarInfo(csarid); - String downloadUri = ""; - String csarName = ""; - if (Integer.valueOf(csarobj.get(Constant.RETCODE).toString()) == Constant.HTTP_OK) { - LOG.info("get CSAR info successful.", csarobj.get(Constant.RETCODE)); - downloadUri = csarobj.getJSONObject("packageInfo").getString("downloadUrl"); - csarName = csarobj.getJSONObject("packageInfo").getString("csarName"); - } else { - LOG.error("get CSAR info fail.", csarobj.get(Constant.RETCODE)); - resultObj.put(Constant.REASON, csarobj.get(Constant.REASON).toString()); - 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); - - if (Integer.valueOf(downloadObject.get(Constant.RETCODE).toString()) != Constant.REST_SUCCESS) { - LOG.error("download CSAR fail." + downloadObject.get(Constant.RETCODE)); - resultObj.put(Constant.REASON, downloadObject.get(Constant.REASON).toString()); - resultObj.put(Constant.RETCODE, downloadObject.get(Constant.RETCODE).toString()); - return resultObj; - } - LOG.info("download CSAR successful." + downloadObject.get(Constant.RETCODE)); - - // unzip csar package to location. - JSONObject unzipObject = unzipCSAR(csarfilepath + csarfilename, csarfilepath); - - if (Integer.valueOf(unzipObject.get(Constant.RETCODE).toString()) != Constant.REST_SUCCESS) { - LOG.error("unzip CSAR fail.", unzipObject.get(Constant.RETCODE)); - resultObj.put(Constant.REASON, unzipObject.get(Constant.REASON).toString()); - resultObj.put(Constant.RETCODE, unzipObject.get(Constant.RETCODE).toString()); - return resultObj; - } - LOG.info("unzip CSAR successful.", unzipObject.get(Constant.RETCODE)); - - // upload vnfd to ftps server - // JSONObject uploadResJson = uploadCsar(csarTempObj, csarfilepath); - // LOG.info("upload Csar result: {}.", uploadResJson); - - Map vnfmMap = new HashMap<>(); - vnfmMap.put("url", String.format(UrlConstant.REST_VNFMINFO_GET, vnfmid)); - vnfmMap.put("methodType", Constant.GET); - - // get VNFM connection info - // getVnfmConnInfo(vnfmMap) - JSONObject vnfmObject = VnfmUtil.getVnfmById(vnfmid); - LOG.info("get Vnfm Connection Info successful."); - - String vnfmUrl = vnfmObject.getString("url"); - String userName = vnfmObject.getString(Constant.USERNAME); - String password = vnfmObject.getString(Constant.PASSWORD); - - // build VNFM connection and get token - ConnectMgrVnfm mgrVcmm = new ConnectMgrVnfm(); - - JSONObject connObject = new JSONObject(); - connObject.put("url", vnfmUrl); - connObject.put(Constant.USERNAME, userName); - connObject.put(Constant.PASSWORD, password); - if (Constant.HTTP_OK != mgrVcmm.connect(vnfmObject, Constant.CERTIFICATE)) { - LOG.error("get Access Session fail."); - resultObj.put(Constant.RETCODE, Constant.HTTP_INNERERROR); - resultObj.put(Constant.REASON, "connect fail."); - return resultObj; - } - LOG.info("get Access Session successful."); - String connToken = mgrVcmm.getAccessSession(); - - // get vim_id - JSONObject cloudObject = getAllCloud(vnfmUrl, connToken); - String vimId = ""; - - if (!cloudObject.isEmpty() && cloudObject.get(Constant.RETCODE).equals(HttpStatus.SC_OK)) { - LOG.info("get all cloud successful.", cloudObject.get(Constant.RETCODE)); - vimId = cloudObject.getString("vim_id"); - } else { - LOG.error("get all cloud fail.", cloudObject.get(Constant.RETCODE)); - return cloudObject; - } - - // upload VNF package - // csarTempObj.put("vim_id", vimId); - vnfpkg.put("template", csarTempObj); - LOG.info("vnfpkg: " + vnfpkg); - - JSONObject uploadPkgObject = upload(vnfpkg, vnfmUrl, connToken); - LOG.info("uploadPkgObject:" + uploadPkgObject); - if (!uploadPkgObject.isEmpty() && uploadPkgObject.get(Constant.RETCODE).equals(HttpStatus.SC_OK)) { - LOG.info("upload vnf package info successful.", uploadPkgObject.get(Constant.RETCODE)); - vnfdid = uploadPkgObject.getString("id"); - } - - // if(vnfdid == null || "".equals(vnfdid.trim())) { - JSONObject vnfdConf = readVnfdIdInfoFromJson(); - LOG.info("vnfdName:" + vnfdName + ", vnfdConf=" + vnfdConf); - if (vnfdConf.containsKey(vnfdName)) { - vnfdid = vnfdConf.getString(vnfdName); - } - // } - LOG.info("set vnfdId=" + vnfdid); - - // get vnfd version - String vnfdVersion = ""; - - JSONObject vnfdVerObject = getVnfdVersion(vnfmUrl, String.format(UrlConstant.URL_VNFDINFO_GET, vnfdid), - connToken); - LOG.info("vnfdVerObject:" + vnfdVerObject); - if (!vnfdVerObject.isEmpty() && vnfdVerObject.get(Constant.RETCODE).equals(HttpStatus.SC_OK)) { - LOG.info("get vnfd version successful.", vnfdVerObject.get(Constant.RETCODE)); - JSONArray verArr = vnfdVerObject.getJSONArray("templates"); - JSONObject verTmpObj = verArr.getJSONObject(0); - - vnfdVersion = verTmpObj.getString("vnfdVersion"); - } else { - LOG.error("get vnfd version fail.", vnfdVerObject.get(Constant.RETCODE)); - return vnfdVerObject; - } - - // get vnfd plan info - String planName = ""; - String planId = ""; - - JSONObject vnfdPlanInfo = getVNFDPlanInfo(vnfmUrl, vnfdid, connToken); - LOG.info("vnfdPlanInfo:" + vnfdPlanInfo); - JSONObject inputsObj = new JSONObject(); - if (!vnfdPlanInfo.isEmpty() && vnfdPlanInfo.get(Constant.RETCODE).equals(HttpStatus.SC_OK)) { - LOG.info("get vnfd plan info successful.", vnfdPlanInfo.get(Constant.RETCODE)); - JSONObject planTmpObj = vnfdPlanInfo.getJSONObject("template"); - String templateName = planTmpObj.getString("template_name").trim(); - JSONArray topoTmpObj = planTmpObj.getJSONArray("topology_template"); - - JSONObject planObj = topoTmpObj.getJSONObject(0); - if ("VNFD_vUGW".equals(templateName)) { - for (int i = 0; i < topoTmpObj.size(); i++) { - String name = topoTmpObj.getJSONObject(i).getString("plan_name").trim(); - if ("Normal_E9K".equals(name)) { - planObj = topoTmpObj.getJSONObject(i); - } - } - } - - planName = planObj.getString("plan_name"); - planId = planObj.getString("plan_id"); - if (planObj.containsKey("inputs")) { - JSONArray inputs = planObj.getJSONArray("inputs"); - for (int i = 0; i < inputs.size(); i++) { - JSONObject obj = inputs.getJSONObject(i); - obj.put("value", obj.getString("default")); - } - inputsObj.put("inputs", inputs); - inputsObj.put("External_network", new JSONArray()); - } - } else { - LOG.error("get vnfd plan info fail.", vnfdPlanInfo.get(Constant.RETCODE)); - return vnfdPlanInfo; - } - - // return values - resultObj.put(Constant.RETCODE, Constant.HTTP_OK); - resultObj.put("vnfdId", vnfdid); - 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()); - - return resultObj; - } - - private String transferFromCsar(String csarName) { - LOG.info("csarName: " + csarName); - String tempCsarName = csarName.toUpperCase(); - if (tempCsarName.contains("CSCF_SI")) { - return "CSCF_SI"; - } else if (tempCsarName.contains("CSCF")) { - return "vCSCF"; - } else if (tempCsarName.contains("MME")) { - return "vMME"; - } else if (tempCsarName.contains("SPGW")) { - return "vSPGW"; - } else if (tempCsarName.contains("HSS")) { - return "vHSS"; - } else if (tempCsarName.contains("SBC")) { - return "vSBC"; - } else if (tempCsarName.contains("PCRF")) { - return "vPCRF"; - } else if (tempCsarName.contains("TAS")) { - return "vTAS"; - } - return ""; - } - - private JSONObject uploadCsar(JSONObject vnfpkg, String csarfilepath) { - LOG.info("vnfpkg: " + vnfpkg + "csarfilepath:" + csarfilepath); - JSONObject resJson = new JSONObject(); - - boolean flag = false; - FTPSClient ftpClient = new FTPSClient(); - try { - ftpClient.connect(vnfpkg.getString("ftp_server_ip"), 21); - ftpClient.login(vnfpkg.getString("ftp_username"), vnfpkg.getString("ftp_password")); - int replyCode = ftpClient.getReplyCode(); - LOG.info("replyCode: " + replyCode); - if (!FTPReply.isPositiveCompletion(replyCode)) { - resJson.put("message", "Connect ftps server failed!"); - return resJson; - } - - ftpClient.setFileType(FTPClient.BINARY_FILE_TYPE); - ftpClient.enterLocalPassiveMode(); - ftpClient.makeDirectory(vnfpkg.getString(VNFD_FILE_PATH)); - 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/Deployment/OTHER/"; - LOG.info("vnfd_file_name: " + vnfdPath + vnfpkg.getString("vnfd_file_name")); - try (InputStream inputStream = new FileInputStream( - new File(vnfdPath + vnfpkg.getString("vnfd_file_name")))) { - flag = ftpClient.storeFile(vnfpkg.getString("vnfd_file_name"), inputStream); - if (flag) { - resJson.put("message", "upload Csar success!"); - } - } catch (Exception e) { - LOG.error("Exception: " + e); - } - - ftpClient.logout(); - } catch (Exception e) { - LOG.error("Exception: " + e); - } finally { - if (ftpClient.isConnected()) { - try { - ftpClient.disconnect(); - } catch (IOException e) { - LOG.error("IOException: " + e); - } - } - } - return resJson; - } - - private JSONObject sendRequest(Map paramsMap) { - JSONObject resultObj = new JSONObject(); - RestfulResponse rsp = VNFRestfulUtil.getRemoteResponse(paramsMap, ""); - if (null == rsp) { - LOG.error("function=sendRequest, RestfulResponse is null"); - resultObj.put(Constant.REASON, "RestfulResponse is null."); - resultObj.put(Constant.RETCODE, Constant.REST_FAIL); - return resultObj; - } - String resultCreate = rsp.getResponseContent(); - - if (rsp.getStatus() == Constant.HTTP_OK) { - LOG.warn("function=sendRequest, msg= status={}, result={}.", rsp.getStatus(), resultCreate); - resultObj = JSONObject.fromObject(resultCreate); - resultObj.put(Constant.RETCODE, Constant.HTTP_OK); - return resultObj; - } else { - LOG.error("function=sendRequest, msg=ESR return fail,status={}, result={}.", rsp.getStatus(), resultCreate); - resultObj.put(Constant.REASON, "ESR return fail."); - } - resultObj.put(Constant.RETCODE, Constant.REST_FAIL); - return resultObj; - } - - @Override - public JSONObject getVnfmCsarInfo(String csarid) { - JSONObject resultObj = new JSONObject(); - - if (null == csarid || "".equals(csarid)) { - resultObj.put(Constant.REASON, "csarid is null."); - resultObj.put(Constant.RETCODE, Constant.REST_FAIL); - return resultObj; - } - - Map paramsMap = new HashMap(); - - paramsMap.put("url", String.format(UrlConstant.REST_CSARINFO_GET, csarid)); - paramsMap.put("methodType", Constant.GET); - - return this.sendRequest(paramsMap); - } - - @Override - public JSONObject downloadCsar(String url, String filePath) { - JSONObject resultObj = new JSONObject(); - - if (url == null || "".equals(url)) { - resultObj.put(Constant.REASON, "url is null."); - resultObj.put(Constant.RETCODE, Constant.REST_FAIL); - return resultObj; - } - if (filePath == null || "".equals(filePath)) { - resultObj.put(Constant.REASON, "downloadUrl filePath is null."); - resultObj.put(Constant.RETCODE, Constant.REST_FAIL); - return resultObj; - } - - String status = DownloadCsarManager.download(url, filePath); - - if (Constant.DOWNLOADCSAR_SUCCESS.equals(status)) { - resultObj.put(Constant.REASON, "download csar file successfully."); - resultObj.put(Constant.RETCODE, Constant.REST_SUCCESS); - } else { - resultObj.put(Constant.REASON, "download csar file failed."); - resultObj.put(Constant.RETCODE, Constant.REST_FAIL); - } - return resultObj; - } - - @Override - public JSONObject getAllCloud(String url, String conntoken) { - JSONObject resultObj = new JSONObject(); - JSONArray resArray = new JSONArray(); - - if (url == null || url.equals("")) { - url = "http://" + Constant.LOCAL_HOST + ":31943"; - } - - // get vim_id - HttpMethod httpMethodCloud = null; - try { - httpMethodCloud = new HttpRequests.Builder(Constant.CERTIFICATE) - .setUrl(url.trim(), UrlConstant.URL_ALLCLOUD_NEW_GET) - .addHeader(Constant.HEADER_AUTH_TOKEN, conntoken).setParams("").get().execute(); - - int statusCode = httpMethodCloud.getStatusCode(); - - String result = httpMethodCloud.getResponseBodyAsString(); - LOG.info(result); - if (statusCode == HttpStatus.SC_OK) { - JSONObject vimInfo = JSONObject.fromObject(result); - resArray = vimInfo.getJSONArray("vim_info"); - resultObj = resArray.getJSONObject(0); - resultObj.put(Constant.RETCODE, statusCode); - } else { - LOG.error("uploadVNFPackage get allcloud failed, code:" + statusCode + " re:" + result); - resultObj.put(Constant.RETCODE, statusCode); - resultObj.put(Constant.REASON, "get allcloud failed. code:" + statusCode + " re:" + result); - return resultObj; - } - } catch (JSONException e) { - LOG.error("function=uploadVNFPackage, msg=uploadVNFPackage get allcloud JSONException e={}.", e); - resultObj.put(Constant.RETCODE, Constant.HTTP_INNERERROR); - resultObj.put(Constant.REASON, "get allcloud failed and JSONException." + e.getMessage()); - return resultObj; - } catch (VnfmException e) { - LOG.error("function=uploadVNFPackage, msg=uploadVNFPackage get allcloud VnfmException e={}.", e); - resultObj.put(Constant.RETCODE, Constant.HTTP_INNERERROR); - resultObj.put(Constant.REASON, "get allcloud failed and VnfmException." + e.getMessage()); - return resultObj; - } catch (IOException e) { - LOG.error("function=uploadVNFPackage, msg=uploadVNFPackage get allcloud IOException e={}.", e); - resultObj.put(Constant.RETCODE, Constant.HTTP_INNERERROR); - resultObj.put(Constant.REASON, "get allcloud failed and IOException." + e.getMessage()); - return resultObj; - } - return resultObj; - } - - /** - * Upload vnfpackage
- * - * @param vnfpackage - * @param vnfmurl - * @param conntoken - * @return - * @since VFC 1.0 - */ - public JSONObject upload(JSONObject vnfpackage, String vnfmurl, String conntoken) { - JSONObject resultObj = new JSONObject(); - HttpMethod httpMethodVnf = null; - - try { - httpMethodVnf = new HttpRequests.Builder(Constant.CERTIFICATE) - .setUrl(vnfmurl.trim(), UrlConstant.URL_VNFPACKAGE_POST).setParams(vnfpackage.toString()) - .addHeader(Constant.HEADER_AUTH_TOKEN, conntoken).post().execute(); - - int statusCodeUp = httpMethodVnf.getStatusCode(); - - String resultUp = httpMethodVnf.getResponseBodyAsString(); - - if (statusCodeUp == HttpStatus.SC_CREATED || statusCodeUp == HttpStatus.SC_OK) { - LOG.info("uploadVNFPackage upload VNF package successful, code:" + statusCodeUp + " re:" + resultUp); - resultObj = JSONObject.fromObject(resultUp); - resultObj.put(Constant.RETCODE, statusCodeUp); - } else { - LOG.error("uploadVNFPackage upload VNF package failed, code:" + statusCodeUp + " re:" + resultUp); - resultObj.put(Constant.RETCODE, statusCodeUp); - resultObj.put("data", "upload VNF package failed, code:" + statusCodeUp + " re:" + resultUp); - return resultObj; - } - } catch (JSONException e) { - LOG.error("function=uploadVNFPackage, msg=uploadVNFPackage upload VNF package JSONException e={}.", e); - resultObj.put(Constant.RETCODE, Constant.HTTP_INNERERROR); - resultObj.put(Constant.REASON, "upload VNF package failed and JSONException." + e.getMessage()); - return resultObj; - } catch (VnfmException e) { - LOG.error("function=uploadVNFPackage, msg=uploadVNFPackage upload VNF package VnfmException e={}.", e); - resultObj.put(Constant.RETCODE, Constant.HTTP_INNERERROR); - resultObj.put(Constant.REASON, "upload VNF package failed and VnfmException." + e.getMessage()); - return resultObj; - } catch (IOException e) { - LOG.error("function=uploadVNFPackage, msg=uploadVNFPackage upload VNF package IOException e={}.", e); - resultObj.put(Constant.RETCODE, Constant.HTTP_INNERERROR); - resultObj.put(Constant.REASON, "upload VNF package failed and IOException." + e.getMessage()); - return resultObj; - } - return resultObj; - } - - /** - * Find vnfd version.
- * - * @param prefixUrl - * @param serviceUrl - * @return - * @since VFC 1.0 - */ - public JSONObject getVnfdVersion(String prefixUrl, String serviceUrl, String conntoken) { - JSONObject resultObj = new JSONObject(); - HttpMethod httpMethodVnfd = null; - try { - httpMethodVnfd = new HttpRequests.Builder(Constant.CERTIFICATE).setUrl(prefixUrl.trim(), serviceUrl) - .setParams("").addHeader(Constant.HEADER_AUTH_TOKEN, conntoken).get().execute(); - - int statusCodeVnfd = httpMethodVnfd.getStatusCode(); - - String resultVnfd = httpMethodVnfd.getResponseBodyAsString(); - LOG.info("getVnfdVersion result:" + resultVnfd); - if (statusCodeVnfd == HttpStatus.SC_OK) { - resultObj = JSONObject.fromObject(resultVnfd); - resultObj.put(Constant.RETCODE, statusCodeVnfd); - } else { - LOG.error("uploadVNFPackage vnfd version failed, code:" + statusCodeVnfd + " re:" + resultVnfd); - resultObj.put(Constant.RETCODE, statusCodeVnfd); - resultObj.put("data", "get vnfd version failed, code:" + statusCodeVnfd + " re:" + resultVnfd); - return resultObj; - } - } catch (JSONException e) { - LOG.error("function=uploadVNFPackage, msg=uploadVNFPackage get vnfd version JSONException e={}.", e); - resultObj.put(Constant.RETCODE, Constant.HTTP_INNERERROR); - resultObj.put(Constant.REASON, "get vnfd version failed and JSONException." + e.getMessage()); - return resultObj; - } catch (VnfmException e) { - LOG.error("function=uploadVNFPackage, msg=uploadVNFPackage get vnfd version VnfmException e={}.", e); - resultObj.put(Constant.RETCODE, Constant.HTTP_INNERERROR); - resultObj.put(Constant.REASON, "get vnfd version failed and VnfmException." + e.getMessage()); - return resultObj; - } catch (IOException e) { - LOG.error("function=uploadVNFPackage, msg=uploadVNFPackage get vnfd version IOException e={}.", e); - resultObj.put(Constant.RETCODE, Constant.HTTP_INNERERROR); - resultObj.put(Constant.REASON, "get vnfd version failed and IOException." + e.getMessage()); - return resultObj; - } - return resultObj; - } - - /** - * Find VNFM connection information.
- * - * @param paramsMap - * @return - * @since VFC 1.0 - */ - public JSONObject getVnfmConnInfo(Map paramsMap) { - return this.sendRequest(paramsMap); - } - - @Override - public JSONObject getVNFDPlanInfo(String url, String vnfdid, String conntoken) { - JSONObject resultObj = new JSONObject(); - - HttpMethod httpMethodPlan = null; - try { - httpMethodPlan = new HttpRequests.Builder(Constant.CERTIFICATE) - .setUrl(url.trim(), String.format(UrlConstant.URL_VNFDPLANINFO_GET, vnfdid)).setParams("") - .addHeader(Constant.HEADER_AUTH_TOKEN, conntoken).get().execute(); - - int statusCode = httpMethodPlan.getStatusCode(); - - String result = httpMethodPlan.getResponseBodyAsString(); - LOG.info("getVNFDPlanInfo result=" + result); - if (statusCode == HttpStatus.SC_OK) { - resultObj = JSONObject.fromObject(result); - resultObj.put(Constant.RETCODE, statusCode); - } else { - LOG.error("uploadVNFPackage get VNFDPlanInfo failed, code:" + statusCode + " re:" + result); - resultObj.put(Constant.RETCODE, statusCode); - resultObj.put(Constant.REASON, "get VNFDPlanInfo failed. code:" + statusCode + " re:" + result); - return resultObj; - } - } catch (JSONException e) { - LOG.error("function=uploadVNFPackage, msg=uploadVNFPackage get VNFDPlanInfo JSONException e={}.", e); - resultObj.put(Constant.RETCODE, Constant.HTTP_INNERERROR); - resultObj.put(Constant.REASON, "get VNFDPlanInfo failed and JSONException." + e.getMessage()); - return resultObj; - } catch (VnfmException e) { - LOG.error("function=uploadVNFPackage, msg=uploadVNFPackage get VNFDPlanInfo VnfmException e={}.", e); - resultObj.put(Constant.RETCODE, Constant.HTTP_INNERERROR); - resultObj.put(Constant.REASON, "get VNFDPlanInfo failed and VnfmException." + e.getMessage()); - return resultObj; - } catch (IOException e) { - LOG.error("function=uploadVNFPackage, msg=uploadVNFPackage get VNFDPlanInfo IOException e={}.", e); - resultObj.put(Constant.RETCODE, Constant.HTTP_INNERERROR); - resultObj.put(Constant.REASON, "get VNFDPlanInfo failed and IOException." + e.getMessage()); - return resultObj; - } - return resultObj; - } - - /** - * Get VNF package information.
- * - * @return - * @throws IOException - * @since VFC 1.0 - */ - public static String readVfnPkgInfoFromJson() throws IOException { - String fileContent = ""; - - String fileName = SystemEnvVariablesFactory.getInstance().getAppRoot() - + System.getProperty(Constant.FILE_SEPARATOR) + "etc" + System.getProperty(Constant.FILE_SEPARATOR) - + "vnfpkginfo" + System.getProperty(Constant.FILE_SEPARATOR) + Constant.VNFPKGINFO; - - try (InputStream ins = new FileInputStream(fileName)) { - try (BufferedInputStream bins = new BufferedInputStream(ins)) { - byte[] contentByte = new byte[ins.available()]; - int num = bins.read(contentByte); - - if (num > 0) { - fileContent = new String(contentByte); - } - } - } catch (FileNotFoundException e) { - LOG.error(fileName + "is not found!", e); - } - - return fileContent; - } - - private static JSONObject readVnfdIdInfoFromJson() { - JSONObject jsonObject = new JSONObject(); - - String fileContent = ""; - - String fileName = SystemEnvVariablesFactory.getInstance().getAppRoot() - + System.getProperty(Constant.FILE_SEPARATOR) + "etc" + System.getProperty(Constant.FILE_SEPARATOR) - + "vnfpkginfo" + System.getProperty(Constant.FILE_SEPARATOR) + "vnfd_ids.json"; - - try (InputStream ins = new FileInputStream(fileName)) { - try (BufferedInputStream bins = new BufferedInputStream(ins)) { - byte[] contentByte = new byte[ins.available()]; - int num = bins.read(contentByte); - - if (num > 0) { - fileContent = new String(contentByte); - } - if (fileContent != null) { - jsonObject = JSONObject.fromObject(fileContent).getJSONObject("vnfdIds"); - } - } - } catch (Exception e) { - LOG.error(fileName + " read error!", e); - } - return jsonObject; - } - - /* - * unzip CSAR packge - * - * @param fileName filePath - * - * @return - */ - public JSONObject unzipCSAR(String fileName, String filePath) { - LOG.info("fileName: " + fileName + ", filePath: " + filePath); - JSONObject resultObj = new JSONObject(); - - if (fileName == null || "".equals(fileName)) { - resultObj.put(Constant.REASON, "fileName is null."); - resultObj.put(Constant.RETCODE, Constant.REST_FAIL); - return resultObj; - } - if (filePath == null || "".equals(filePath)) { - resultObj.put(Constant.REASON, "unzipCSAR filePath is null."); - resultObj.put(Constant.RETCODE, Constant.REST_FAIL); - return resultObj; - } - - int status = DownloadCsarManager.unzipCSAR(fileName, filePath); - - if (Constant.UNZIP_SUCCESS == status) { - resultObj.put(Constant.REASON, "unzip csar file successfully."); - resultObj.put(Constant.RETCODE, Constant.REST_SUCCESS); - } else { - resultObj.put(Constant.REASON, "unzip csar file failed."); - resultObj.put(Constant.RETCODE, Constant.REST_FAIL); - } - return resultObj; - } + private static final Logger LOG = LoggerFactory.getLogger(AdapterResourceManager.class); + + private static final String VNFD_FILE_PATH = "vnfd_file_path"; + + @Override + public JSONObject uploadVNFPackage(JSONObject vnfpkge, Map paramsMap) { + JSONObject resultObj = new JSONObject(); + String vnfDescriptorId = paramsMap.get("vnfDescriptorId"); + JSONObject vnfpkgJson = new JSONObject(); + try { + // if upper layer do not provide vnfpackage info,then get the + // vnfpackage info from JSON file. + if (vnfpkge == null || vnfpkge.isEmpty()) { + String vnfPkgInfo = readVfnPkgInfoFromJson(); + vnfpkgJson = JSONObject.fromObject(vnfPkgInfo); + + } + } catch (IOException e) { + LOG.error("function=uploadVNFPackage", e); + } + + // check if parameters are null. + if (paramsMap == null || paramsMap.isEmpty()) { + resultObj.put(Constant.REASON, "csarid and vnfmid are null."); + resultObj.put(Constant.RETCODE, Constant.REST_FAIL); + return resultObj; + } + + String csarid = paramsMap.get("csarid"); + String vnfmid = paramsMap.get("vnfmid"); + String vnfdid = ""; + + if (null == csarid || "".equals(csarid)) { + resultObj.put(Constant.REASON, "csarid is null."); + resultObj.put(Constant.RETCODE, Constant.REST_FAIL); + return resultObj; + } + if (null == vnfmid || "".equals(vnfmid)) { + resultObj.put(Constant.REASON, "vnfmid is null."); + resultObj.put(Constant.RETCODE, Constant.REST_FAIL); + return resultObj; + } + + // obtain CSAR package info + JSONObject csarobj = getVnfmCsarInfo(csarid); + String downloadUri = ""; + String csarName = ""; + if (Integer.valueOf(csarobj.get(Constant.RETCODE).toString()) == Constant.HTTP_OK) { + LOG.info("get CSAR info successful.", csarobj.get(Constant.RETCODE)); + downloadUri = csarobj.getJSONObject("packageInfo").getString("downloadUrl"); + csarName = csarobj.getJSONObject("packageInfo").getString("csarName"); + } else { + LOG.error("get CSAR info fail.", csarobj.get(Constant.RETCODE)); + resultObj.put(Constant.REASON, csarobj.get(Constant.REASON).toString()); + 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); + + if (Integer.valueOf(downloadObject.get(Constant.RETCODE).toString()) != Constant.REST_SUCCESS) { + LOG.error("download CSAR fail." + downloadObject.get(Constant.RETCODE)); + resultObj.put(Constant.REASON, downloadObject.get(Constant.REASON).toString()); + resultObj.put(Constant.RETCODE, downloadObject.get(Constant.RETCODE).toString()); + return resultObj; + } + LOG.info("download CSAR successful." + downloadObject.get(Constant.RETCODE)); + + // unzip csar package to location. + JSONObject unzipObject = unzipCSAR(csarfilepath + csarfilename, csarfilepath); + + if (Integer.valueOf(unzipObject.get(Constant.RETCODE).toString()) != Constant.REST_SUCCESS) { + LOG.error("unzip CSAR fail.", unzipObject.get(Constant.RETCODE)); + resultObj.put(Constant.REASON, unzipObject.get(Constant.REASON).toString()); + resultObj.put(Constant.RETCODE, unzipObject.get(Constant.RETCODE).toString()); + return resultObj; + } + LOG.info("unzip CSAR successful.", unzipObject.get(Constant.RETCODE)); + + // upload vnfd to ftps server + // JSONObject uploadResJson = uploadCsar(csarTempObj, csarfilepath); + // LOG.info("upload Csar result: {}.", uploadResJson); + + Map vnfmMap = new HashMap<>(); + vnfmMap.put("url", String.format(UrlConstant.REST_VNFMINFO_GET, vnfmid)); + vnfmMap.put("methodType", Constant.GET); + + // get VNFM connection info + // getVnfmConnInfo(vnfmMap) + JSONObject vnfmObject = VnfmUtil.getVnfmById(vnfmid); + LOG.info("get Vnfm Connection Info successful."); + + String vnfmUrl = vnfmObject.getString("url"); + String userName = vnfmObject.getString(Constant.USERNAME); + String password = vnfmObject.getString(Constant.PASSWORD); + + // build VNFM connection and get token + ConnectMgrVnfm mgrVcmm = new ConnectMgrVnfm(); + + JSONObject connObject = new JSONObject(); + connObject.put("url", vnfmUrl); + connObject.put(Constant.USERNAME, userName); + connObject.put(Constant.PASSWORD, password); + if (Constant.HTTP_OK != mgrVcmm.connect(vnfmObject, Constant.CERTIFICATE)) { + LOG.error("get Access Session fail."); + resultObj.put(Constant.RETCODE, Constant.HTTP_INNERERROR); + resultObj.put(Constant.REASON, "connect fail."); + return resultObj; + } + LOG.info("get Access Session successful."); + String connToken = mgrVcmm.getAccessSession(); + + // get vim_id + JSONObject cloudObject = getAllCloud(vnfmUrl, connToken); + String vimId = ""; + + if (!cloudObject.isEmpty() && cloudObject.get(Constant.RETCODE).equals(HttpStatus.SC_OK)) { + LOG.info("get all cloud successful.", cloudObject.get(Constant.RETCODE)); + vimId = cloudObject.getString("vim_id"); + } else { + LOG.error("get all cloud fail.", cloudObject.get(Constant.RETCODE)); + return cloudObject; + } + + // upload VNF package + // csarTempObj.put("vim_id", vimId); + vnfpkg.put("template", csarTempObj); + LOG.info("vnfpkg: " + vnfpkg); + + JSONObject uploadPkgObject = upload(vnfpkg, vnfmUrl, connToken); + LOG.info("uploadPkgObject:" + uploadPkgObject); + if (!uploadPkgObject.isEmpty() && uploadPkgObject.get(Constant.RETCODE).equals(HttpStatus.SC_OK)) { + LOG.info("upload vnf package info successful.", uploadPkgObject.get(Constant.RETCODE)); + vnfdid = uploadPkgObject.getString("id"); + } + + // if(vnfdid == null || "".equals(vnfdid.trim())) { + JSONObject vnfdConf = readVnfdIdInfoFromJson(); + LOG.info("vnfdName:" + vnfdName + ", vnfdConf=" + vnfdConf); + if (vnfdConf.containsKey(vnfdName)) { + vnfdid = vnfdConf.getString(vnfdName); + } + // } + LOG.info("set vnfdId=" + vnfdid); + + // get vnfd version + String vnfdVersion = ""; + + JSONObject vnfdVerObject = getVnfdVersion(vnfmUrl, String.format(UrlConstant.URL_VNFDINFO_GET, vnfdid), + connToken); + LOG.info("vnfdVerObject:" + vnfdVerObject); + if (!vnfdVerObject.isEmpty() && vnfdVerObject.get(Constant.RETCODE).equals(HttpStatus.SC_OK)) { + LOG.info("get vnfd version successful.", vnfdVerObject.get(Constant.RETCODE)); + JSONArray verArr = vnfdVerObject.getJSONArray("templates"); + JSONObject verTmpObj = verArr.getJSONObject(0); + + vnfdVersion = verTmpObj.getString("vnfdVersion"); + } else { + LOG.error("get vnfd version fail.", vnfdVerObject.get(Constant.RETCODE)); + return vnfdVerObject; + } + + // get vnfd plan info + String planName = ""; + String planId = ""; + + JSONObject vnfdPlanInfo = getVNFDPlanInfo(vnfmUrl, vnfdid, connToken); + LOG.info("vnfdPlanInfo:" + vnfdPlanInfo); + JSONObject inputsObj = new JSONObject(); + if (!vnfdPlanInfo.isEmpty() && vnfdPlanInfo.get(Constant.RETCODE).equals(HttpStatus.SC_OK)) { + LOG.info("get vnfd plan info successful.", vnfdPlanInfo.get(Constant.RETCODE)); + JSONObject planTmpObj = vnfdPlanInfo.getJSONObject("template"); + String templateName = planTmpObj.getString("template_name").trim(); + JSONArray topoTmpObj = planTmpObj.getJSONArray("topology_template"); + + JSONObject planObj = topoTmpObj.getJSONObject(0); + if ("VNFD_vUGW".equals(templateName)) { + for (int i = 0; i < topoTmpObj.size(); i++) { + String name = topoTmpObj.getJSONObject(i).getString("plan_name").trim(); + if ("Normal_E9K".equals(name)) { + planObj = topoTmpObj.getJSONObject(i); + } + } + } + + planName = planObj.getString("plan_name"); + planId = planObj.getString("plan_id"); + if (planObj.containsKey("inputs")) { + JSONArray inputs = planObj.getJSONArray("inputs"); + for (int i = 0; i < inputs.size(); i++) { + JSONObject obj = inputs.getJSONObject(i); + obj.put("value", obj.getString("default")); + } + inputsObj.put("inputs", inputs); + inputsObj.put("External_network", new JSONArray()); + } + } else { + LOG.error("get vnfd plan info fail.", vnfdPlanInfo.get(Constant.RETCODE)); + return vnfdPlanInfo; + } + + // return values + resultObj.put(Constant.RETCODE, Constant.HTTP_OK); + resultObj.put("vnfdId", vnfdid); + 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()); + + return resultObj; + } + + private String transferFromCsar(String csarName) { + LOG.info("csarName: " + csarName); + String tempCsarName = csarName.toUpperCase(); + if (tempCsarName.contains("CSCF_SI")) { + return "CSCF_SI"; + } else if (tempCsarName.contains("CSCF")) { + return "vCSCF"; + } else if (tempCsarName.contains("MME")) { + return "vMME"; + } else if (tempCsarName.contains("SPGW")) { + return "vSPGW"; + } else if (tempCsarName.contains("HSS")) { + return "vHSS"; + } else if (tempCsarName.contains("SBC")) { + return "vSBC"; + } else if (tempCsarName.contains("PCRF")) { + return "vPCRF"; + } else if (tempCsarName.contains("TAS")) { + return "vTAS"; + } + return ""; + } + + private JSONObject uploadCsar(JSONObject vnfpkg, String csarfilepath) { + LOG.info("vnfpkg: " + vnfpkg + "csarfilepath:" + csarfilepath); + JSONObject resJson = new JSONObject(); + + boolean flag = false; + FTPSClient ftpClient = new FTPSClient(); + try { + ftpClient.connect(vnfpkg.getString("ftp_server_ip"), 21); + ftpClient.login(vnfpkg.getString("ftp_username"), vnfpkg.getString("ftp_password")); + int replyCode = ftpClient.getReplyCode(); + LOG.info("replyCode: " + replyCode); + if (!FTPReply.isPositiveCompletion(replyCode)) { + resJson.put("message", "Connect ftps server failed!"); + return resJson; + } + + ftpClient.setFileType(FTPClient.BINARY_FILE_TYPE); + ftpClient.enterLocalPassiveMode(); + ftpClient.makeDirectory(vnfpkg.getString(VNFD_FILE_PATH)); + 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/Deployment/OTHER/"; + LOG.info("vnfd_file_name: " + vnfdPath + vnfpkg.getString("vnfd_file_name")); + try (InputStream inputStream = new FileInputStream( + new File(vnfdPath + vnfpkg.getString("vnfd_file_name")))) { + flag = ftpClient.storeFile(vnfpkg.getString("vnfd_file_name"), inputStream); + if (flag) { + resJson.put("message", "upload Csar success!"); + } + } catch (Exception e) { + LOG.error("Exception: " + e); + } + + ftpClient.logout(); + } catch (Exception e) { + LOG.error("Exception: " + e); + } finally { + if (ftpClient.isConnected()) { + try { + ftpClient.disconnect(); + } catch (IOException e) { + LOG.error("IOException: " + e); + } + } + } + return resJson; + } + + private JSONObject sendRequest(Map paramsMap) { + JSONObject resultObj = new JSONObject(); + RestfulResponse rsp = VNFRestfulUtil.getRemoteResponse(paramsMap, ""); + if (null == rsp) { + LOG.error("function=sendRequest, RestfulResponse is null"); + resultObj.put(Constant.REASON, "RestfulResponse is null."); + resultObj.put(Constant.RETCODE, Constant.REST_FAIL); + return resultObj; + } + String resultCreate = rsp.getResponseContent(); + + if (rsp.getStatus() == Constant.HTTP_OK) { + LOG.warn("function=sendRequest, msg= status={}, result={}.", rsp.getStatus(), resultCreate); + resultObj = JSONObject.fromObject(resultCreate); + resultObj.put(Constant.RETCODE, Constant.HTTP_OK); + return resultObj; + } else { + LOG.error("function=sendRequest, msg=ESR return fail,status={}, result={}.", rsp.getStatus(), resultCreate); + resultObj.put(Constant.REASON, "ESR return fail."); + } + resultObj.put(Constant.RETCODE, Constant.REST_FAIL); + return resultObj; + } + + @Override + public JSONObject getVnfmCsarInfo(String csarid) { + JSONObject resultObj = new JSONObject(); + + if (null == csarid || "".equals(csarid)) { + resultObj.put(Constant.REASON, "csarid is null."); + resultObj.put(Constant.RETCODE, Constant.REST_FAIL); + return resultObj; + } + + Map paramsMap = new HashMap(); + + paramsMap.put("url", String.format(UrlConstant.REST_CSARINFO_GET, csarid)); + paramsMap.put("methodType", Constant.GET); + + return this.sendRequest(paramsMap); + } + + @Override + public JSONObject downloadCsar(String url, String filePath) { + JSONObject resultObj = new JSONObject(); + + if (url == null || "".equals(url)) { + resultObj.put(Constant.REASON, "url is null."); + resultObj.put(Constant.RETCODE, Constant.REST_FAIL); + return resultObj; + } + if (filePath == null || "".equals(filePath)) { + resultObj.put(Constant.REASON, "downloadUrl filePath is null."); + resultObj.put(Constant.RETCODE, Constant.REST_FAIL); + return resultObj; + } + + String status = DownloadCsarManager.download(url, filePath); + + if (Constant.DOWNLOADCSAR_SUCCESS.equals(status)) { + resultObj.put(Constant.REASON, "download csar file successfully."); + resultObj.put(Constant.RETCODE, Constant.REST_SUCCESS); + } else { + resultObj.put(Constant.REASON, "download csar file failed."); + resultObj.put(Constant.RETCODE, Constant.REST_FAIL); + } + return resultObj; + } + + @Override + public JSONObject getAllCloud(String url, String conntoken) { + JSONObject resultObj = new JSONObject(); + JSONArray resArray = new JSONArray(); + + if (url == null || url.equals("")) { + url = "http://" + Constant.LOCAL_HOST + ":31943"; + } + + // get vim_id + HttpMethod httpMethodCloud = null; + try { + httpMethodCloud = new HttpRequests.Builder(Constant.CERTIFICATE) + .setUrl(url.trim(), UrlConstant.URL_ALLCLOUD_NEW_GET) + .addHeader(Constant.HEADER_AUTH_TOKEN, conntoken).setParams("").get().execute(); + + int statusCode = httpMethodCloud.getStatusCode(); + + String result = httpMethodCloud.getResponseBodyAsString(); + LOG.info(result); + if (statusCode == HttpStatus.SC_OK) { + JSONObject vimInfo = JSONObject.fromObject(result); + resArray = vimInfo.getJSONArray("vim_info"); + resultObj = resArray.getJSONObject(0); + resultObj.put(Constant.RETCODE, statusCode); + } else { + LOG.error("uploadVNFPackage get allcloud failed, code:" + statusCode + " re:" + result); + resultObj.put(Constant.RETCODE, statusCode); + resultObj.put(Constant.REASON, "get allcloud failed. code:" + statusCode + " re:" + result); + return resultObj; + } + } catch (JSONException e) { + LOG.error("function=uploadVNFPackage, msg=uploadVNFPackage get allcloud JSONException e={}.", e); + resultObj.put(Constant.RETCODE, Constant.HTTP_INNERERROR); + resultObj.put(Constant.REASON, "get allcloud failed and JSONException." + e.getMessage()); + return resultObj; + } catch (VnfmException e) { + LOG.error("function=uploadVNFPackage, msg=uploadVNFPackage get allcloud VnfmException e={}.", e); + resultObj.put(Constant.RETCODE, Constant.HTTP_INNERERROR); + resultObj.put(Constant.REASON, "get allcloud failed and VnfmException." + e.getMessage()); + return resultObj; + } catch (IOException e) { + LOG.error("function=uploadVNFPackage, msg=uploadVNFPackage get allcloud IOException e={}.", e); + resultObj.put(Constant.RETCODE, Constant.HTTP_INNERERROR); + resultObj.put(Constant.REASON, "get allcloud failed and IOException." + e.getMessage()); + return resultObj; + } + return resultObj; + } + + /** + * Upload vnfpackage
+ * + * @param vnfpackage + * @param vnfmurl + * @param conntoken + * @return + * @since VFC 1.0 + */ + public JSONObject upload(JSONObject vnfpackage, String vnfmurl, String conntoken) { + JSONObject resultObj = new JSONObject(); + HttpMethod httpMethodVnf = null; + + try { + httpMethodVnf = new HttpRequests.Builder(Constant.CERTIFICATE) + .setUrl(vnfmurl.trim(), UrlConstant.URL_VNFPACKAGE_POST).setParams(vnfpackage.toString()) + .addHeader(Constant.HEADER_AUTH_TOKEN, conntoken).post().execute(); + + int statusCodeUp = httpMethodVnf.getStatusCode(); + + String resultUp = httpMethodVnf.getResponseBodyAsString(); + + if (statusCodeUp == HttpStatus.SC_CREATED || statusCodeUp == HttpStatus.SC_OK) { + LOG.info("uploadVNFPackage upload VNF package successful, code:" + statusCodeUp + " re:" + resultUp); + resultObj = JSONObject.fromObject(resultUp); + resultObj.put(Constant.RETCODE, statusCodeUp); + } else { + LOG.error("uploadVNFPackage upload VNF package failed, code:" + statusCodeUp + " re:" + resultUp); + resultObj.put(Constant.RETCODE, statusCodeUp); + resultObj.put("data", "upload VNF package failed, code:" + statusCodeUp + " re:" + resultUp); + return resultObj; + } + } catch (JSONException e) { + LOG.error("function=uploadVNFPackage, msg=uploadVNFPackage upload VNF package JSONException e={}.", e); + resultObj.put(Constant.RETCODE, Constant.HTTP_INNERERROR); + resultObj.put(Constant.REASON, "upload VNF package failed and JSONException." + e.getMessage()); + return resultObj; + } catch (VnfmException e) { + LOG.error("function=uploadVNFPackage, msg=uploadVNFPackage upload VNF package VnfmException e={}.", e); + resultObj.put(Constant.RETCODE, Constant.HTTP_INNERERROR); + resultObj.put(Constant.REASON, "upload VNF package failed and VnfmException." + e.getMessage()); + return resultObj; + } catch (IOException e) { + LOG.error("function=uploadVNFPackage, msg=uploadVNFPackage upload VNF package IOException e={}.", e); + resultObj.put(Constant.RETCODE, Constant.HTTP_INNERERROR); + resultObj.put(Constant.REASON, "upload VNF package failed and IOException." + e.getMessage()); + return resultObj; + } + return resultObj; + } + + /** + * Find vnfd version.
+ * + * @param prefixUrl + * @param serviceUrl + * @return + * @since VFC 1.0 + */ + public JSONObject getVnfdVersion(String prefixUrl, String serviceUrl, String conntoken) { + JSONObject resultObj = new JSONObject(); + HttpMethod httpMethodVnfd = null; + try { + httpMethodVnfd = new HttpRequests.Builder(Constant.CERTIFICATE).setUrl(prefixUrl.trim(), serviceUrl) + .setParams("").addHeader(Constant.HEADER_AUTH_TOKEN, conntoken).get().execute(); + + int statusCodeVnfd = httpMethodVnfd.getStatusCode(); + + String resultVnfd = httpMethodVnfd.getResponseBodyAsString(); + LOG.info("getVnfdVersion result:" + resultVnfd); + if (statusCodeVnfd == HttpStatus.SC_OK) { + resultObj = JSONObject.fromObject(resultVnfd); + resultObj.put(Constant.RETCODE, statusCodeVnfd); + } else { + LOG.error("uploadVNFPackage vnfd version failed, code:" + statusCodeVnfd + " re:" + resultVnfd); + resultObj.put(Constant.RETCODE, statusCodeVnfd); + resultObj.put("data", "get vnfd version failed, code:" + statusCodeVnfd + " re:" + resultVnfd); + return resultObj; + } + } catch (JSONException e) { + LOG.error("function=uploadVNFPackage, msg=uploadVNFPackage get vnfd version JSONException e={}.", e); + resultObj.put(Constant.RETCODE, Constant.HTTP_INNERERROR); + resultObj.put(Constant.REASON, "get vnfd version failed and JSONException." + e.getMessage()); + return resultObj; + } catch (VnfmException e) { + LOG.error("function=uploadVNFPackage, msg=uploadVNFPackage get vnfd version VnfmException e={}.", e); + resultObj.put(Constant.RETCODE, Constant.HTTP_INNERERROR); + resultObj.put(Constant.REASON, "get vnfd version failed and VnfmException." + e.getMessage()); + return resultObj; + } catch (IOException e) { + LOG.error("function=uploadVNFPackage, msg=uploadVNFPackage get vnfd version IOException e={}.", e); + resultObj.put(Constant.RETCODE, Constant.HTTP_INNERERROR); + resultObj.put(Constant.REASON, "get vnfd version failed and IOException." + e.getMessage()); + return resultObj; + } + return resultObj; + } + + /** + * Find VNFM connection information.
+ * + * @param paramsMap + * @return + * @since VFC 1.0 + */ + public JSONObject getVnfmConnInfo(Map paramsMap) { + return this.sendRequest(paramsMap); + } + + @Override + public JSONObject getVNFDPlanInfo(String url, String vnfdid, String conntoken) { + JSONObject resultObj = new JSONObject(); + + HttpMethod httpMethodPlan = null; + try { + httpMethodPlan = new HttpRequests.Builder(Constant.CERTIFICATE) + .setUrl(url.trim(), String.format(UrlConstant.URL_VNFDPLANINFO_GET, vnfdid)).setParams("") + .addHeader(Constant.HEADER_AUTH_TOKEN, conntoken).get().execute(); + + int statusCode = httpMethodPlan.getStatusCode(); + + String result = httpMethodPlan.getResponseBodyAsString(); + LOG.info("getVNFDPlanInfo result=" + result); + if (statusCode == HttpStatus.SC_OK) { + resultObj = JSONObject.fromObject(result); + resultObj.put(Constant.RETCODE, statusCode); + } else { + LOG.error("uploadVNFPackage get VNFDPlanInfo failed, code:" + statusCode + " re:" + result); + resultObj.put(Constant.RETCODE, statusCode); + resultObj.put(Constant.REASON, "get VNFDPlanInfo failed. code:" + statusCode + " re:" + result); + return resultObj; + } + } catch (JSONException e) { + LOG.error("function=uploadVNFPackage, msg=uploadVNFPackage get VNFDPlanInfo JSONException e={}.", e); + resultObj.put(Constant.RETCODE, Constant.HTTP_INNERERROR); + resultObj.put(Constant.REASON, "get VNFDPlanInfo failed and JSONException." + e.getMessage()); + return resultObj; + } catch (VnfmException e) { + LOG.error("function=uploadVNFPackage, msg=uploadVNFPackage get VNFDPlanInfo VnfmException e={}.", e); + resultObj.put(Constant.RETCODE, Constant.HTTP_INNERERROR); + resultObj.put(Constant.REASON, "get VNFDPlanInfo failed and VnfmException." + e.getMessage()); + return resultObj; + } catch (IOException e) { + LOG.error("function=uploadVNFPackage, msg=uploadVNFPackage get VNFDPlanInfo IOException e={}.", e); + resultObj.put(Constant.RETCODE, Constant.HTTP_INNERERROR); + resultObj.put(Constant.REASON, "get VNFDPlanInfo failed and IOException." + e.getMessage()); + return resultObj; + } + return resultObj; + } + + /** + * Get VNF package information.
+ * + * @return + * @throws IOException + * @since VFC 1.0 + */ + public static String readVfnPkgInfoFromJson() throws IOException { + String fileContent = ""; + + String fileName = SystemEnvVariablesFactory.getInstance().getAppRoot() + + System.getProperty(Constant.FILE_SEPARATOR) + "etc" + System.getProperty(Constant.FILE_SEPARATOR) + + "vnfpkginfo" + System.getProperty(Constant.FILE_SEPARATOR) + Constant.VNFPKGINFO; + + try (InputStream ins = new FileInputStream(fileName)) { + try (BufferedInputStream bins = new BufferedInputStream(ins)) { + byte[] contentByte = new byte[ins.available()]; + int num = bins.read(contentByte); + + if (num > 0) { + fileContent = new String(contentByte); + } + } + } catch (FileNotFoundException e) { + LOG.error(fileName + "is not found!", e); + } + + return fileContent; + } + + private static JSONObject readVnfdIdInfoFromJson() { + JSONObject jsonObject = new JSONObject(); + + String fileContent = ""; + + String fileName = SystemEnvVariablesFactory.getInstance().getAppRoot() + + System.getProperty(Constant.FILE_SEPARATOR) + "etc" + System.getProperty(Constant.FILE_SEPARATOR) + + "vnfpkginfo" + System.getProperty(Constant.FILE_SEPARATOR) + "vnfd_ids.json"; + + try (InputStream ins = new FileInputStream(fileName)) { + try (BufferedInputStream bins = new BufferedInputStream(ins)) { + byte[] contentByte = new byte[ins.available()]; + int num = bins.read(contentByte); + + if (num > 0) { + fileContent = new String(contentByte); + } + if (fileContent != null) { + jsonObject = JSONObject.fromObject(fileContent).getJSONObject("vnfdIds"); + } + } + } catch (Exception e) { + LOG.error(fileName + " read error!", e); + } + return jsonObject; + } + + /* + * unzip CSAR packge + * + * @param fileName filePath + * + * @return + */ + public JSONObject unzipCSAR(String fileName, String filePath) { + LOG.info("fileName: " + fileName + ", filePath: " + filePath); + JSONObject resultObj = new JSONObject(); + + if (fileName == null || "".equals(fileName)) { + resultObj.put(Constant.REASON, "fileName is null."); + resultObj.put(Constant.RETCODE, Constant.REST_FAIL); + return resultObj; + } + if (filePath == null || "".equals(filePath)) { + resultObj.put(Constant.REASON, "unzipCSAR filePath is null."); + resultObj.put(Constant.RETCODE, Constant.REST_FAIL); + return resultObj; + } + + int status = DownloadCsarManager.unzipCSAR(fileName, filePath); + + if (Constant.UNZIP_SUCCESS == status) { + resultObj.put(Constant.REASON, "unzip csar file successfully."); + resultObj.put(Constant.RETCODE, Constant.REST_SUCCESS); + } else { + resultObj.put(Constant.REASON, "unzip csar file failed."); + resultObj.put(Constant.RETCODE, Constant.REST_FAIL); + } + return resultObj; + } } diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfMgr.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfMgr.java index 83c0b557..85be8ccc 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfMgr.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfMgr.java @@ -237,9 +237,9 @@ public class VnfMgr { restJson.put("vapp_name", vnfObject.get("vnfInstanceName")); restJson.put("project_id", vnfmId); restJson.put("parameters", resObject.getJSONObject("parameters")); - if (resObject.containsKey("emsUuid")) { - restJson.put("emsUuid", resObject.getString("emsUuid")); - } + if(resObject.containsKey("emsUuid")) { + restJson.put("emsUuid", resObject.getString("emsUuid")); + } restJson.put("nfvo_id", ""); restJson.put("location", ""); restJson.put("vnfm_id", vnfmId); @@ -372,4 +372,5 @@ public class VnfMgr { LOG.info("function=getVmsFromVnfm, restJson: {}", restJson); return restJson; } + } diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoa.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoa.java index b8eea548..91462de4 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoa.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoa.java @@ -54,105 +54,105 @@ import net.sf.json.JSONObject; @Produces(MediaType.APPLICATION_JSON) public class AuthRoa { - private static final Logger LOG = LoggerFactory.getLogger(AuthRoa.class); - - private AuthMgr authMgr; - - public void setAuthMgr(AuthMgr authMgr) { - this.authMgr = authMgr; - } - - /** - * Provide interface for add authInfo
- * - * @param context - * @return - * @since VFC 1.0 - */ - @PUT - @Path("/plat/smapp/v1/oauth/token") - public String authToken(@Context HttpServletRequest context, @Context HttpServletResponse resp) { - LOG.warn("function=login, msg=enter to get token."); - JSONObject subJsonObject = VnfmJsonUtil.getJsonFromContexts(context); - LOG.warn("subJsonObject: {}", subJsonObject); - - if (null == subJsonObject) { - LOG.error("function=login, msg=params are insufficient"); - String resultStr = "Login params insufficient"; - resp.setStatus(Constant.HTTP_BAD_REQUEST); - - return resultStr; - } - - JSONObject authResult = authMgr.authToken(subJsonObject); - LOG.warn("authResult: {}", authResult); - if (authResult.getInt(Constant.RETCODE) == Constant.REST_SUCCESS) { - JSONObject data = authResult.getJSONObject("data"); - resp.setStatus(Constant.HTTP_OK); - return data.toString(); - } else if (authResult.getInt(Constant.RETCODE) == Constant.HTTP_INNERERROR) { - Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(authResult.getString("data")).build(); - return String.format(ParamConstants.GET_TOKEN_FAIL_RESP, authResult.getString("data")); - } else { - Response.status(Response.Status.UNAUTHORIZED).entity(authResult.getString("data")).build(); - return String.format(ParamConstants.GET_TOKEN_FAIL_RESP, authResult.getString("data")); - } - } - - /** - * Provide interface for delete authInfo
- * - * @param userName - * @param roarand - * @return - * @since VFC 1.0 - */ - @DELETE - @Path("/plat/smapp/v1/auth/tokens/{userName}/{roarand}") - public String delAuthToken(@PathParam(Constant.USERNAME) String userName, @PathParam("roarand") String roarand, - @Context HttpServletResponse resp) { - LOG.warn("function=logout, msg=enter to logout"); - JSONObject resultJson = new JSONObject(); - - resultJson.put("Information", "Operation success"); - resp.setStatus(Constant.HTTP_NOCONTENT); - LOG.warn("function=logout, msg=end to logout"); - return resultJson.toString(); - } - - /** - * Provide interface for handshake authInfo
- * - * @param roattr - * @return - * @since VFC 1.0 - */ - @GET - @Path("/vnfmmed/v2/nfvo/shakehand") - public String shakehand(@QueryParam("roattr") String roattr, @Context HttpServletResponse resp) { - JSONObject resultJson = new JSONObject(); - resultJson.put("status", "running"); - resultJson.put("description", "Operation success"); - resp.setStatus(Constant.HTTP_OK); - - return resultJson.toString(); - } - - /** - * Provide interface for handshake authInfo
- * - * @param roattr - * @return - * @since VFC 1.0 - */ - @GET - @Path("/plat/smapp/v1/nfvo/shakehand") - public String shakehandOld(@QueryParam("roattr") String roattr, @Context HttpServletResponse resp) { - JSONObject resultJson = new JSONObject(); - resultJson.put("status", "running"); - resultJson.put("description", "Operation success"); - resp.setStatus(Constant.HTTP_OK); - - return resultJson.toString(); - } + private static final Logger LOG = LoggerFactory.getLogger(AuthRoa.class); + + private AuthMgr authMgr; + + public void setAuthMgr(AuthMgr authMgr) { + this.authMgr = authMgr; + } + + /** + * Provide interface for add authInfo
+ * + * @param context + * @return + * @since VFC 1.0 + */ + @PUT + @Path("/plat/smapp/v1/oauth/token") + public String authToken(@Context HttpServletRequest context, @Context HttpServletResponse resp) { + LOG.warn("function=login, msg=enter to get token."); + JSONObject subJsonObject = VnfmJsonUtil.getJsonFromContexts(context); + LOG.warn("subJsonObject: {}", subJsonObject); + + if (null == subJsonObject) { + LOG.error("function=login, msg=params are insufficient"); + String resultStr = "Login params insufficient"; + resp.setStatus(Constant.HTTP_BAD_REQUEST); + + return resultStr; + } + + JSONObject authResult = authMgr.authToken(subJsonObject); + LOG.warn("authResult: {}", authResult); + if (authResult.getInt(Constant.RETCODE) == Constant.REST_SUCCESS) { + JSONObject data = authResult.getJSONObject("data"); + resp.setStatus(Constant.HTTP_OK); + return data.toString(); + } else if (authResult.getInt(Constant.RETCODE) == Constant.HTTP_INNERERROR) { + Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(authResult.getString("data")).build(); + return String.format(ParamConstants.GET_TOKEN_FAIL_RESP, authResult.getString("data")); + } else { + Response.status(Response.Status.UNAUTHORIZED).entity(authResult.getString("data")).build(); + return String.format(ParamConstants.GET_TOKEN_FAIL_RESP, authResult.getString("data")); + } + } + + /** + * Provide interface for delete authInfo
+ * + * @param userName + * @param roarand + * @return + * @since VFC 1.0 + */ + @DELETE + @Path("/plat/smapp/v1/auth/tokens/{userName}/{roarand}") + public String delAuthToken(@PathParam(Constant.USERNAME) String userName, @PathParam("roarand") String roarand, + @Context HttpServletResponse resp) { + LOG.warn("function=logout, msg=enter to logout"); + JSONObject resultJson = new JSONObject(); + + resultJson.put("Information", "Operation success"); + resp.setStatus(Constant.HTTP_NOCONTENT); + LOG.warn("function=logout, msg=end to logout"); + return resultJson.toString(); + } + + /** + * Provide interface for handshake authInfo
+ * + * @param roattr + * @return + * @since VFC 1.0 + */ + @GET + @Path("/vnfmmed/v2/nfvo/shakehand") + public String shakehand(@QueryParam("roattr") String roattr, @Context HttpServletResponse resp) { + JSONObject resultJson = new JSONObject(); + resultJson.put("status", "running"); + resultJson.put("description", "Operation success"); + resp.setStatus(Constant.HTTP_OK); + + return resultJson.toString(); + } + + /** + * Provide interface for handshake authInfo
+ * + * @param roattr + * @return + * @since VFC 1.0 + */ + @GET + @Path("/plat/smapp/v1/nfvo/shakehand") + public String shakehandOld(@QueryParam("roattr") String roattr, @Context HttpServletResponse resp) { + JSONObject resultJson = new JSONObject(); + resultJson.put("status", "running"); + resultJson.put("description", "Operation success"); + resp.setStatus(Constant.HTTP_OK); + + return resultJson.toString(); + } } -- cgit 1.2.3-korg