X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fesr-server.git;a=blobdiff_plain;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Fwrapper%2FVnfmManagerWrapper.java;h=584a15696f447cd54665b5465a0ef6cdb61a0e1a;hp=30d4e3d0ad8ea4abfcb3ddd8926792e046873c38;hb=769718b3e8b4e659299602701b575cf1b4b182c5;hpb=567917ad3680d64f56568aee3d6c854e79f049ab

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VnfmManagerWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VnfmManagerWrapper.java
index 30d4e3d..584a156 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VnfmManagerWrapper.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VnfmManagerWrapper.java
@@ -16,13 +16,17 @@
 package org.onap.aai.esr.wrapper;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import javax.ws.rs.core.Response;
 
+import org.onap.aai.esr.entity.aai.EsrSystemInfo;
 import org.onap.aai.esr.entity.aai.EsrVnfmDetail;
 import org.onap.aai.esr.entity.aai.EsrVnfmList;
 import org.onap.aai.esr.entity.rest.CommonRegisterResponse;
 import org.onap.aai.esr.entity.rest.VnfmRegisterInfo;
+import org.onap.aai.esr.exception.ExceptionUtil;
+import org.onap.aai.esr.exception.ExtsysException;
 import org.onap.aai.esr.externalservice.aai.ExternalSystemProxy;
 import org.onap.aai.esr.util.VnfmManagerUtil;
 import org.slf4j.Logger;
@@ -34,6 +38,8 @@ public class VnfmManagerWrapper {
   private static VnfmManagerWrapper vnfmManagerWrapper;
   private static final Logger LOG = LoggerFactory.getLogger(VnfmManagerWrapper.class);
 
+  private static VnfmManagerUtil vnfmManagerUtil = new VnfmManagerUtil();
+  
   /**
    * get VnfmManagerWrapper instance.
    * 
@@ -48,27 +54,42 @@ public class VnfmManagerWrapper {
 
   public Response registerVnfm(VnfmRegisterInfo vnfm) {
     CommonRegisterResponse result = new CommonRegisterResponse();
-    EsrVnfmDetail esrVnfmDetail = new EsrVnfmDetail();
-    esrVnfmDetail = VnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfm);
+    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) {
-      e.printStackTrace();
-      LOG.error("Register VNFM failed !" + e.getMessage());
-      return Response.serverError().build();
+    } catch (ExtsysException e) {
+      LOG.error("Register VNFM failed !" , e);
+      throw ExceptionUtil.buildExceptionResponse(e.getMessage());
     }
   }
 
   public Response updateVnfm(VnfmRegisterInfo vnfm, String vnfmId) {
-    // TODO
-    return Response.ok().build();
+    CommonRegisterResponse result = new CommonRegisterResponse();
+    EsrVnfmDetail originalEsrVnfmDetail = queryEsrVnfmDetail(vnfmId);
+    EsrVnfmDetail esrVnfmDetail = vnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfm);
+    String resourceVersion = getResourceVersion(vnfmId);
+    esrVnfmDetail.setResourceVersion(resourceVersion);
+    esrVnfmDetail.setVnfmId(vnfmId);
+    EsrSystemInfo originalEsrSystemInfo = originalEsrVnfmDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0);
+    esrVnfmDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0)
+        .setEsrSystemInfoId(originalEsrSystemInfo.getEsrSystemInfoId());
+    esrVnfmDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0)
+        .setResouceVersion(originalEsrSystemInfo.getResouceVersion());
+    try {
+      ExternalSystemProxy.registerVnfm(vnfmId, esrVnfmDetail);
+      result.setId(vnfmId);
+      return Response.ok(result).build();
+    } catch (ExtsysException e) {
+      LOG.error("Update VNFM failed !", e);
+      throw ExceptionUtil.buildExceptionResponse(e.getMessage());
+    }
   }
 
   public Response queryVnfmList() {
-    ArrayList<VnfmRegisterInfo> vnfmList = new ArrayList<VnfmRegisterInfo>();
+    List<VnfmRegisterInfo> vnfmList = new ArrayList<>();
     EsrVnfmList esrVnfm = new EsrVnfmList();
     try {
       String esrVnfmStr = ExternalSystemProxy.queryVnfmList();
@@ -76,48 +97,31 @@ public class VnfmManagerWrapper {
       LOG.info("Response from AAI by query VNFM list: " + esrVnfm);
       vnfmList = getVnfmDetailList(esrVnfm);
       return Response.ok(vnfmList).build();
-    } catch (Exception e) {
-      e.printStackTrace();
-      LOG.error("Query VNFM list failed !");
-      return Response.serverError().build();
+    } catch (ExtsysException e) {
+      LOG.error("Query VNFM list failed !", e);
+      return Response.ok(vnfmList).build();
     }
-
   }
 
   public Response queryVnfmById(String vnfmId) {
-    VnfmRegisterInfo vnfm = new VnfmRegisterInfo();
-    vnfm = queryVnfmDetail(vnfmId);
+    VnfmRegisterInfo vnfm = queryVnfmDetail(vnfmId);
     if (vnfm != null) {
       return Response.ok(vnfm).build();
     } else {
-      return Response.serverError().build();
+      return Response.ok(vnfm).build();
     }
   }
 
   public Response delVnfm(String vnfmId) {
-    EsrVnfmDetail esrVnfmDetail = new EsrVnfmDetail();
+    String resourceVersion = getResourceVersion(vnfmId);
     try {
-      String esrVnfmstr = ExternalSystemProxy.queryVnfmDetail(vnfmId);
-      LOG.info("Response from AAI by query VNFM: " + esrVnfmstr);
-      esrVnfmDetail = new Gson().fromJson(esrVnfmstr, EsrVnfmDetail.class);
-    } catch (Exception e) {
-      e.printStackTrace();
-      LOG.error("Query VNFM detail failed! VNFM ID: " + vnfmId, e.getMessage());
-    }
-    if (esrVnfmDetail != null && esrVnfmDetail.getResourceVersion() != null) {
-      String resourceVersion = esrVnfmDetail.getResourceVersion();
-      try {
-        ExternalSystemProxy.deleteVnfm(vnfmId, resourceVersion);
-        return Response.ok().build();
-      } catch (Exception e) {
-        e.printStackTrace();
-        LOG.error("Delete VNFM from A&AI failed! VNFM ID: " + vnfmId + "resouce-version:"
-            + resourceVersion, e.getMessage());
-        return Response.serverError().build();
-      }
-    } else {
-      LOG.error("resouce-version is null ! Can not delete resouce from A&AI. ");
-      return Response.serverError().build();
+      ExternalSystemProxy.deleteVnfm(vnfmId, resourceVersion);
+      return Response.noContent().build();
+    } catch (ExtsysException e) {
+      LOG.error(
+          "Delete VNFM from A&AI failed! VNFM ID: " + vnfmId + "resouce-version:" + resourceVersion,
+          e);
+      throw ExceptionUtil.buildExceptionResponse(e.getMessage());
     }
   }
 
@@ -128,25 +132,44 @@ public class VnfmManagerWrapper {
       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 vnfm;
-    } catch (Exception e) {
-      e.printStackTrace();
-      LOG.error("Query VNFM detail failed! VNFM ID: " + vnfmId, e.getMessage());
-      return null;
+      vnfm = vnfmManagerUtil.esrVnfm2VnfmRegisterInfo(esrVnfmDetail);
+    } catch (ExtsysException e) {
+      LOG.error("Query VNFM detail failed! VNFM ID: " + vnfmId, e);
     }
+    return vnfm;
   }
 
-  private ArrayList<VnfmRegisterInfo> getVnfmDetailList(EsrVnfmList esrVnfm) {
-    ArrayList<VnfmRegisterInfo> vnfmInfoList = new ArrayList<VnfmRegisterInfo>();
-    VnfmRegisterInfo vnfmInfo = new VnfmRegisterInfo();
+  private List<VnfmRegisterInfo> getVnfmDetailList(EsrVnfmList esrVnfm) {
+    List<VnfmRegisterInfo> vnfmInfoList = new ArrayList<>();
     for (int i = 0; i < esrVnfm.getEsrVnfm().size(); i++) {
       String vnfmId = esrVnfm.getEsrVnfm().get(i).getVnfmId();
-      vnfmInfo = queryVnfmDetail(vnfmId);
+      VnfmRegisterInfo vnfmInfo = queryVnfmDetail(vnfmId);
       if (vnfmInfo != null) {
         vnfmInfoList.add(vnfmInfo);
       }
     }
     return vnfmInfoList;
   }
+  
+  private String getResourceVersion (String vnfmId) {
+    String resourceVersion = null;
+    EsrVnfmDetail esrVnfmDetail = queryEsrVnfmDetail(vnfmId);
+    if (esrVnfmDetail != null && esrVnfmDetail.getResourceVersion() != null) {
+      resourceVersion = esrVnfmDetail.getResourceVersion();
+    }
+    return resourceVersion;
+  }
+  
+  private EsrVnfmDetail queryEsrVnfmDetail (String vnfmId) {
+    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);
+    } catch (ExtsysException e) {
+      LOG.error("Query VNFM detail failed! VNFM ID: " + vnfmId, e);
+      throw ExceptionUtil.buildExceptionResponse(e.getMessage());
+    }
+    return esrVnfmDetail;
+  }
 }