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;fp=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Fexternalservice%2Faai%2FExternalSystemProxy.java;h=caec4bc4fcfff5b853e133272a8897a8cbd9141f;hp=ae8a5012ce91bd0c57c754e606ff3c682c718f0c;hb=a9c5b27687df9f1d72c58fa64899b6783f6aef5a;hpb=0d6ba27cdb051f6883687ace5d4d5f4b77ff0a85

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 ae8a501..caec4bc 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
@@ -38,7 +38,7 @@ public class ExternalSystemProxy {
     
     public static IsTest test = new IsTest(false);
 
-    public static void registerVnfm(String vnfmId, EsrVnfmDetail esrVnfmDetail) throws ExtsysException {
+    public void registerVnfm(String vnfmId, EsrVnfmDetail esrVnfmDetail) throws ExtsysException {
         if (!test.getIsTest()){
             ClientConfig config = new ClientConfig(new VnfmRegisterProvider());
             IExternalSystem registerVnfmServiceproxy =
@@ -51,7 +51,7 @@ public class ExternalSystemProxy {
         }
     }
 
-    public static String queryVnfmDetail(String vnfmId) throws ExtsysException {
+    public String queryVnfmDetail(String vnfmId) throws ExtsysException {
         if (test.getIsTest()) {
             String esrVnfmDetailStr = "{\"vnfm-id\":\"123456\",\"vim-id\":\"987654\","
                     + "\"certificate-url\":\"http://ip:5000/v3\",\"esr-system-info-list\":{"
@@ -68,7 +68,7 @@ public class ExternalSystemProxy {
         }
     }
 
-    public static String queryVnfmList() throws ExtsysException {
+    public String queryVnfmList() throws ExtsysException {
         if (test.getIsTest()) {
             String vnfmListStr = "{\"esr-vnfm\": [{\"vnfm-id\": \"123456\",\"vim-id\": \"987654\","
                     + "\"certificate-url\": \"http://ip:5000/v3\",\"resource-version\": \"1\"}]}";
@@ -81,7 +81,7 @@ public class ExternalSystemProxy {
         }
     }
 
-    public static void deleteVnfm(String vnfmId, String resourceVersion) throws ExtsysException {
+    public void deleteVnfm(String vnfmId, String resourceVersion) throws ExtsysException {
         if (!test.getIsTest()) {
             try {
                 externalSystemproxy.deleteVNFM(transactionId, fromAppId, authorization, vnfmId, resourceVersion);
@@ -91,7 +91,7 @@ public class ExternalSystemProxy {
         }
     }
 
-    public static void registerSdnc(String thirdpartySdncId, EsrThirdpartySdncDetail esrSdncDetail)
+    public void registerSdnc(String thirdpartySdncId, EsrThirdpartySdncDetail esrSdncDetail)
             throws ExtsysException {
         if (!test.getIsTest()) {
             ClientConfig config = new ClientConfig(new ThirdpartySdncRegisterProvider());
@@ -106,7 +106,7 @@ public class ExternalSystemProxy {
         }
     }
 
-    public static String queryThirdpartySdncDetail(String thirdpartySdncId) throws ExtsysException {
+    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\":"
@@ -124,7 +124,7 @@ public class ExternalSystemProxy {
         }
     }
 
-    public static String querySdncList() throws ExtsysException {
+    public String querySdncList() throws ExtsysException {
         if (test.getIsTest()) {
             String sdncList =
                     "{\"esr-thirdparty-sdnc\": [{\"thirdparty-sdnc-id\": \"123456\",\"location\": \"edge\","
@@ -138,7 +138,7 @@ public class ExternalSystemProxy {
         }
     }
 
-    public static void deleteThirdpartySdnc(String sdncId, String resourceVersion) throws ExtsysException {
+    public void deleteThirdpartySdnc(String sdncId, String resourceVersion) throws ExtsysException {
         if (!test.getIsTest()) {
             try {
                 externalSystemproxy.deleteThirdpartySdnc(transactionId, fromAppId, authorization, sdncId,
@@ -149,7 +149,7 @@ public class ExternalSystemProxy {
         }
     }
 
-    public static void registerEms(String emsId, EsrEmsDetail emsDetail) throws ExtsysException {
+    public void registerEms(String emsId, EsrEmsDetail emsDetail) throws ExtsysException {
         if (!test.getIsTest()) {
             ClientConfig config = new ClientConfig(new EmsRegisterProvider());
             IExternalSystem registerEmsServiceproxy =
@@ -162,7 +162,7 @@ public class ExternalSystemProxy {
         }
     }
 
-    public static String queryEmsDetail(String emsId) throws ExtsysException {
+    public String queryEmsDetail(String emsId) throws ExtsysException {
         if (test.getIsTest()) {
             String emsDetailStr = "{\"ems-id\":\"123456\",\"esr-system-info-list\":{\"esr-system-info\":"
                     + "[{\"esr-system-info-id\":\"234567\",\"system-name\":\"EMS_TEST\",\"type\":\"sftp\","
@@ -185,7 +185,7 @@ public class ExternalSystemProxy {
         }
     }
 
-    public static String queryEmsList() throws ExtsysException {
+    public String queryEmsList() throws ExtsysException {
         if (test.getIsTest()) {
             return "{\"esr-ems\": [ {\"ems-id\": \"123456\",\"resource-version\": \"1\"}]}";
         }
@@ -196,7 +196,7 @@ public class ExternalSystemProxy {
         }
     }
 
-    public static void deleteEms(String emsId, String resourceVersion) throws ExtsysException {
+    public void deleteEms(String emsId, String resourceVersion) throws ExtsysException {
         if (!test.getIsTest()) {
             try {
                 externalSystemproxy.deleteEMS(transactionId, fromAppId, authorization, emsId, resourceVersion);