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=917fac4d5f7e1be396661b945930242264fa42f3;hb=41d59ecbd847f49c30d33941289c69ad5e2a1c62;hpb=4bc5af16cefb4c33f83bf499b385c94e0c850595

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 917fac4..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
@@ -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,15 @@
 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.AfterClass;
 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;
@@ -29,56 +32,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");
+    }
+
+    @BeforeClass  
+    public static void beforeClass() {  
+        ExternalSystemProxy.test = new IsTest(true);
+    };  
+    
+    @AfterClass  
+    public static void afterClass() {  
+        ExternalSystemProxy.test = new IsTest(false);
+    };
+    
+    @Before
+    public void setUp() throws Exception {
+        vnfmManagerWrapper = VnfmManagerWrapper.getInstance();
+    }
 
-  @Before
-  public void setUp() throws Exception {
-    vnfmManagerWrapper = VnfmManagerWrapper.getInstance();
-  }
+    @Test
+    public void test_registerVnfm() {
+        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");
+        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);
+    @Test
+    public void test_queryVnfmById() {
+        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");
+        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_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_queryVnfmList() {
+        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);
+        Response response = vnfmManagerWrapper.queryVnfmList();
+        if (response != null) {
+            Assert.assertTrue(response.getStatus() == 200);
+            assertEquals(extsysUtil.objectToString(vnfmList), extsysUtil.objectToString(response.getEntity()));
+        }
+    }
+
+    @Test
+    public void test_delVnfm() {
+        Response response = vnfmManagerWrapper.delVnfm("123456");
+        if (response != null) {
+            Assert.assertTrue(response.getStatus() == 204);
+        }
+    }
+
+    @Test
+    public void test_updateVnfm() {
+        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");
+        Response response = vnfmManagerWrapper.updateVnfm(vnfmRegisterInfo, "123456");
+        if (response != null) {
+            Assert.assertTrue(response.getStatus() == 200);
+        }
     }
-    ExternalSystemProxy.isTest = false;
-  }
 }