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%2FVimManagerUtilTest.java;h=6da86654238ab48fe756fc7188aebd5bc8347e3b;hp=94267532ec7666e727be2035b5ab97b879fe5703;hb=01f832064230eeaa2e5cd7be45ab653e8d9d5d53;hpb=ed26992f976741031237ead3a5dc0565d4318b05 diff --git a/esr-mgr/src/test/java/org/onap/aai/esr/util/VimManagerUtilTest.java b/esr-mgr/src/test/java/org/onap/aai/esr/util/VimManagerUtilTest.java index 9426753..6da8665 100644 --- a/esr-mgr/src/test/java/org/onap/aai/esr/util/VimManagerUtilTest.java +++ b/esr-mgr/src/test/java/org/onap/aai/esr/util/VimManagerUtilTest.java @@ -1,5 +1,5 @@ /** - * Copyright 2017 ZTE Corporation. + * Copyright 2017-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. @@ -47,6 +47,7 @@ public class VimManagerUtilTest { vimRegisterInfo.setCloudType("openstack"); vimRegisterInfo.setCloudZone("default"); vimRegisterInfo.setComplexName("complex"); + vimRegisterInfo.setPhysicalLocationId("complex"); vimRegisterInfo.setOwnerDefinedType("test"); vimRegisterInfo.setStatus("normal"); vimAuthInfos.add(vimAuthInfo); @@ -60,7 +61,7 @@ public class VimManagerUtilTest { + "\"cloud-extra-info\":\"{}\"," + "\"esr-system-info-list\":{" + "\"esr-system-info\":[{" + "\"esr-system-info-id\":\"123456\"," + "\"service-url\":\"http://10.11.22.33:5000/v3\"," + "\"user-name\":\"onap\"," + "\"password\":\"123456\"," + "\"system-type\":\"VIM\"," - + "\"ssl-cassert\":\"test\"," + "\"ssl-insecure\":true," + "\"cloud-domain\":\"default\"," + + "\"ssl-cacert\":\"test\"," + "\"ssl-insecure\":true," + "\"cloud-domain\":\"default\"," + "\"default-tenant\":\"admin\"," + "\"system-status\":\"normal\"}]}}"; assertEquals(expectResult, cloudRegionDetailStr); } @@ -76,7 +77,7 @@ public class VimManagerUtilTest { + "\"cloud-extra-info\":\"{}\"," + "\"esr-system-info-list\":{" + "\"esr-system-info\":[{" + "\"esr-system-info-id\":\"123456\"," + "\"service-url\":\"http://10.11.22.33:5000/v3\"," + "\"user-name\":\"onap\"," + "\"password\":\"123456\"," + "\"default-tenant\":\"admin\"," - + "\"system-type\":\"VIM\"," + "\"ssl-cassert\":\"test\"," + "\"ssl-insecure\":true," + + "\"system-type\":\"VIM\"," + "\"ssl-cacert\":\"test\"," + "\"ssl-insecure\":true," + "\"cloud-domain\":\"default\"," + "\"system-status\":\"normal\"}]}}"; cloudRegionDetail = new Gson().fromJson(cloudRegionDetailStr, CloudRegionDetail.class); vimRegisterInfo = vimManagerUtil.cloudRegion2VimRegisterInfo(cloudRegionDetail);