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=3086a1d15cf32bbd3307a64b6d9900f1efd59d3e;hp=735e169f9d69fc63ea5b4c4170768471915c0b6b;hb=2ff619837c97c1b18620d58b2796a55c784a562b;hpb=769718b3e8b4e659299602701b575cf1b4b182c5

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..3086a1d 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,128 +16,148 @@
 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;
+import org.mockito.Mockito;
 import org.onap.aai.esr.common.MsbConfig;
+import org.onap.aai.esr.entity.aai.EsrVnfmDetail;
 import org.onap.aai.esr.entity.rest.VnfmRegisterInfo;
+import org.onap.aai.esr.exception.ExtsysException;
 import org.onap.aai.esr.externalservice.aai.ExternalSystemProxy;
 import org.onap.aai.esr.util.ExtsysUtil;
 
 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();
-  }
+    static {
+        MsbConfig.setMsbServerAddr("http://127.0.0.1:80");
+    }
 
-  @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() throws ExtsysException {
+        VnfmRegisterInfo vnfmRegisterInfo = new VnfmRegisterInfo();
+        vnfmRegisterInfo.setVimId("987654");
+        vnfmRegisterInfo.setVersion("v1");
+        vnfmRegisterInfo.setVendor("zte");
+        vnfmRegisterInfo.setUserName("onap");
+        vnfmRegisterInfo.setUrl("http://ip:8000");
+        vnfmRegisterInfo.setType("vnfm");
+        vnfmRegisterInfo.setPassword("987654");
+        vnfmRegisterInfo.setName("ONAP VNFM");
+        vnfmRegisterInfo.setCertificateUrl("http://ip:5000/v3");
+        ExternalSystemProxy mockExternalSystemProxy = Mockito.mock(ExternalSystemProxy.class);
+        Mockito.doNothing().when(mockExternalSystemProxy).registerVnfm(Mockito.anyString(), (EsrVnfmDetail)Mockito.anyObject());
+        VnfmManagerWrapper vnfmManagerWrapper = new VnfmManagerWrapper(mockExternalSystemProxy);
+        Response response = vnfmManagerWrapper.registerVnfm(vnfmRegisterInfo);
+        if (response != null) {
+            Assert.assertTrue(response.getStatus() == 200);
+        }
     }
-    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() throws ExtsysException {
+        ExtsysUtil extsysUtil = new ExtsysUtil();
+        VnfmRegisterInfo vnfmRegisterInfo = new VnfmRegisterInfo();
+        vnfmRegisterInfo.setVimId("987654");
+        vnfmRegisterInfo.setVersion("v1");
+        vnfmRegisterInfo.setVendor("zte");
+        vnfmRegisterInfo.setUserName("onap");
+        vnfmRegisterInfo.setUrl("http://ip:8000");
+        vnfmRegisterInfo.setType("vnfm");
+        vnfmRegisterInfo.setPassword("987654");
+        vnfmRegisterInfo.setName("ONAP VNFM");
+        vnfmRegisterInfo.setCertificateUrl("http://ip:5000/v3");
+        vnfmRegisterInfo.setVnfmId("123456");
+        String esrVnfmDetailStr = "{\"vnfm-id\":\"123456\",\"vim-id\":\"987654\","
+                + "\"certificate-url\":\"http://ip:5000/v3\",\"esr-system-info-list\":{"
+                + "\"esr-system-info\":[{\"esr-system-info-id\":\"qwerty\",\"system-name\":\"ONAP VNFM\","
+                + "\"type\":\"vnfm\",\"vendor\":\"zte\",\"version\":\"v1\","
+                + "\"service-url\":\"http://ip:8000\",\"user-name\":\"onap\","
+                + "\"password\":\"987654\",\"system-type\":\"VNFM\"}]}}";
+        ExternalSystemProxy mockExternalSystemProxy = Mockito.mock(ExternalSystemProxy.class);
+        Mockito.when(mockExternalSystemProxy.queryVnfmDetail(Mockito.anyString())).thenReturn(esrVnfmDetailStr);
+        VnfmManagerWrapper vnfmManagerWrapper = new VnfmManagerWrapper(mockExternalSystemProxy);
+        Response response = vnfmManagerWrapper.queryVnfmById("123456");
+        if (response != null) {
+            Assert.assertTrue(response.getStatus() == 200);
+            assertEquals(extsysUtil.objectToString(vnfmRegisterInfo), extsysUtil.objectToString(response.getEntity()));
+        }
     }
-    ExternalSystemProxy.isTest = false;
-  }
-  
-  @Test
-  public void test_queryVnfmList() {
-    ExternalSystemProxy.isTest = true;
-    ExtsysUtil extsysUtil = new ExtsysUtil();
-    List<VnfmRegisterInfo> 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() throws ExtsysException {
+        ExtsysUtil extsysUtil = new ExtsysUtil();
+        List<VnfmRegisterInfo> vnfmList = new ArrayList<>();
+        VnfmRegisterInfo vnfmRegisterInfo = new VnfmRegisterInfo();
+        vnfmRegisterInfo.setVimId("987654");
+        vnfmRegisterInfo.setVersion("v1");
+        vnfmRegisterInfo.setVendor("zte");
+        vnfmRegisterInfo.setUserName("onap");
+        vnfmRegisterInfo.setUrl("http://ip:8000");
+        vnfmRegisterInfo.setType("vnfm");
+        vnfmRegisterInfo.setPassword("987654");
+        vnfmRegisterInfo.setName("ONAP VNFM");
+        vnfmRegisterInfo.setCertificateUrl("http://ip:5000/v3");
+        vnfmRegisterInfo.setVnfmId("123456");
+        vnfmList.add(vnfmRegisterInfo);
+        String vnfmListStr = "{\"esr-vnfm\": [{\"vnfm-id\": \"123456\",\"vim-id\": \"987654\","
+                + "\"certificate-url\": \"http://ip:5000/v3\",\"resource-version\": \"1\"}]}";
+        String esrVnfmDetailStr = "{\"vnfm-id\":\"123456\",\"vim-id\":\"987654\","
+                + "\"certificate-url\":\"http://ip:5000/v3\",\"esr-system-info-list\":{"
+                + "\"esr-system-info\":[{\"esr-system-info-id\":\"qwerty\",\"system-name\":\"ONAP VNFM\","
+                + "\"type\":\"vnfm\",\"vendor\":\"zte\",\"version\":\"v1\","
+                + "\"service-url\":\"http://ip:8000\",\"user-name\":\"onap\","
+                + "\"password\":\"987654\",\"system-type\":\"VNFM\"}]}}";
+        ExternalSystemProxy mockExternalSystemProxy = Mockito.mock(ExternalSystemProxy.class);
+        Mockito.when(mockExternalSystemProxy.queryVnfmList()).thenReturn(vnfmListStr);
+        Mockito.when(mockExternalSystemProxy.queryVnfmDetail(Mockito.anyString())).thenReturn(esrVnfmDetailStr);
+        VnfmManagerWrapper vnfmManagerWrapper = new VnfmManagerWrapper(mockExternalSystemProxy);
+        Response response = vnfmManagerWrapper.queryVnfmList();
+        if (response != null) {
+            Assert.assertTrue(response.getStatus() == 200);
+            assertEquals(extsysUtil.objectToString(vnfmList), extsysUtil.objectToString(response.getEntity()));
+        }
     }
-    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() throws ExtsysException {
+        ExternalSystemProxy mockExternalSystemProxy = Mockito.mock(ExternalSystemProxy.class);
+        Mockito.doNothing().when(mockExternalSystemProxy).deleteVnfm(Mockito.anyString(), Mockito.anyString());
+        VnfmManagerWrapper vnfmManagerWrapper = new VnfmManagerWrapper(mockExternalSystemProxy);
+        Response response = vnfmManagerWrapper.delVnfm("123456");
+        if (response != null) {
+            Assert.assertTrue(response.getStatus() == 204);
+        }
     }
-    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() throws ExtsysException {
+        VnfmRegisterInfo vnfmRegisterInfo = new VnfmRegisterInfo();
+        vnfmRegisterInfo.setVimId("987654");
+        vnfmRegisterInfo.setVersion("v1");
+        vnfmRegisterInfo.setVendor("zte");
+        vnfmRegisterInfo.setUserName("onap");
+        vnfmRegisterInfo.setUrl("http://ip:8000");
+        vnfmRegisterInfo.setType("vnfm");
+        vnfmRegisterInfo.setPassword("987654");
+        vnfmRegisterInfo.setName("ONAP VNFM");
+        vnfmRegisterInfo.setCertificateUrl("http://ip:5000/v3");
+        vnfmRegisterInfo.setVnfmId("123456");
+        String esrVnfmDetailStr = "{\"vnfm-id\":\"123456\",\"vim-id\":\"987654\","
+                + "\"certificate-url\":\"http://ip:5000/v3\",\"esr-system-info-list\":{"
+                + "\"esr-system-info\":[{\"esr-system-info-id\":\"qwerty\",\"system-name\":\"ONAP VNFM\","
+                + "\"type\":\"vnfm\",\"vendor\":\"zte\",\"version\":\"v1\","
+                + "\"service-url\":\"http://ip:8000\",\"user-name\":\"onap\","
+                + "\"password\":\"987654\",\"system-type\":\"VNFM\"}]}}";
+        ExternalSystemProxy mockExternalSystemProxy = Mockito.mock(ExternalSystemProxy.class);
+        Mockito.doNothing().when(mockExternalSystemProxy).registerVnfm(Mockito.anyString(), (EsrVnfmDetail)Mockito.anyObject());
+        Mockito.when(mockExternalSystemProxy.queryVnfmDetail(Mockito.anyString())).thenReturn(esrVnfmDetailStr);
+        VnfmManagerWrapper vnfmManagerWrapper = new VnfmManagerWrapper(mockExternalSystemProxy);
+        Response response = vnfmManagerWrapper.updateVnfm(vnfmRegisterInfo, "123456");
+        if (response != null) {
+            Assert.assertTrue(response.getStatus() == 200);
+        }
     }
-    ExternalSystemProxy.isTest = false;
-  }
 }