Change the static method in util.

[aai/esr-server.git] / esr-mgr / src / main / java / org / onap / aai / esr / wrapper / VnfmManagerWrapper.java

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..a0ca60d 100644 (file)
--- 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,6 +35,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.
    * 
@@ -49,7 +52,7 @@ 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);
@@ -63,8 +66,29 @@ public class VnfmManagerWrapper {
   }
 
   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() {
@@ -81,7 +105,6 @@ public class VnfmManagerWrapper {
       LOG.error("Query VNFM list failed !");
       return Response.serverError().build();
     }
-
   }
 
   public Response queryVnfmById(String vnfmId) {
@@ -90,25 +113,16 @@ public class VnfmManagerWrapper {
     if (vnfm != null) {
       return Response.ok(vnfm).build();
     } else {
-      return Response.serverError().build();
+      return Response.ok().build();
     }
   }
 
   public Response delVnfm(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());
-    }
-    if (esrVnfmDetail != null && esrVnfmDetail.getResourceVersion() != null) {
-      String resourceVersion = esrVnfmDetail.getResourceVersion();
+    String resourceVersion = getResourceVersion(vnfmId);
+    if (resourceVersion != null) {
       try {
         ExternalSystemProxy.deleteVnfm(vnfmId, resourceVersion);
-        return Response.ok().build();
+        return Response.noContent().build();
       } catch (Exception e) {
         e.printStackTrace();
         LOG.error("Delete VNFM from A&AI failed! VNFM ID: " + vnfmId + "resouce-version:"
@@ -128,7 +142,7 @@ 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();
@@ -149,4 +163,27 @@ public class VnfmManagerWrapper {
     }
     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;
+  }
 }