X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Fwrapper%2FEmsManagerWrapper.java;h=e6e0f698c3b51a77fcfc0608516307d38c05e4c5;hb=22a43294c389a413b7d8d372a6d267ea054b4e22;hp=9d131651e9e798dd9c77e26efdc5daf56ac70548;hpb=c62f4b64bdd6a26cd8d78406e4bcf8ab907384a1;p=aai%2Fesr-server.git

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java
index 9d13165..e6e0f69 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java
@@ -24,6 +24,7 @@ import org.onap.aai.esr.externalservice.aai.ExternalSystemProxy;
 import org.onap.aai.esr.util.EmsManagerUtil;
 import org.onap.aai.esr.entity.aai.EsrEmsDetail;
 import org.onap.aai.esr.entity.aai.EsrEmsList;
+import org.onap.aai.esr.entity.aai.EsrSystemInfo;
 import org.onap.aai.esr.entity.rest.CommonRegisterResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -33,6 +34,7 @@ import com.google.gson.Gson;
 public class EmsManagerWrapper {
   private static EmsManagerWrapper emsManagerWrapper;
   private static final Logger LOG = LoggerFactory.getLogger(EmsManagerWrapper.class);
+  private static EmsManagerUtil emsManagerUtil = new EmsManagerUtil();
 
   /**
    * get VnfmManagerWrapper instance.
@@ -48,7 +50,7 @@ public class EmsManagerWrapper {
   public Response registerEms(EmsRegisterInfo emsRegisterInfo) {
     CommonRegisterResponse result = new CommonRegisterResponse();
     EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
-    esrEmsDetail = EmsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo);
+    esrEmsDetail = emsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo);
     String emsId = esrEmsDetail.getEmsId();
     try {
       ExternalSystemProxy.registerEms(emsId, esrEmsDetail);
@@ -61,9 +63,19 @@ public class EmsManagerWrapper {
     }
   }
 
-  public Response updateEms(EmsRegisterInfo ems) {
-    //TODO
-    return Response.ok().build();
+  public Response updateEms(EmsRegisterInfo emsRegisterInfo, String emsId) {
+    CommonRegisterResponse result = new CommonRegisterResponse();
+    EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
+    esrEmsDetail = getNewEsrEmsDetail(emsRegisterInfo, emsId);
+    try {
+      ExternalSystemProxy.registerEms(emsId, esrEmsDetail);
+      result.setId(emsId);
+      return Response.ok(result).build();
+    } catch (Exception e) {
+      e.printStackTrace();
+      LOG.error("Update VNFM failed !" + e.getMessage());
+      return Response.serverError().build();
+    }
   }
   
   public Response queryEmsList() {
@@ -93,8 +105,23 @@ public class EmsManagerWrapper {
   }
   
   public Response delEms(String emsId) {
-    //TODO
-    return Response.noContent().build();
+    EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
+    esrEmsDetail = queryEsrEmsDetail(emsId);
+    String resourceVersion = esrEmsDetail.getResourceVersion();
+    if (resourceVersion != null) {
+      try {
+        ExternalSystemProxy.deleteEms(emsId, resourceVersion);
+        return Response.noContent().build();
+      } catch (Exception e) {
+        e.printStackTrace();
+        LOG.error("Delete EMS from A&AI failed! EMS ID: " + emsId + "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 EmsRegisterInfo queryEmsDetail(String emsId) {
@@ -104,7 +131,7 @@ public class EmsManagerWrapper {
       String esrEmsStr = ExternalSystemProxy.queryEmsDetail(emsId);
       LOG.info("Response from AAI by query EMS: " + esrEmsStr);
       esrEmsDetail = new Gson().fromJson(esrEmsStr, EsrEmsDetail.class);
-      emsRegisterInfo = EmsManagerUtil.EsrEms2EmsRegisterInfo(esrEmsDetail);
+      emsRegisterInfo = emsManagerUtil.EsrEms2EmsRegisterInfo(esrEmsDetail);
       return emsRegisterInfo;
     } catch (Exception e) {
       e.printStackTrace();
@@ -125,4 +152,48 @@ public class EmsManagerWrapper {
     }
     return emsInfoList;
   }
+  
+  private EsrEmsDetail queryEsrEmsDetail (String emsId) {
+    EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
+    try {
+      String esrEmsStr = ExternalSystemProxy.queryEmsDetail(emsId);
+      LOG.info("Response from AAI by query EMS: " + esrEmsStr);
+      esrEmsDetail = new Gson().fromJson(esrEmsStr, EsrEmsDetail.class);
+    } catch (Exception e) {
+      e.printStackTrace();
+      LOG.error("Query EMS detail failed! EMS ID: " + emsId, e.getMessage());
+    }
+    return esrEmsDetail;
+  }
+  
+  private EsrEmsDetail getNewEsrEmsDetail(EmsRegisterInfo emsRegisterInfo, String emsId) {
+    EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
+    ArrayList<EsrSystemInfo> newEsrSysInfoList = new ArrayList<EsrSystemInfo>();
+    EsrSystemInfo newEsrSystemInfo = new EsrSystemInfo();
+    EsrEmsDetail oriEsrEmsDetail = new EsrEmsDetail();
+    ArrayList<EsrSystemInfo> oriEsrSysInfoList = new ArrayList<EsrSystemInfo>();
+    EsrSystemInfo originalEsrSystemInfo = new EsrSystemInfo();
+    
+    oriEsrEmsDetail = queryEsrEmsDetail(emsId);
+    esrEmsDetail = emsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo);
+    String emsResourceVersion = oriEsrEmsDetail.getResourceVersion();
+    esrEmsDetail.setResourceVersion(emsResourceVersion);
+    esrEmsDetail.setEmsId(emsId);
+    newEsrSysInfoList = esrEmsDetail.getEsrSystemInfoList().getEsrSystemInfo();
+    oriEsrSysInfoList = oriEsrEmsDetail.getEsrSystemInfoList().getEsrSystemInfo();
+    for (int i = 0; i < oriEsrSysInfoList.size(); i++) {
+      originalEsrSystemInfo = oriEsrSysInfoList.get(i);
+      for (int j = 0; j < newEsrSysInfoList.size(); j++) {
+        newEsrSystemInfo = newEsrSysInfoList.get(j);
+        if (originalEsrSystemInfo.getSystemType().equals(newEsrSystemInfo.getSystemType())) {
+          esrEmsDetail.getEsrSystemInfoList().getEsrSystemInfo().get(j)
+              .setResouceVersion(originalEsrSystemInfo.getResouceVersion());
+          esrEmsDetail.getEsrSystemInfoList().getEsrSystemInfo().get(j)
+              .setEsrSystemInfoId(originalEsrSystemInfo.getEsrSystemInfoId());
+          break;
+        }
+      }
+    }
+    return esrEmsDetail;
+  }
 }