Change method objectToString to un-static.

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

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 2a4174a..47fa95c 100644 (file)
--- 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
@@ -25,6 +25,8 @@ import org.onap.aai.esr.entity.aai.EsrSystemInfo;
 import org.onap.aai.esr.entity.rest.VimRegisterInfo;
 import org.onap.aai.esr.entity.rest.VimRegisterResponse;
 import org.onap.aai.esr.externalservice.aai.CloudRegionProxy;
+import org.onap.aai.esr.externalservice.cloud.Tenant;
+import org.onap.aai.esr.externalservice.cloud.VimManagerProxy;
 import org.onap.aai.esr.util.ExtsysUtil;
 import org.onap.aai.esr.util.VimManagerUtil;
 import org.slf4j.Logger;
@@ -38,6 +40,7 @@ public class VimManagerWrapper {
   private static VimManagerWrapper vimManagerWrapper;
   private static final Logger LOG = LoggerFactory.getLogger(VimManagerWrapper.class);
   private static VimManagerUtil vimManagerUtil = new VimManagerUtil();
+  private static ExtsysUtil extsysUtil = new ExtsysUtil();
 
   /**
    * get VimManagerWrapper instance.
@@ -54,7 +57,7 @@ public class VimManagerWrapper {
 
   public Response registerVim(VimRegisterInfo vimRegisterInfo) {
     LOG.info(
-        "Start register VIM, input VIM info is: " + ExtsysUtil.objectToString(vimRegisterInfo));
+        "Start register VIM, input VIM info is: " + extsysUtil.objectToString(vimRegisterInfo));
     CloudRegionDetail cloudRegion = new CloudRegionDetail();
     VimRegisterResponse result = new VimRegisterResponse();
     cloudRegion = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo);
@@ -64,6 +67,14 @@ public class VimManagerWrapper {
       CloudRegionProxy.registerVim(cloudOwner, cloudRegionId, cloudRegion);
       result.setCloudOwner(cloudOwner);
       result.setCloudRegionId(cloudRegionId);
+      Tenant tenant = new Tenant();
+      tenant.setDefaultTenant(cloudRegion.getEsrSystemInfoList().getEsrSystemInfo().get(0).getDefaultTenant());
+      try {
+        VimManagerProxy.updateVim(cloudOwner, cloudRegionId, tenant);
+      } catch (Exception e) {
+        e.printStackTrace();
+        LOG.error("Update VIM by Multi-cloud failed !" + e.getMessage());
+      }
       return Response.ok(result).build();
     } catch (Exception error) {
       error.printStackTrace();
@@ -73,7 +84,7 @@ public class VimManagerWrapper {
   }
 
   public Response updateVim(String cloudOwner, String cloudRegionId,VimRegisterInfo vimRegisterInfo) {
-    LOG.info("Start update VIM, input VIM info is: " + ExtsysUtil.objectToString(vimRegisterInfo));
+    LOG.info("Start update VIM, input VIM info is: " + extsysUtil.objectToString(vimRegisterInfo));
     CloudRegionDetail cloudRegionDetail = new CloudRegionDetail();
     VimRegisterResponse result = new VimRegisterResponse();