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%2Fexternalservice%2Faai%2FExternalSystemProxy.java;h=6c34265151a7837c83d5c4517b2bd7d6b3caefac;hp=6fca0e63205881fb6986271f05c7f421270659f7;hb=3ca84f4c73c5996a2cc5d4372d70f1e7bce5cf0f;hpb=83c6e0c5f6214af24efc124ed6cf840e6ad59cc4

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ExternalSystemProxy.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ExternalSystemProxy.java
index 6fca0e6..6c34265 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ExternalSystemProxy.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ExternalSystemProxy.java
@@ -26,8 +26,8 @@ import com.eclipsesource.jaxrs.consumer.ConsumerFactory;
 
 public class ExternalSystemProxy {
 
+  public static boolean isTest = false;
   private static IExternalSystem externalSystemproxy;
-
   private static String transactionId = "9999";
   private static String fromAppId = "esr-server";
   private static String authorization = AaiCommon.getAuthenticationCredentials();
@@ -37,19 +37,41 @@ public class ExternalSystemProxy {
         config, IExternalSystem.class);
   }
 
-  public static void registerVnfm(String vnfmId, EsrVnfmDetail esrVnfmDetail) throws ExtsysException {
-    ClientConfig config = new ClientConfig(new VnfmRegisterProvider());
-    IExternalSystem registerVnfmServiceproxy = ConsumerFactory
-        .createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
-    try {
-      registerVnfmServiceproxy.registerVNFM(transactionId, fromAppId, authorization, vnfmId,
-          esrVnfmDetail);
-    } catch (Exception e) {
-      throw new ExtsysException("PUT VNFM to A&AI failed.", e);
+  public static void registerVnfm(String vnfmId, EsrVnfmDetail esrVnfmDetail)
+      throws ExtsysException {
+    if (isTest) {
+
+    } else {
+      ClientConfig config = new ClientConfig(new VnfmRegisterProvider());
+      IExternalSystem registerVnfmServiceproxy = ConsumerFactory
+          .createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
+      try {
+        registerVnfmServiceproxy.registerVNFM(transactionId, fromAppId, authorization, vnfmId,
+            esrVnfmDetail);
+      } catch (Exception e) {
+        throw new ExtsysException("PUT VNFM to A&AI failed.", e);
+      }
     }
   }
   
   public static String queryVnfmDetail(String vnfmId) throws ExtsysException {
+    if(isTest) {
+      String esrVnfmDetailStr = "{\"vnfm-id\":\"123456\","
+          + "\"vim-id\":\"987654\","
+          + "\"certificate-url\":\"http://11.22.33.44:5000/v3\","
+          + "\"esr-system-info-list\":{"
+          + "\"esr-system-info\":[{"
+          + "\"esr-system-info-id\":\"qwerty\","
+          + "\"system-name\":\"ONAP VNFM\","
+          + "\"type\":\"vnfm\","
+          + "\"vendor\":\"zte\","
+          + "\"version\":\"v1\","
+          + "\"service-url\":\"http://10.11.22.33:8000\","
+          + "\"user-name\":\"onap\","
+          + "\"password\":\"987654\","
+          + "\"system-type\":\"VNFM\"}]}}";
+      return esrVnfmDetailStr;
+    }
     try {
       return externalSystemproxy.queryVNFMDetail(transactionId, fromAppId, authorization, vnfmId);
     } catch (Exception e) {
@@ -58,6 +80,14 @@ public class ExternalSystemProxy {
   }
   
   public static String queryVnfmList() throws ExtsysException {
+    if(isTest) {
+      String vnfmListStr = "{\"esr-vnfm\": "
+          + "[{\"vnfm-id\": \"123456\","
+          + "\"vim-id\": \"987654\","
+          + "\"certificate-url\": \"http://11.22.33.44:5000/v3\","
+          + "\"resource-version\": \"1\"}]}";
+      return vnfmListStr;
+    }
     try {
       return externalSystemproxy.queryVNFMList(transactionId, fromAppId, authorization);
     } catch (Exception e) {
@@ -66,10 +96,12 @@ public class ExternalSystemProxy {
   }
   
   public static void deleteVnfm(String vnfmId, String resourceVersion) throws ExtsysException {
-    try {
-      externalSystemproxy.deleteVNFM(transactionId, fromAppId, authorization, vnfmId, resourceVersion);
-    } catch (Exception e) {
-      throw new ExtsysException("Delete VNFM from A&AI failed.", e);
+    if(!isTest) {
+      try {
+        externalSystemproxy.deleteVNFM(transactionId, fromAppId, authorization, vnfmId, resourceVersion);
+      } catch (Exception e) {
+        throw new ExtsysException("Delete VNFM from A&AI failed.", e);
+      }
     }
   }