Change the unit test about EMS with mock.

[aai/esr-server.git] / esr-mgr / src / main / java / org / onap / aai / esr / externalservice / aai / ExternalSystemProxy.java

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 2e19f7d..50a4950 100644 (file)
--- 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
@@ -16,6 +16,7 @@
 package org.onap.aai.esr.externalservice.aai;
 
 import org.glassfish.jersey.client.ClientConfig;
+import org.onap.aai.esr.common.IsTest;
 import org.onap.aai.esr.common.MsbConfig;
 import org.onap.aai.esr.entity.aai.EsrEmsDetail;
 import org.onap.aai.esr.entity.aai.EsrThirdpartySdncDetail;
@@ -25,7 +26,6 @@ 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";
@@ -35,32 +35,21 @@ public class ExternalSystemProxy {
         externalSystemproxy =
                 ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
     }
+    
+    public static IsTest test = new IsTest(false);
 
-    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 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 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;
-        }
+    public String queryVnfmDetail(String vnfmId) throws ExtsysException {
         try {
             return externalSystemproxy.queryVNFMDetail(transactionId, fromAppId, authorization, vnfmId);
         } catch (Exception e) {
@@ -68,12 +57,7 @@ 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;
-        }
+    public String queryVnfmList() throws ExtsysException {
         try {
             return externalSystemproxy.queryVNFMList(transactionId, fromAppId, authorization);
         } catch (Exception e) {
@@ -81,19 +65,17 @@ public class ExternalSystemProxy {
         }
     }
 
-    public static void deleteVnfm(String vnfmId, String resourceVersion) throws ExtsysException {
-        if (!isTest) {
-            try {
-                externalSystemproxy.deleteVNFM(transactionId, fromAppId, authorization, vnfmId, resourceVersion);
-            } catch (Exception e) {
-                throw new ExtsysException("Delete VNFM from A&AI failed.", e);
-            }
+    public 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);
         }
     }
 
-    public static void registerSdnc(String thirdpartySdncId, EsrThirdpartySdncDetail esrSdncDetail)
+    public void registerSdnc(String thirdpartySdncId, EsrThirdpartySdncDetail esrSdncDetail)
             throws ExtsysException {
-        if (!isTest) {
+        if (!test.getIsTest()) {
             ClientConfig config = new ClientConfig(new ThirdpartySdncRegisterProvider());
             IExternalSystem registerSdncServiceproxy =
                     ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
@@ -106,13 +88,13 @@ public class ExternalSystemProxy {
         }
     }
 
-    public static String queryThirdpartySdncDetail(String thirdpartySdncId) throws ExtsysException {
-        if (isTest) {
-            String sdncDetail = "{\"thirdparty-sdnc-id\":\"123456\"," + "\"location\":\"edge\","
-                    + "\"product-name\":\"thirdparty SDNC\"," + "\"esr-system-info-list\":{" + "\"esr-system-info\":"
-                    + "[{\"esr-system-info-id\":\"987654\"," + "\"system-name\":\"SDNC_TEST\"," + "\"type\":\"SDNC\","
-                    + "\"vendor\":\"zte\"," + "\"version\":\"v1\"," + "\"service-url\":\"http://127.0.0.1:8000\","
-                    + "\"user-name\":\"nancy\"," + "\"password\":\"123987\"," + "\"system-type\":\"thirdparty_SDNC\","
+    public String queryThirdpartySdncDetail(String thirdpartySdncId) throws ExtsysException {
+        if (test.getIsTest()) {
+            String sdncDetail = "{\"thirdparty-sdnc-id\":\"123456\",\"location\":\"edge\","
+                    + "\"product-name\":\"thirdparty SDNC\",\"esr-system-info-list\":{\"esr-system-info\":"
+                    + "[{\"esr-system-info-id\":\"987654\",\"system-name\":\"SDNC_TEST\",\"type\":\"SDNC\","
+                    + "\"vendor\":\"zte\",\"version\":\"v1\",\"service-url\":\"http://ip:8000\","
+                    + "\"user-name\":\"nancy\",\"password\":\"123987\",\"system-type\":\"thirdparty_SDNC\","
                     + "\"protocol\":\"protocol\"}]}}";
             return sdncDetail;
         }
@@ -124,11 +106,11 @@ public class ExternalSystemProxy {
         }
     }
 
-    public static String querySdncList() throws ExtsysException {
-        if (isTest) {
+    public String querySdncList() throws ExtsysException {
+        if (test.getIsTest()) {
             String sdncList =
-                    "{\"esr-thirdparty-sdnc\": " + "[{\"thirdparty-sdnc-id\": \"123456\"," + "\"location\": \"edge\","
-                            + "\"product-name\": \"thirdparty SDNC\"," + "\"resource-version\": \"1\"}]}";
+                    "{\"esr-thirdparty-sdnc\": [{\"thirdparty-sdnc-id\": \"123456\",\"location\": \"edge\","
+                            + "\"product-name\": \"thirdparty SDNC\",\"resource-version\": \"1\"}]}";
             return sdncList;
         }
         try {
@@ -138,8 +120,8 @@ public class ExternalSystemProxy {
         }
     }
 
-    public static void deleteThirdpartySdnc(String sdncId, String resourceVersion) throws ExtsysException {
-        if (!isTest) {
+    public void deleteThirdpartySdnc(String sdncId, String resourceVersion) throws ExtsysException {
+        if (!test.getIsTest()) {
             try {
                 externalSystemproxy.deleteThirdpartySdnc(transactionId, fromAppId, authorization, sdncId,
                         resourceVersion);
@@ -149,35 +131,18 @@ public class ExternalSystemProxy {
         }
     }
 
-    public static void registerEms(String emsId, EsrEmsDetail emsDetail) throws ExtsysException {
-        if (!isTest) {
-            ClientConfig config = new ClientConfig(new EmsRegisterProvider());
-            IExternalSystem registerEmsServiceproxy =
-                    ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
-            try {
-                registerEmsServiceproxy.registerEMS(transactionId, fromAppId, authorization, emsId, emsDetail);
-            } catch (Exception e) {
-                throw new ExtsysException("PUT EMS to A&AI failed.", e);
-            }
+    public void registerEms(String emsId, EsrEmsDetail emsDetail) throws ExtsysException {
+        ClientConfig config = new ClientConfig(new EmsRegisterProvider());
+        IExternalSystem registerEmsServiceproxy =
+                ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
+        try {
+            registerEmsServiceproxy.registerEMS(transactionId, fromAppId, authorization, emsId, emsDetail);
+        } catch (Exception e) {
+            throw new ExtsysException("PUT EMS to A&AI failed.", e);
         }
     }
 
-    public static String queryEmsDetail(String emsId) throws ExtsysException {
-        if (isTest) {
-            String emsDetailStr = "{\"ems-id\":\"123456\"," + "\"esr-system-info-list\":" + "{\"esr-system-info\":"
-                    + "[{\"esr-system-info-id\":\"234567\"," + "\"system-name\":\"EMS_TEST\"," + "\"type\":\"sftp\","
-                    + "\"vendor\":\"ZTE\"," + "\"version\":\"V1\"," + "\"user-name\":\"nancy\"," + "\"password\":\"asdf\","
-                    + "\"system-type\":\"EMS_RESOUCE\"," + "\"ip-address\":\"127.0.0.1\"," + "\"port\":\"5000\","
-                    + "\"passive\":true," + "\"remote-path\":\"/home/per\"}," + "{\"esr-system-info-id\":\"345678\","
-                    + "\"system-name\":\"EMS_TEST\"," + "\"type\":\"sftp\"," + "\"vendor\":\"ZTE\"," + "\"version\":\"V1\","
-                    + "\"user-name\":\"nancy\"," + "\"password\":\"asdf\"," + "\"system-type\":\"EMS_PERFORMANCE\","
-                    + "\"ip-address\":\"127.0.0.1\"," + "\"port\":\"5000\"," + "\"passive\":true,"
-                    + "\"remote-path\":\"/home/per\"}," + "{\"esr-system-info-id\":\"456789\","
-                    + "\"system-name\":\"EMS_TEST\"," + "\"vendor\":\"ZTE\"," + "\"version\":\"V1\","
-                    + "\"user-name\":\"nancy\"," + "\"password\":\"987654\"," + "\"system-type\":\"EMS_ALARM\","
-                    + "\"ip-address\":\"127.0.0.1\"," + "\"port\":\"5000\"}]}}";
-            return emsDetailStr;
-        }
+    public String queryEmsDetail(String emsId) throws ExtsysException {
         try {
             return externalSystemproxy.queryEMSDetail(transactionId, fromAppId, authorization, emsId);
         } catch (Exception e) {
@@ -185,10 +150,7 @@ public class ExternalSystemProxy {
         }
     }
 
-    public static String queryEmsList() throws ExtsysException {
-        if (isTest) {
-            return "{\"esr-ems\": [ {\"ems-id\": \"123456\",\"resource-version\": \"1\"}]}";
-        }
+    public String queryEmsList() throws ExtsysException {
         try {
             return externalSystemproxy.queryEMSList(transactionId, fromAppId, authorization);
         } catch (Exception e) {
@@ -196,13 +158,11 @@ public class ExternalSystemProxy {
         }
     }
 
-    public static void deleteEms(String emsId, String resourceVersion) throws ExtsysException {
-        if (!isTest) {
-            try {
-                externalSystemproxy.deleteEMS(transactionId, fromAppId, authorization, emsId, resourceVersion);
-            } catch (Exception e) {
-                throw new ExtsysException("Delete EMS from A&AI failed.", e);
-            }
+    public void deleteEms(String emsId, String resourceVersion) throws ExtsysException {
+        try {
+            externalSystemproxy.deleteEMS(transactionId, fromAppId, authorization, emsId, resourceVersion);
+        } catch (Exception e) {
+            throw new ExtsysException("Delete EMS from A&AI failed.", e);
         }
     }
 }