package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process;
-import net.sf.json.JSONException;
-import net.sf.json.JSONObject;
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.ResultRequestUtil;
import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmUtil;
import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.adapter.impl.AdapterResourceManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import net.sf.json.JSONException;
+import net.sf.json.JSONObject;
/**
* Provide function for instantiate or terminate VNF
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"));
+ }
restJson.put("nfvo_id", "");
restJson.put("location", "");
restJson.put("vnfm_id", vnfmId);
if(vnfInstanceId == null) {
url = "/v2/vapps/instances/query/vms";
} else {
- url = String.format("/v2/vapps/instances/%s/vms", vnfInstanceId);
+ url = String.format("/v2/vapps/instances/%s/vm", vnfInstanceId);
}
restJson = ResultRequestUtil.call(vnfmObjcet, url, Constant.GET, null, Constant.CERTIFICATE);
LOG.info("function=getVmsFromVnfm, restJson: {}", restJson);
return restJson;
}
+
}