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%2Futil%2FVnfmManagerUtilTest.java;h=db888bd3f04d5c815720e2260f2e435aeb3de9f6;hp=bc7eea155755b8f495195a0e8d6667a14ee9e7b5;hb=ed26992f976741031237ead3a5dc0565d4318b05;hpb=f73ad41f58f1f60d00d42a8bc5fc2502a46d62dd

diff --git a/esr-mgr/src/test/java/org/onap/aai/esr/util/VnfmManagerUtilTest.java b/esr-mgr/src/test/java/org/onap/aai/esr/util/VnfmManagerUtilTest.java
index bc7eea1..db888bd 100644
--- a/esr-mgr/src/test/java/org/onap/aai/esr/util/VnfmManagerUtilTest.java
+++ b/esr-mgr/src/test/java/org/onap/aai/esr/util/VnfmManagerUtilTest.java
@@ -16,82 +16,58 @@
 package org.onap.aai.esr.util;
 
 import static org.junit.Assert.assertEquals;
-
 import org.junit.Test;
 import org.onap.aai.esr.entity.aai.EsrVnfmDetail;
 import org.onap.aai.esr.entity.rest.VnfmRegisterInfo;
-
 import com.google.gson.Gson;
 
 public class VnfmManagerUtilTest {
 
-  @Test
-  public void vnfmRegisterInfo2EsrVnfmTest() {
-    VnfmManagerUtil vnfmManagerUtil = new VnfmManagerUtil();
-    VnfmRegisterInfo vnfmRegisterInfo = new VnfmRegisterInfo();
-    EsrVnfmDetail esrVnfmDetail = new EsrVnfmDetail();
-    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");
-    esrVnfmDetail = vnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfmRegisterInfo);
-    esrVnfmDetail.setVnfmId("123456");
-    esrVnfmDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0).setEsrSystemInfoId("qwerty");
-    String esrVnfmDetailStr = new ExtsysUtil().objectToString(esrVnfmDetail);
-    String expectResult = "{\"vnfm-id\":\"123456\","
-        + "\"vim-id\":\"987654\","
-        + "\"certificate-url\":\"http://11.22.33.44: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://10.11.22.33:8000\","
-        + "\"user-name\":\"onap\","
-        + "\"password\":\"987654\","
-        + "\"system-type\":\"VNFM\"}]}}";
-    assertEquals(expectResult, esrVnfmDetailStr);
-  }
-  
-  @Test
-  public void esrVnfm2VnfmRegisterInfoTest() {
-    VnfmManagerUtil vnfmManagerUtil = new VnfmManagerUtil();
-    VnfmRegisterInfo vnfmRegisterInfo = new VnfmRegisterInfo();
-    EsrVnfmDetail esrVnfmDetail = new EsrVnfmDetail();
-    String esrVnfmDetailStr = "{\"vnfm-id\":\"123456\","
-        + "\"vim-id\":\"987654\","
-        + "\"certificate-url\":\"http://11.22.33.44: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://10.11.22.33:8000\","
-        + "\"user-name\":\"onap\","
-        + "\"password\":\"987654\","
-        + "\"system-type\":\"VNFM\"}]}}";
-    esrVnfmDetail = new Gson().fromJson(esrVnfmDetailStr, EsrVnfmDetail.class);
-    vnfmRegisterInfo = vnfmManagerUtil.esrVnfm2VnfmRegisterInfo(esrVnfmDetail);
-    String vnfmRegisterInfoStr = new ExtsysUtil().objectToString(vnfmRegisterInfo);
-    String expectResult = "{\"vnfmId\":\"123456\","
-        + "\"name\":\"ONAP VNFM\","
-        + "\"type\":\"vnfm\","
-        + "\"vimId\":\"987654\","
-        + "\"vendor\":\"zte\","
-        + "\"version\":\"v1\","
-        + "\"certificateUrl\":\"http://11.22.33.44:5000/v3\","
-        + "\"url\":\"http://10.11.22.33:8000\","
-        + "\"userName\":\"onap\","
-        + "\"password\":\"987654\"}";
-    assertEquals(expectResult, vnfmRegisterInfoStr);
-  }
+    @Test
+    public void vnfmRegisterInfo2EsrVnfmTest() {
+        VnfmManagerUtil vnfmManagerUtil = new VnfmManagerUtil();
+        VnfmRegisterInfo vnfmRegisterInfo = new VnfmRegisterInfo();
+        EsrVnfmDetail esrVnfmDetail = new EsrVnfmDetail();
+        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");
+        esrVnfmDetail = vnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfmRegisterInfo);
+        esrVnfmDetail.setVnfmId("123456");
+        esrVnfmDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0).setEsrSystemInfoId("qwerty");
+        String esrVnfmDetailStr = new ExtsysUtil().objectToString(esrVnfmDetail);
+        String expectResult = "{\"vnfm-id\":\"123456\"," + "\"vim-id\":\"987654\","
+                + "\"certificate-url\":\"http://11.22.33.44: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://10.11.22.33:8000\"," + "\"user-name\":\"onap\","
+                + "\"password\":\"987654\"," + "\"system-type\":\"VNFM\"}]}}";
+        assertEquals(expectResult, esrVnfmDetailStr);
+    }
+
+    @Test
+    public void esrVnfm2VnfmRegisterInfoTest() {
+        VnfmManagerUtil vnfmManagerUtil = new VnfmManagerUtil();
+        VnfmRegisterInfo vnfmRegisterInfo = new VnfmRegisterInfo();
+        EsrVnfmDetail esrVnfmDetail = new EsrVnfmDetail();
+        String esrVnfmDetailStr = "{\"vnfm-id\":\"123456\"," + "\"vim-id\":\"987654\","
+                + "\"certificate-url\":\"http://11.22.33.44: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://10.11.22.33:8000\"," + "\"user-name\":\"onap\","
+                + "\"password\":\"987654\"," + "\"system-type\":\"VNFM\"}]}}";
+        esrVnfmDetail = new Gson().fromJson(esrVnfmDetailStr, EsrVnfmDetail.class);
+        vnfmRegisterInfo = vnfmManagerUtil.esrVnfm2VnfmRegisterInfo(esrVnfmDetail);
+        String vnfmRegisterInfoStr = new ExtsysUtil().objectToString(vnfmRegisterInfo);
+        String expectResult = "{\"vnfmId\":\"123456\"," + "\"name\":\"ONAP VNFM\"," + "\"type\":\"vnfm\","
+                + "\"vimId\":\"987654\"," + "\"vendor\":\"zte\"," + "\"version\":\"v1\","
+                + "\"certificateUrl\":\"http://11.22.33.44:5000/v3\"," + "\"url\":\"http://10.11.22.33:8000\","
+                + "\"userName\":\"onap\"," + "\"password\":\"987654\"}";
+        assertEquals(expectResult, vnfmRegisterInfoStr);
+    }
 }