Fix the issue when call the Multicloud API.

Change-Id: Ia8d6f3f0f8a7989b227fe4fea3fd9c23228a06a6
Issue-ID: AAI-436
Signed-off-by: lizi <li.zi30@zte.com.cn>

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/cloud/VimManagerProxy.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/cloud/VimManagerProxy.java
index 0c5d678..a976937 100644 (file)
--- a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/cloud/VimManagerProxy.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/cloud/VimManagerProxy.java
@@ -27,7 +27,7 @@ public class VimManagerProxy {
       Tenant tenant) throws ExtsysException {
     ClientConfig config = new ClientConfig(new VimUpdateProvider());
     IVimManage updateVimServiceproxy = ConsumerFactory
       Tenant tenant) throws ExtsysException {
     ClientConfig config = new ClientConfig(new VimUpdateProvider());
     IVimManage updateVimServiceproxy = ConsumerFactory

-        .createConsumer(MsbConfig.getCloudInfrastructureAddr(), config, IVimManage.class);
+        .createConsumer(MsbConfig.getMultiCloudAddr(), config, IVimManage.class);

     try {
       updateVimServiceproxy.updateVIM(cloudOwner, cloudRegionId, tenant);
     } catch (Exception e) {
     try {
       updateVimServiceproxy.updateVIM(cloudOwner, cloudRegionId, tenant);
     } catch (Exception e) {

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 ae975ac..6c4c5af 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
@@ -78,7 +78,6 @@ public class VimManagerWrapper {
         VimManagerProxy.updateVim(cloudOwner, cloudRegionId, tenant);
       } catch (ExtsysException e) {
         LOG.error("Update VIM by Multi-cloud failed !", e);
         VimManagerProxy.updateVim(cloudOwner, cloudRegionId, tenant);
       } catch (ExtsysException e) {
         LOG.error("Update VIM by Multi-cloud failed !", e);

-        throw ExceptionUtil.buildExceptionResponse(e.getMessage());

       }
       return Response.ok(result).build();
     } catch (ExtsysException error) {
       }
       return Response.ok(result).build();
     } catch (ExtsysException error) {