diff options
Diffstat (limited to 'nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org')
2 files changed, 3 insertions, 10 deletions
diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/aai/impl/AaiMgmrInfImplTest.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/aai/impl/AaiMgmrInfImplTest.java index 3a2ca761..01c256bd 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/aai/impl/AaiMgmrInfImplTest.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/aai/impl/AaiMgmrInfImplTest.java @@ -56,7 +56,7 @@ public class AaiMgmrInfImplTest { + "\"vim-id\":\"vim-id_001\"," + "\"certificate-url\":\"certificate-url_001\"," + "\"resource-version\":\"resource-version_001\"," - + "\"esr-system-info-list\":[{\"ip-address\" : \"1.3.5.6\"}]" + + "\"esr-system-info\":[{\"type\" : \"vnfm\"}]" + "}" + ""; HttpResult httpResult = new HttpResult(); @@ -69,6 +69,6 @@ public class AaiMgmrInfImplTest { public void testQueryVnfPackage() throws ClientProtocolException, IOException { AaiVnfmInfo vnfmInfo = aaiMgmr.queryVnfm(vnfmId); - Assert.assertEquals("1.3.5.6", vnfmInfo.getEsrSystemInfoList().get(0).getIp()); + Assert.assertEquals("vnfm", vnfmInfo.getEsrSystemInfoList().get(0).getType()); } } diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/VnfmDriverMgmrImplTest.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/VnfmDriverMgmrImplTest.java index 3948638c..d7834465 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/VnfmDriverMgmrImplTest.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/VnfmDriverMgmrImplTest.java @@ -105,16 +105,9 @@ public class VnfmDriverMgmrImplTest { cbamHttpHead = protocol + "://" + ip + ":" + port; EsrSystemInfo esrSystemInfo = new EsrSystemInfo(); - esrSystemInfo.setProtocal(protocol); - esrSystemInfo.setIp(ip); - esrSystemInfo.setPort(port); - esrSystemInfo.setCloudDomain("cloudDomain"); - esrSystemInfo.setDefaultTenant("defaultTenant"); esrSystemInfo.setEsrSystemId("esrSystemId"); esrSystemInfo.setPassword("password"); - esrSystemInfo.setServiceUrl("serviceUrl"); - esrSystemInfo.setSslCacert("sslCacert"); - esrSystemInfo.setSslInsecure("sslInsecure"); + esrSystemInfo.setServiceUrl(cbamHttpHead); esrSystemInfo.setType("type"); esrSystemInfo.setUserName("userName"); esrSystemInfo.setVendor("vendor"); |