X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Fwrapper%2FVnfmManagerWrapper.java;h=a0ca60d4fbf1a45086eed3a42e3bf84d89fcd157;hb=22a43294c389a413b7d8d372a6d267ea054b4e22;hp=512737175e0a06856e2d9d554efcb8c4134bde19;hpb=66596a09241e9548bb2a286f2341705a3ddf26f2;p=aai%2Fesr-server.git

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 5127371..a0ca60d 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
@@ -19,6 +19,7 @@ import java.util.ArrayList;
 
 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;
@@ -34,8 +35,11 @@ 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.
+   * 
    * @return vnfm manager wrapper instance
    */
   public static VnfmManagerWrapper getInstance() {
@@ -48,53 +52,89 @@ public class VnfmManagerWrapper {
   public Response registerVnfm(VnfmRegisterInfo vnfm) {
     CommonRegisterResponse result = new CommonRegisterResponse();
     EsrVnfmDetail esrVnfmDetail = new EsrVnfmDetail();
-    esrVnfmDetail = VnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfm);
+    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();
     }
   }
-  
+
   public Response updateVnfm(VnfmRegisterInfo vnfm, String vnfmId) {
-    //TODO
-    return Response.ok().build();
+    CommonRegisterResponse result = new CommonRegisterResponse();
+    EsrVnfmDetail esrVnfmDetail = new EsrVnfmDetail();
+    EsrVnfmDetail originalEsrVnfmDetail = new EsrVnfmDetail();
+    EsrSystemInfo originalEsrSystemInfo = new EsrSystemInfo();
+    originalEsrVnfmDetail = queryEsrVnfmDetail(vnfmId);
+    esrVnfmDetail = vnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfm);
+    String resourceVersion = getResourceVersion(vnfmId);
+    esrVnfmDetail.setResourceVersion(resourceVersion);
+    esrVnfmDetail.setVnfmId(vnfmId);
+    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 (Exception e) {
+      e.printStackTrace();
+      LOG.error("Update VNFM failed !" + e.getMessage());
+      return Response.serverError().build();
+    }
   }
-  
+
   public Response queryVnfmList() {
     ArrayList<VnfmRegisterInfo> vnfmList = new ArrayList<VnfmRegisterInfo>();
     EsrVnfmList esrVnfm = new EsrVnfmList();
     try {
       String esrVnfmStr = ExternalSystemProxy.queryVnfmList();
       esrVnfm = new Gson().fromJson(esrVnfmStr, EsrVnfmList.class);
+      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();
     }
-    
   }
-  
+
   public Response queryVnfmById(String vnfmId) {
     VnfmRegisterInfo vnfm = new VnfmRegisterInfo();
     vnfm = queryVnfmDetail(vnfmId);
     if (vnfm != null) {
       return Response.ok(vnfm).build();
     } else {
-      return Response.serverError().build();
+      return Response.ok().build();
     }
   }
-  
+
   public Response delVnfm(String vnfmId) {
-    //TODO
-    return Response.noContent().build();
+    String resourceVersion = getResourceVersion(vnfmId);
+    if (resourceVersion != null) {
+      try {
+        ExternalSystemProxy.deleteVnfm(vnfmId, resourceVersion);
+        return Response.noContent().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();
+    }
   }
-  
+
   private VnfmRegisterInfo queryVnfmDetail(String vnfmId) {
     VnfmRegisterInfo vnfm = new VnfmRegisterInfo();
     EsrVnfmDetail esrVnfmDetail = new EsrVnfmDetail();
@@ -102,24 +142,48 @@ 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);
+      vnfm = vnfmManagerUtil.esrVnfm2VnfmRegisterInfo(esrVnfmDetail);
       return vnfm;
     } catch (Exception e) {
+      e.printStackTrace();
       LOG.error("Query VNFM detail failed! VNFM ID: " + vnfmId, e.getMessage());
       return null;
     }
   }
-  
+
   private ArrayList<VnfmRegisterInfo> getVnfmDetailList(EsrVnfmList esrVnfm) {
     ArrayList<VnfmRegisterInfo> vnfmInfoList = new ArrayList<VnfmRegisterInfo>();
     VnfmRegisterInfo vnfmInfo = new VnfmRegisterInfo();
-    for (int i=0; i<esrVnfm.getEsrVnfm().size(); i++) {
+    for (int i = 0; i < esrVnfm.getEsrVnfm().size(); i++) {
       String vnfmId = esrVnfm.getEsrVnfm().get(i).getVnfmId();
       vnfmInfo = queryVnfmDetail(vnfmId);
-      if(vnfmInfo != null) {
+      if (vnfmInfo != null) {
         vnfmInfoList.add(vnfmInfo);
       }
     }
     return vnfmInfoList;
   }
+  
+  private String getResourceVersion (String vnfmId) {
+    EsrVnfmDetail esrVnfmDetail = new EsrVnfmDetail();
+    String resourceVersion = null;
+    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 (Exception e) {
+      e.printStackTrace();
+      LOG.error("Query VNFM detail failed! VNFM ID: " + vnfmId, e.getMessage());
+    }
+    return esrVnfmDetail;
+  }
 }