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%2FVimManagerWrapper.java;fp=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Fwrapper%2FVimManagerWrapper.java;h=2a4174ae1f45e11346c9c728e7aa383922f0c4a1;hp=bdf47057e2db6d0f4c88f1f7c1ac75728e45db44;hb=07c89153d16b14bda54f16ef9f37e54bfc0a68f8;hpb=979f0fa70cbe576f8eed5e56db467b261a1919cf

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java
index bdf4705..2a4174a 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java
@@ -101,7 +101,7 @@ public class VimManagerWrapper {
     } catch (Exception error) {
       error.printStackTrace();
       LOG.error("Query vim list details failed !" + error.getMessage());
-      return Response.ok().build();
+      return Response.ok(vimRegisterInfos).build();
     }
 
   }
@@ -117,7 +117,7 @@ public class VimManagerWrapper {
       return Response.ok(vim).build();
     } catch (Exception e) {
       e.printStackTrace();
-      return Response.serverError().build();
+      return Response.ok(vim).build();
     }
 
   }
@@ -183,7 +183,38 @@ public class VimManagerWrapper {
   }
 
   public Response delVim(String cloudOwner, String cloudRegionId) {
-    // TODO
-    return Response.noContent().build();
+    CloudRegionDetail cloudRegionDetail = new CloudRegionDetail();
+    cloudRegionDetail = queryCloudRegionDetail(cloudOwner, cloudRegionId);
+    String resourceVersion = cloudRegionDetail.getResourceVersion();
+    if (resourceVersion != null) {
+      try {
+        CloudRegionProxy.deleteVim(cloudOwner, cloudRegionId, resourceVersion);
+        return Response.noContent().build();
+      } catch (Exception e) {
+        e.printStackTrace();
+        LOG.error(
+            "Delete cloud region from A&AI failed! cloud-owner = " + cloudOwner
+                + ", cloud-region-id = " + cloudRegionId + "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 CloudRegionDetail queryCloudRegionDetail (String cloudOwner, String cloudRegionId) {
+    CloudRegionDetail cloudRegionDetail = new CloudRegionDetail();
+    try {
+      String cloudRegionStr = CloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId);
+      LOG.info("Response from AAI by query cloud region: " + cloudRegionStr);
+      cloudRegionDetail = new Gson().fromJson(cloudRegionStr, CloudRegionDetail.class);
+    } catch (Exception e) {
+      e.printStackTrace();
+      LOG.error("Query EMS detail failed! cloud-owner = " + cloudOwner
+                + ", cloud-region-id = " + cloudRegionId , e.getMessage());
+    }
+    return cloudRegionDetail;
   }
 }