X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Fexternalservice%2Faai%2FExternalSystemProxy.java;h=69d4e478ccc4468df8de37237e17262da91c3d97;hb=refs%2Fchanges%2F51%2F28751%2F1;hp=0361747572c6cecc6677210d44ca60d371ad9799;hpb=ed26992f976741031237ead3a5dc0565d4318b05;p=aai%2Fesr-server.git

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 0361747..69d4e47 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
@@ -37,9 +37,7 @@ public class ExternalSystemProxy {
     }
 
     public static void registerVnfm(String vnfmId, EsrVnfmDetail esrVnfmDetail) throws ExtsysException {
-        if (isTest) {
-
-        } else {
+        if (!isTest){
             ClientConfig config = new ClientConfig(new VnfmRegisterProvider());
             IExternalSystem registerVnfmServiceproxy =
                     ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
@@ -53,12 +51,12 @@ public class ExternalSystemProxy {
 
     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\"}]}}";
+            String esrVnfmDetailStr = "{\"vnfm-id\":\"123456\",\"vim-id\":\"987654\","
+                    + "\"certificate-url\":\"http://ip: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://ip:8000\",\"user-name\":\"onap\","
+                    + "\"password\":\"987654\",\"system-type\":\"VNFM\"}]}}";
             return esrVnfmDetailStr;
         }
         try {
@@ -70,8 +68,8 @@ 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\"}]}";
+            String vnfmListStr = "{\"esr-vnfm\": [{\"vnfm-id\": \"123456\",\"vim-id\": \"987654\","
+                    + "\"certificate-url\": \"http://ip:5000/v3\",\"resource-version\": \"1\"}]}";
             return vnfmListStr;
         }
         try {
@@ -108,11 +106,11 @@ 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\","
+            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;
         }
@@ -127,8 +125,8 @@ public class ExternalSystemProxy {
     public static String querySdncList() throws ExtsysException {
         if (isTest) {
             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 {
@@ -150,17 +148,34 @@ public class ExternalSystemProxy {
     }
 
     public static 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);
+        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 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\":\"ip\",\"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\":\"ip\",\"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\":\"ip\",\"port\":\"5000\"}]}}";
+            return emsDetailStr;
+        }
         try {
             return externalSystemproxy.queryEMSDetail(transactionId, fromAppId, authorization, emsId);
         } catch (Exception e) {
@@ -169,6 +184,9 @@ public class ExternalSystemProxy {
     }
 
     public static String queryEmsList() throws ExtsysException {
+        if (isTest) {
+            return "{\"esr-ems\": [ {\"ems-id\": \"123456\",\"resource-version\": \"1\"}]}";
+        }
         try {
             return externalSystemproxy.queryEMSList(transactionId, fromAppId, authorization);
         } catch (Exception e) {
@@ -177,10 +195,12 @@ public class ExternalSystemProxy {
     }
 
     public static 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);
+        if (!isTest) {
+            try {
+                externalSystemproxy.deleteEMS(transactionId, fromAppId, authorization, emsId, resourceVersion);
+            } catch (Exception e) {
+                throw new ExtsysException("Delete EMS from A&AI failed.", e);
+            }
         }
     }
 }