X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fesr-server.git;a=blobdiff_plain;f=esr-mgr%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Fwrapper%2FVnfmManagerWrapperTest.java;h=575391bfa27a90bfbfd2108598821a71e43f6afa;hp=1e2abedbdf83745f55e0325ef6046388a8ab481a;hb=41d59ecbd847f49c30d33941289c69ad5e2a1c62;hpb=486ed42762fedbc7cd0cc43704389ed41434eacd

diff --git a/esr-mgr/src/test/java/org/onap/aai/esr/wrapper/VnfmManagerWrapperTest.java b/esr-mgr/src/test/java/org/onap/aai/esr/wrapper/VnfmManagerWrapperTest.java
index 1e2abed..575391b 100644
--- a/esr-mgr/src/test/java/org/onap/aai/esr/wrapper/VnfmManagerWrapperTest.java
+++ b/esr-mgr/src/test/java/org/onap/aai/esr/wrapper/VnfmManagerWrapperTest.java
@@ -24,6 +24,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.onap.aai.esr.common.IsTest;
 import org.onap.aai.esr.common.MsbConfig;
 import org.onap.aai.esr.entity.rest.VnfmRegisterInfo;
 import org.onap.aai.esr.externalservice.aai.ExternalSystemProxy;
@@ -38,12 +39,12 @@ public class VnfmManagerWrapperTest {
 
     @BeforeClass  
     public static void beforeClass() {  
-        ExternalSystemProxy.isTest = true;
+        ExternalSystemProxy.test = new IsTest(true);
     };  
     
     @AfterClass  
     public static void afterClass() {  
-        ExternalSystemProxy.isTest = false;
+        ExternalSystemProxy.test = new IsTest(false);
     };
     
     @Before
@@ -58,11 +59,11 @@ public class VnfmManagerWrapperTest {
         vnfmRegisterInfo.setVersion("v1");
         vnfmRegisterInfo.setVendor("zte");
         vnfmRegisterInfo.setUserName("onap");
-        vnfmRegisterInfo.setUrl("http://10.11.22.33:8000");
+        vnfmRegisterInfo.setUrl("http://ip:8000");
         vnfmRegisterInfo.setType("vnfm");
         vnfmRegisterInfo.setPassword("987654");
         vnfmRegisterInfo.setName("ONAP VNFM");
-        vnfmRegisterInfo.setCertificateUrl("http://11.22.33.44:5000/v3");
+        vnfmRegisterInfo.setCertificateUrl("http://ip:5000/v3");
         Response response = vnfmManagerWrapper.registerVnfm(vnfmRegisterInfo);
         if (response != null) {
             Assert.assertTrue(response.getStatus() == 200);
@@ -77,11 +78,11 @@ public class VnfmManagerWrapperTest {
         vnfmRegisterInfo.setVersion("v1");
         vnfmRegisterInfo.setVendor("zte");
         vnfmRegisterInfo.setUserName("onap");
-        vnfmRegisterInfo.setUrl("http://10.11.22.33:8000");
+        vnfmRegisterInfo.setUrl("http://ip:8000");
         vnfmRegisterInfo.setType("vnfm");
         vnfmRegisterInfo.setPassword("987654");
         vnfmRegisterInfo.setName("ONAP VNFM");
-        vnfmRegisterInfo.setCertificateUrl("http://11.22.33.44:5000/v3");
+        vnfmRegisterInfo.setCertificateUrl("http://ip:5000/v3");
         vnfmRegisterInfo.setVnfmId("123456");
         Response response = vnfmManagerWrapper.queryVnfmById("123456");
         if (response != null) {
@@ -99,11 +100,11 @@ public class VnfmManagerWrapperTest {
         vnfmRegisterInfo.setVersion("v1");
         vnfmRegisterInfo.setVendor("zte");
         vnfmRegisterInfo.setUserName("onap");
-        vnfmRegisterInfo.setUrl("http://10.11.22.33:8000");
+        vnfmRegisterInfo.setUrl("http://ip:8000");
         vnfmRegisterInfo.setType("vnfm");
         vnfmRegisterInfo.setPassword("987654");
         vnfmRegisterInfo.setName("ONAP VNFM");
-        vnfmRegisterInfo.setCertificateUrl("http://11.22.33.44:5000/v3");
+        vnfmRegisterInfo.setCertificateUrl("http://ip:5000/v3");
         vnfmRegisterInfo.setVnfmId("123456");
         vnfmList.add(vnfmRegisterInfo);
         Response response = vnfmManagerWrapper.queryVnfmList();
@@ -128,11 +129,11 @@ public class VnfmManagerWrapperTest {
         vnfmRegisterInfo.setVersion("v1");
         vnfmRegisterInfo.setVendor("zte");
         vnfmRegisterInfo.setUserName("onap");
-        vnfmRegisterInfo.setUrl("http://10.11.22.33:8000");
+        vnfmRegisterInfo.setUrl("http://ip:8000");
         vnfmRegisterInfo.setType("vnfm");
         vnfmRegisterInfo.setPassword("987654");
         vnfmRegisterInfo.setName("ONAP VNFM");
-        vnfmRegisterInfo.setCertificateUrl("http://11.22.33.44:5000/v3");
+        vnfmRegisterInfo.setCertificateUrl("http://ip:5000/v3");
         vnfmRegisterInfo.setVnfmId("123456");
         Response response = vnfmManagerWrapper.updateVnfm(vnfmRegisterInfo, "123456");
         if (response != null) {