From 84c2147a46842e37c4e73c3bf19af9036371253f Mon Sep 17 00:00:00 2001 From: Lizi Date: Tue, 9 Jan 2018 11:37:38 +0000 Subject: [PATCH] add unit test for vnfmregister. Change-Id: I90e690efd0f35fff7151650f078e2b77e134b440 Issue-ID: AAI-500 Signed-off-by: Lizi --- esr-mgr/dependency-reduced-pom.xml | 438 ++++++++++----------- .../externalservice/aai/ExternalSystemProxy.java | 25 +- .../aai/esr/wrapper/VnfmManagerWrapperTest.java | 60 +++ 3 files changed, 294 insertions(+), 229 deletions(-) create mode 100644 esr-mgr/src/test/java/org/onap/aai/esr/wrapper/VnfmManagerWrapperTest.java diff --git a/esr-mgr/dependency-reduced-pom.xml b/esr-mgr/dependency-reduced-pom.xml index 481d79b..6feab2a 100644 --- a/esr-mgr/dependency-reduced-pom.xml +++ b/esr-mgr/dependency-reduced-pom.xml @@ -1,219 +1,219 @@ - - - - aai-esr-server - org.onap.aai.esr-server - 1.0.0-SNAPSHOT - - 4.0.0 - esr-mgr - esr-server/esr-mgr - 1.0.0-SNAPSHOT - - - - org.eclipse.m2e - lifecycle-mapping - - - - - - org.apache.maven.plugins - maven-dependency-plugin - [2.0,) - - copy-dependencies - - - - - - - - - - - - maven-jar-plugin - - - - true - - - - - - maven-shade-plugin - - - package - - shade - - - - - - org.onap.aai.esr.extsysApp - - - - - - - true - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - maven-dependency-plugin - - - copy-dependencies - package - - copy-dependencies - - - - - io.dropwizard - dropwizard-core - ${dropwizard.version} - true - - - - - - - - - - - swagger - - - - com.github.kongchen - swagger-maven-plugin - 3.1.1 - - - compile - - generate - - - - - - io.swagger - swagger-hibernate-validations - 1.5.6 - - - - - - false - org.onap.aai.esr.resource - /api/aai-esr-server/v1/ - - API Descriptions for External System Management - v1 - This page shows all the APIs available in the ESR server module. - http://www.github.com/kongchen/swagger-maven-plugin - - li.zi30@zte.com.cn - Zi Li - - - http://www.apache.org/licenses/LICENSE-2.0.html - Apache 2.0 - - - - ${basedir}/src/main/resources - - - - - - - - - io.swagger - swagger-jersey2-jaxrs - 1.5.0 - - - - - - - junit - junit - 4.10 - test - - - hamcrest-core - org.hamcrest - - - - - org.powermock - powermock-module-junit4 - 1.4.10 - test - - - powermock-module-junit4-common - org.powermock - - - - - org.powermock - powermock-api-mockito - 1.4.10 - test - - - mockito-all - org.mockito - - - powermock-api-support - org.powermock - - - - - org.apache.ant - ant - 1.8.2 - test - - - ant-launcher - org.apache.ant - - - - - - + + + + aai-esr-server + org.onap.aai.esr-server + 1.0.0-SNAPSHOT + + 4.0.0 + esr-mgr + esr-server/esr-mgr + 1.0.0-SNAPSHOT + + + + org.eclipse.m2e + lifecycle-mapping + + + + + + org.apache.maven.plugins + maven-dependency-plugin + [2.0,) + + copy-dependencies + + + + + + + + + + + + maven-jar-plugin + + + + true + + + + + + maven-shade-plugin + + + package + + shade + + + + + + org.onap.aai.esr.extsysApp + + + + + + + true + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + maven-dependency-plugin + + + copy-dependencies + package + + copy-dependencies + + + + + io.dropwizard + dropwizard-core + ${dropwizard.version} + true + + + + + + + + + + + swagger + + + + com.github.kongchen + swagger-maven-plugin + 3.1.1 + + + compile + + generate + + + + + + io.swagger + swagger-hibernate-validations + 1.5.6 + + + + + + false + org.onap.aai.esr.resource + /api/aai-esr-server/v1/ + + API Descriptions for External System Management + v1 + This page shows all the APIs available in the ESR server module. + http://www.github.com/kongchen/swagger-maven-plugin + + li.zi30@zte.com.cn + Zi Li + + + http://www.apache.org/licenses/LICENSE-2.0.html + Apache 2.0 + + + + ${basedir}/src/main/resources + + + + + + + + + io.swagger + swagger-jersey2-jaxrs + 1.5.0 + + + + + + + junit + junit + 4.10 + test + + + hamcrest-core + org.hamcrest + + + + + org.powermock + powermock-module-junit4 + 1.4.10 + test + + + powermock-module-junit4-common + org.powermock + + + + + org.powermock + powermock-api-mockito + 1.4.10 + test + + + mockito-all + org.mockito + + + powermock-api-support + org.powermock + + + + + org.apache.ant + ant + 1.8.2 + test + + + ant-launcher + org.apache.ant + + + + + + 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 6fca0e6..a4c80eb 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 @@ -26,8 +26,8 @@ import com.eclipsesource.jaxrs.consumer.ConsumerFactory; public class ExternalSystemProxy { + public static boolean isTest = false; private static IExternalSystem externalSystemproxy; - private static String transactionId = "9999"; private static String fromAppId = "esr-server"; private static String authorization = AaiCommon.getAuthenticationCredentials(); @@ -37,15 +37,20 @@ public class ExternalSystemProxy { config, IExternalSystem.class); } - public static void registerVnfm(String vnfmId, EsrVnfmDetail esrVnfmDetail) throws ExtsysException { - ClientConfig config = new ClientConfig(new VnfmRegisterProvider()); - IExternalSystem registerVnfmServiceproxy = ConsumerFactory - .createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class); - try { - registerVnfmServiceproxy.registerVNFM(transactionId, fromAppId, authorization, vnfmId, - esrVnfmDetail); - } catch (Exception e) { - throw new ExtsysException("PUT VNFM to A&AI failed.", e); + public static void registerVnfm(String vnfmId, EsrVnfmDetail esrVnfmDetail) + throws ExtsysException { + if (isTest) { + + } else { + ClientConfig config = new ClientConfig(new VnfmRegisterProvider()); + IExternalSystem registerVnfmServiceproxy = ConsumerFactory + .createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class); + try { + registerVnfmServiceproxy.registerVNFM(transactionId, fromAppId, authorization, vnfmId, + esrVnfmDetail); + } catch (Exception e) { + throw new ExtsysException("PUT VNFM to A&AI failed.", e); + } } } 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 new file mode 100644 index 0000000..5952763 --- /dev/null +++ b/esr-mgr/src/test/java/org/onap/aai/esr/wrapper/VnfmManagerWrapperTest.java @@ -0,0 +1,60 @@ +/** + * Copyright 2017 ZTE Corporation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.onap.aai.esr.wrapper; + +import javax.ws.rs.core.Response; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.onap.aai.esr.common.MsbConfig; +import org.onap.aai.esr.entity.rest.VnfmRegisterInfo; +import org.onap.aai.esr.externalservice.aai.ExternalSystemProxy; + +public class VnfmManagerWrapperTest { + + private static VnfmManagerWrapper vnfmManagerWrapper; + static { + MsbConfig.setMsbServerAddr("http://127.0.0.1:80"); + } + + @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); + } + ExternalSystemProxy.isTest = false; + } + + +} -- 2.16.6