diff options
Diffstat (limited to 'huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm')
2 files changed, 172 insertions, 7 deletions
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/ScaleManager.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/ScaleManager.java new file mode 100644 index 00000000..7b0a4db6 --- /dev/null +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/ScaleManager.java @@ -0,0 +1,154 @@ +/* + * Copyright 2018 Huawei Technologies Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.vnf; + +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.restclient.SystemEnvVariablesFactory; +import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant.Constant; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import net.sf.json.JSONArray; +import net.sf.json.JSONException; +import net.sf.json.JSONObject; + +/** + * <br> + * <p> + * </p> + * + * @author + * @version VFC 1.0 2018年5月17日 + */ +public abstract class ScaleManager { + + private static final Logger LOG = LoggerFactory.getLogger(ScaleManager.class); + + private static String VM_IDS_PATH = + SystemEnvVariablesFactory.getInstance().getAppRoot() + System.getProperty(Constant.FILE_SEPARATOR) + "etc" + + System.getProperty(Constant.FILE_SEPARATOR) + "vnfpkginfo" + + System.getProperty(Constant.FILE_SEPARATOR) + "vms" + System.getProperty(Constant.FILE_SEPARATOR); + + public static void beforeScaleOut(JSONObject queryVms, String vnfId) { + try { + JSONArray vms = queryVms.getJSONObject("data").getJSONArray("vms"); + writeVmIdsToFile(vnfId, vms); + } catch(JSONException e) { + LOG.error("function=beforeScaleOut, msg=recode current vms JSONException"); + } + } + + public static JSONArray beforeScaleIn(JSONObject queryVms, String vnfId) { + JSONArray vmList = new JSONArray(); + try { + JSONArray vms = queryVms.getJSONObject("data").getJSONArray("vms"); + JSONArray recodeVms = readVmIdsFile(vnfId); + if(!recodeVms.isEmpty()) { + for(int i = 0; i < vms.size(); i++) { + JSONObject obj = vms.getJSONObject(i); + String vmId = obj.getString("id"); + if(isScaleOutVm(recodeVms, vmId)) { + JSONObject vmIdObj = new JSONObject(); + vmIdObj.put("vm_id", vmId); + vmList.add(vmIdObj); + } + } + } + } catch(JSONException e) { + LOG.error("function=beforeScaleIn, msg=recode current vms JSONException"); + } + return vmList; + } + + private static boolean isScaleOutVm(JSONArray recodeVms, String vmId) { + for(int i = 0; i < recodeVms.size(); i++) { + JSONObject obj = recodeVms.getJSONObject(i); + String oldVmId = obj.getString("id"); + if(oldVmId.equalsIgnoreCase(vmId)) { + return false; + } + } + return true; + } + + private static String getVmIdsFilePath(String vnfId) { + return VM_IDS_PATH + vnfId + ".json"; + } + + private static void writeVmIdsToFile(String vnfId, JSONArray vms) { + String filePath = getVmIdsFilePath(vnfId); + FileOutputStream outStream = null; + try { + File destFile = FileUtils.getFile(filePath); + + File parentFile = destFile.getParentFile(); + if(parentFile != null) { + if(!parentFile.mkdirs() && !parentFile.isDirectory()) { + throw new IOException("Destination '" + parentFile + "' directory cannot be created"); + } + } + if(!destFile.exists()) { + destFile.createNewFile(); + } + outStream = new FileOutputStream(destFile); + outStream.write(vms.toString().getBytes()); + } catch(IOException e) { + LOG.error("function=writeVmIdsToFile, msg=write vms to file ioexception, e : {}", e); + } finally { + IOUtils.closeQuietly(outStream); + } + } + + private static JSONArray readVmIdsFile(String vnfId) { + String filePath = getVmIdsFilePath(vnfId); + InputStream ins = null; + BufferedInputStream bins = null; + String fileContent = ""; + try { + ins = FileUtils.openInputStream(FileUtils.getFile(filePath)); + bins = new BufferedInputStream(ins); + + byte[] contentByte = new byte[ins.available()]; + int num = bins.read(contentByte); + + + if(num > 0) { + fileContent = new String(contentByte); + } + + if(StringUtils.isNotEmpty(fileContent)) { + return JSONArray.fromObject(fileContent); + } + } catch(IOException e) { + LOG.error("function=readVmIdsFile, msg=read vms from file IOException, filePath : {}", filePath); + } catch(JSONException e) { + LOG.error("function=readVmIdsFile, msg=read vms from file JSONException, fileContent : {}", fileContent); + } finally { + IOUtils.closeQuietly(bins); + IOUtils.closeQuietly(ins); + } + return new JSONArray(); + } +} diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/VnfMgrVnfm.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/VnfMgrVnfm.java index 185d31cb..42d5b875 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/VnfMgrVnfm.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/VnfMgrVnfm.java @@ -51,6 +51,11 @@ public class VnfMgrVnfm implements InterfaceVnfMgr { @Override public JSONObject scaleVnf(JSONObject vnfObject, JSONObject vnfmObject, String vnfmId, String vnfInstanceId) { LOG.warn("function=scaleVnf, msg=enter to scale a vnf"); + + JSONObject queryVms = ResultRequestUtil.call(vnfmObject, + String.format(ParamConstants.VNF_GET_VMINFO, vnfInstanceId), Constant.GET, null, Constant.CERTIFICATE); + LOG.info("function=scaleVnf, msg=query vms result=" + queryVms); + JSONObject restJson = new JSONObject(); restJson.put(Constant.RETCODE, Constant.REST_FAIL); String path = String.format(ParamConstants.VNF_SCALE, vnfInstanceId); @@ -61,7 +66,12 @@ public class VnfMgrVnfm implements InterfaceVnfMgr { JSONObject scaleInfo = new JSONObject(); JSONArray vduList = new JSONArray(); JSONObject vdu = new JSONObject(); - vdu.put("vdu_type", this.getVduType(vnfmObject, vnfInstanceId)); + + if(vnfObject.containsKey("configedVduType")) { + vdu.put("vdu_type", vnfObject.getString("configedVduType")); + } else { + vdu.put("vdu_type", this.getVduType(vnfmObject, queryVms)); + } vdu.put("h_steps", vnfObject.get("numberOfSteps")); vduList.add(vdu); scaleInfo.put("vnf_id", vnfInstanceId); @@ -78,13 +88,18 @@ public class VnfMgrVnfm implements InterfaceVnfMgr { try { // JSONObject additionalParam = vnfObject.getJSONObject("additionalParam"); // vmList = additionalParam.getJSONArray("vm_list"); - vmList = AdapterResourceManager.readScaleInVmIdFromJson().getJSONArray("vm_list"); + vmList = ScaleManager.beforeScaleIn(queryVms, vnfInstanceId); + if(vmList.isEmpty()) { + vmList = AdapterResourceManager.readScaleInVmIdFromJson().getJSONArray("vm_list"); + } } catch(JSONException e) { LOG.error("the param 'additionalParam' or 'vm_list' not found,please check it", e); } if(null != vmList && !vmList.isEmpty()) { scaleInfo.put("vm_list", vmList); } + } else if(scaleType == PARAM_ONE) { + ScaleManager.beforeScaleOut(queryVms, vnfInstanceId); } paramJson.put("scale_info", scaleInfo); JSONObject queryResult = @@ -118,13 +133,9 @@ public class VnfMgrVnfm implements InterfaceVnfMgr { return restJson; } - private String getVduType(JSONObject vnfmObject, String vnfInstanceId) { + private String getVduType(JSONObject vnfmObject, JSONObject queryResult) { String vduType = ""; try { - JSONObject queryResult = - ResultRequestUtil.call(vnfmObject, String.format(ParamConstants.VNF_GET_VMINFO, vnfInstanceId), - Constant.GET, null, Constant.CERTIFICATE); - LOG.info("getVduType result=" + queryResult); vduType = queryResult.getJSONObject("data").getJSONArray("vms").getJSONObject(0).getString("vdu_type"); } catch(Exception e) { LOG.error("get vdu_type failed.", e); |