*/
package org.onap.aai.esr.entity.aai;
+import java.io.Serializable;
+
import com.google.gson.annotations.SerializedName;
-public class EsrSystemInfo {
+public class EsrSystemInfo implements Serializable {
+
+ public static final long serialVersionUID = 1L;
@SerializedName("esr-system-info-id")
private String esrSystemInfoId;
*/
package org.onap.aai.esr.entity.aai;
+import java.io.Serializable;
import java.util.ArrayList;
import com.google.gson.annotations.SerializedName;
-public class EsrSystemInfoList {
+public class EsrSystemInfoList implements Serializable {
+ public static final long serialVersionUID = 1L;
+
@SerializedName("esr-system-info")
private ArrayList<EsrSystemInfo> esrSystemInfo;
public class ExternalSystemProxy {
- private static IExternalSystem adapterServiceproxy;
+ private static IExternalSystem externalSystemproxy;
private static String transactionId = "9999";
private static String fromAppId = "esr-server";
private static String authorization = AaiCommon.getAuthenticationCredentials();
static {
ClientConfig config = new ClientConfig();
- adapterServiceproxy = ConsumerFactory.createConsumer(AaiAdapterConfig.getExternalSystemAddr(),
+ externalSystemproxy = ConsumerFactory.createConsumer(AaiAdapterConfig.getExternalSystemAddr(),
config, IExternalSystem.class);
}
esrVnfmDetail);
}
-
+ public static String queryVnfmDetail(String vnfmId) throws Exception {
+ return externalSystemproxy.queryVNFMDetail(transactionId, fromAppId, authorization, vnfmId);
+ }
}
import javax.ws.rs.core.Response;
+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);
public Response queryVnfmById(String vnfmId) {
VnfmRegisterInfo vnfm = new VnfmRegisterInfo();
- //TODO
- return Response.ok(vnfm).build();
+ 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) {