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=bfc9afd8e17887f2d1d251f6cb0973405ba94ced;hp=735e169f9d69fc63ea5b4c4170768471915c0b6b;hb=ed26992f976741031237ead3a5dc0565d4318b05;hpb=f73ad41f58f1f60d00d42a8bc5fc2502a46d62dd 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 735e169..bfc9afd 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 @@ -1,5 +1,5 @@ /** - * Copyright 2017 ZTE Corporation. + * Copyright 2018 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,9 @@ package org.onap.aai.esr.wrapper; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; import java.util.List; - import javax.ws.rs.core.Response; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -32,112 +29,112 @@ import org.onap.aai.esr.util.ExtsysUtil; public class VnfmManagerWrapperTest { - private static VnfmManagerWrapper vnfmManagerWrapper; - static { - MsbConfig.setMsbServerAddr("http://127.0.0.1:80"); - } + private static VnfmManagerWrapper vnfmManagerWrapper; + static { + MsbConfig.setMsbServerAddr("http://127.0.0.1:80"); + } - @Before - public void setUp() throws Exception { - vnfmManagerWrapper = VnfmManagerWrapper.getInstance(); - } + @Before + public void setUp() throws Exception { + vnfmManagerWrapper = VnfmManagerWrapper.getInstance(); + } - @Test - public void test_registerVnfm() { - ExternalSystemProxy.isTest = true; - VnfmRegisterInfo vnfmRegisterInfo = new VnfmRegisterInfo(); - vnfmRegisterInfo.setVimId("987654"); - vnfmRegisterInfo.setVersion("v1"); - vnfmRegisterInfo.setVendor("zte"); - vnfmRegisterInfo.setUserName("onap"); - vnfmRegisterInfo.setUrl("http://10.11.22.33:8000"); - vnfmRegisterInfo.setType("vnfm"); - vnfmRegisterInfo.setPassword("987654"); - vnfmRegisterInfo.setName("ONAP VNFM"); - vnfmRegisterInfo.setCertificateUrl("http://11.22.33.44:5000/v3"); - Response response = vnfmManagerWrapper.registerVnfm(vnfmRegisterInfo); - if (response != null) { - Assert.assertTrue(response.getStatus() == 200); + @Test + public void test_registerVnfm() { + ExternalSystemProxy.isTest = true; + VnfmRegisterInfo vnfmRegisterInfo = new VnfmRegisterInfo(); + vnfmRegisterInfo.setVimId("987654"); + vnfmRegisterInfo.setVersion("v1"); + vnfmRegisterInfo.setVendor("zte"); + vnfmRegisterInfo.setUserName("onap"); + vnfmRegisterInfo.setUrl("http://10.11.22.33:8000"); + vnfmRegisterInfo.setType("vnfm"); + vnfmRegisterInfo.setPassword("987654"); + vnfmRegisterInfo.setName("ONAP VNFM"); + vnfmRegisterInfo.setCertificateUrl("http://11.22.33.44:5000/v3"); + Response response = vnfmManagerWrapper.registerVnfm(vnfmRegisterInfo); + if (response != null) { + Assert.assertTrue(response.getStatus() == 200); + } + ExternalSystemProxy.isTest = false; } - ExternalSystemProxy.isTest = false; - } - - @Test - public void test_queryVnfmById() { - ExternalSystemProxy.isTest = true; - ExtsysUtil extsysUtil = new ExtsysUtil(); - VnfmRegisterInfo vnfmRegisterInfo = new VnfmRegisterInfo(); - vnfmRegisterInfo.setVimId("987654"); - vnfmRegisterInfo.setVersion("v1"); - vnfmRegisterInfo.setVendor("zte"); - vnfmRegisterInfo.setUserName("onap"); - vnfmRegisterInfo.setUrl("http://10.11.22.33:8000"); - vnfmRegisterInfo.setType("vnfm"); - vnfmRegisterInfo.setPassword("987654"); - vnfmRegisterInfo.setName("ONAP VNFM"); - vnfmRegisterInfo.setCertificateUrl("http://11.22.33.44:5000/v3"); - vnfmRegisterInfo.setVnfmId("123456"); - Response response = vnfmManagerWrapper.queryVnfmById("123456"); - if (response != null) { - Assert.assertTrue(response.getStatus() == 200); - assertEquals(extsysUtil.objectToString(vnfmRegisterInfo), extsysUtil.objectToString(response.getEntity())); + + @Test + public void test_queryVnfmById() { + ExternalSystemProxy.isTest = true; + ExtsysUtil extsysUtil = new ExtsysUtil(); + VnfmRegisterInfo vnfmRegisterInfo = new VnfmRegisterInfo(); + vnfmRegisterInfo.setVimId("987654"); + vnfmRegisterInfo.setVersion("v1"); + vnfmRegisterInfo.setVendor("zte"); + vnfmRegisterInfo.setUserName("onap"); + vnfmRegisterInfo.setUrl("http://10.11.22.33:8000"); + vnfmRegisterInfo.setType("vnfm"); + vnfmRegisterInfo.setPassword("987654"); + vnfmRegisterInfo.setName("ONAP VNFM"); + vnfmRegisterInfo.setCertificateUrl("http://11.22.33.44:5000/v3"); + vnfmRegisterInfo.setVnfmId("123456"); + Response response = vnfmManagerWrapper.queryVnfmById("123456"); + if (response != null) { + Assert.assertTrue(response.getStatus() == 200); + assertEquals(extsysUtil.objectToString(vnfmRegisterInfo), extsysUtil.objectToString(response.getEntity())); + } + ExternalSystemProxy.isTest = false; } - ExternalSystemProxy.isTest = false; - } - - @Test - public void test_queryVnfmList() { - ExternalSystemProxy.isTest = true; - ExtsysUtil extsysUtil = new ExtsysUtil(); - List vnfmList = new ArrayList<>(); - VnfmRegisterInfo vnfmRegisterInfo = new VnfmRegisterInfo(); - vnfmRegisterInfo.setVimId("987654"); - vnfmRegisterInfo.setVersion("v1"); - vnfmRegisterInfo.setVendor("zte"); - vnfmRegisterInfo.setUserName("onap"); - vnfmRegisterInfo.setUrl("http://10.11.22.33:8000"); - vnfmRegisterInfo.setType("vnfm"); - vnfmRegisterInfo.setPassword("987654"); - vnfmRegisterInfo.setName("ONAP VNFM"); - vnfmRegisterInfo.setCertificateUrl("http://11.22.33.44:5000/v3"); - vnfmRegisterInfo.setVnfmId("123456"); - vnfmList.add(vnfmRegisterInfo); - Response response = vnfmManagerWrapper.queryVnfmList(); - if (response != null) { - Assert.assertTrue(response.getStatus() == 200); - assertEquals(extsysUtil.objectToString(vnfmList), extsysUtil.objectToString(response.getEntity())); + + @Test + public void test_queryVnfmList() { + ExternalSystemProxy.isTest = true; + ExtsysUtil extsysUtil = new ExtsysUtil(); + List vnfmList = new ArrayList<>(); + VnfmRegisterInfo vnfmRegisterInfo = new VnfmRegisterInfo(); + vnfmRegisterInfo.setVimId("987654"); + vnfmRegisterInfo.setVersion("v1"); + vnfmRegisterInfo.setVendor("zte"); + vnfmRegisterInfo.setUserName("onap"); + vnfmRegisterInfo.setUrl("http://10.11.22.33:8000"); + vnfmRegisterInfo.setType("vnfm"); + vnfmRegisterInfo.setPassword("987654"); + vnfmRegisterInfo.setName("ONAP VNFM"); + vnfmRegisterInfo.setCertificateUrl("http://11.22.33.44:5000/v3"); + vnfmRegisterInfo.setVnfmId("123456"); + vnfmList.add(vnfmRegisterInfo); + Response response = vnfmManagerWrapper.queryVnfmList(); + if (response != null) { + Assert.assertTrue(response.getStatus() == 200); + assertEquals(extsysUtil.objectToString(vnfmList), extsysUtil.objectToString(response.getEntity())); + } + ExternalSystemProxy.isTest = false; } - ExternalSystemProxy.isTest = false; - } - - @Test - public void test_delVnfm() { - ExternalSystemProxy.isTest = true; - Response response = vnfmManagerWrapper.delVnfm("123456"); - if(response != null) { - Assert.assertTrue(response.getStatus() == 204); + + @Test + public void test_delVnfm() { + ExternalSystemProxy.isTest = true; + Response response = vnfmManagerWrapper.delVnfm("123456"); + if (response != null) { + Assert.assertTrue(response.getStatus() == 204); + } + ExternalSystemProxy.isTest = false; } - ExternalSystemProxy.isTest = false; - } - - @Test - public void test_updateVnfm() { - ExternalSystemProxy.isTest = true; - VnfmRegisterInfo vnfmRegisterInfo = new VnfmRegisterInfo(); - vnfmRegisterInfo.setVimId("987654"); - vnfmRegisterInfo.setVersion("v1"); - vnfmRegisterInfo.setVendor("zte"); - vnfmRegisterInfo.setUserName("onap"); - vnfmRegisterInfo.setUrl("http://10.11.22.33:8000"); - vnfmRegisterInfo.setType("vnfm"); - vnfmRegisterInfo.setPassword("987654"); - vnfmRegisterInfo.setName("ONAP VNFM"); - vnfmRegisterInfo.setCertificateUrl("http://11.22.33.44:5000/v3"); - vnfmRegisterInfo.setVnfmId("123456"); - Response response = vnfmManagerWrapper.updateVnfm(vnfmRegisterInfo, "123456"); - if(response != null) { - Assert.assertTrue(response.getStatus() == 200); + + @Test + public void test_updateVnfm() { + ExternalSystemProxy.isTest = true; + VnfmRegisterInfo vnfmRegisterInfo = new VnfmRegisterInfo(); + vnfmRegisterInfo.setVimId("987654"); + vnfmRegisterInfo.setVersion("v1"); + vnfmRegisterInfo.setVendor("zte"); + vnfmRegisterInfo.setUserName("onap"); + vnfmRegisterInfo.setUrl("http://10.11.22.33:8000"); + vnfmRegisterInfo.setType("vnfm"); + vnfmRegisterInfo.setPassword("987654"); + vnfmRegisterInfo.setName("ONAP VNFM"); + vnfmRegisterInfo.setCertificateUrl("http://11.22.33.44:5000/v3"); + vnfmRegisterInfo.setVnfmId("123456"); + Response response = vnfmManagerWrapper.updateVnfm(vnfmRegisterInfo, "123456"); + if (response != null) { + Assert.assertTrue(response.getStatus() == 200); + } + ExternalSystemProxy.isTest = false; } - ExternalSystemProxy.isTest = false; - } }