import javax.ws.rs.core.Response;
-import org.onap.aai.esr.entity.rest.RegisterResponse;
-import org.onap.aai.esr.entity.rest.VnfmRestData;
+import org.onap.aai.esr.entity.aai.CloudRegionDetail;
+import org.onap.aai.esr.entity.aai.EsrVnfmDetail;
+import org.onap.aai.esr.entity.rest.CommonRegisterResponse;
+import org.onap.aai.esr.entity.rest.VnfmRegisterInfo;
+import org.onap.aai.esr.externalservice.aai.CloudRegionProxy;
+import org.onap.aai.esr.externalservice.aai.ExternalSystemProxy;
+import org.onap.aai.esr.util.VimManagerUtil;
+import org.onap.aai.esr.util.VnfmManagerUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.gson.Gson;
+
public class VnfmManagerWrapper {
private static VnfmManagerWrapper vnfmManagerWrapper;
private static final Logger LOG = LoggerFactory.getLogger(VnfmManagerWrapper.class);
return vnfmManagerWrapper;
}
- public Response registerVnfm(VnfmRestData vnfm) {
- //TODO
- RegisterResponse result = null;
- return Response.ok(result).build();
+ public Response registerVnfm(VnfmRegisterInfo vnfm) {
+ CommonRegisterResponse result = new CommonRegisterResponse();
+ EsrVnfmDetail esrVnfmDetail = new EsrVnfmDetail();
+ esrVnfmDetail = VnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfm);
+ String vnfmId = esrVnfmDetail.getVnfmId();
+ try {
+ ExternalSystemProxy.registerVnfm(vnfmId, esrVnfmDetail);
+ result.setId(vnfmId);
+ return Response.ok(result).build();
+ } catch (Exception e) {
+ LOG.error("Register VNFM failed !" + e.getMessage());
+ return Response.serverError().build();
+ }
}
- public Response updateVnfm(VnfmRestData vnfm, String vnfmId) {
+ public Response updateVnfm(VnfmRegisterInfo vnfm, String vnfmId) {
//TODO
return Response.ok().build();
}
public Response queryVnfmList() {
- ArrayList<VnfmRestData> vnfmList = new ArrayList<VnfmRestData>();
+ ArrayList<VnfmRegisterInfo> vnfmList = new ArrayList<VnfmRegisterInfo>();
//TODO
return Response.ok(vnfmList).build();
}
public Response queryVnfmById(String vnfmId) {
- VnfmRestData vnfm = new VnfmRestData();
- //TODO
- return Response.ok(vnfm).build();
+ VnfmRegisterInfo vnfm = new VnfmRegisterInfo();
+ EsrVnfmDetail esrVnfmDetail = new EsrVnfmDetail();
+ try {
+ String esrVnfmstr = ExternalSystemProxy.queryVnfmDetail(vnfmId);
+ LOG.info("Response from AAI by query VNFM: " + esrVnfmstr);
+ esrVnfmDetail = new Gson().fromJson(esrVnfmstr, EsrVnfmDetail.class);
+ vnfm = VnfmManagerUtil.esrVnfm2VnfmRegisterInfo(esrVnfmDetail);
+ return Response.ok(vnfm).build();
+ } catch (Exception e) {
+ e.printStackTrace();
+ return Response.serverError().build();
+ }
}
public Response delVnfm(String vnfmId) {