summaryrefslogtreecommitdiffstats
path: root/esr-mgr
diff options
context:
space:
mode:
authorLvbo163 <lv.bo163@zte.com.cn>2019-03-06 11:06:24 +0800
committerLvbo163 <lv.bo163@zte.com.cn>2019-03-06 11:22:22 +0800
commit01f832064230eeaa2e5cd7be45ab653e8d9d5d53 (patch)
tree91c446d8c2d17d1618f5343a8e289f321f1fdf9f /esr-mgr
parentd9dd097ca629541572aadf17d358c54c3a400b77 (diff)
fix esr does not store ssl-cacert to aai error
Issue-ID: AAI-2041 Change-Id: If49853a56bca147726cc061c04373c1a6fad46cc Signed-off-by: Lvbo163 <lv.bo163@zte.com.cn>
Diffstat (limited to 'esr-mgr')
-rw-r--r--esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EsrSystemInfo.java2
-rw-r--r--esr-mgr/src/test/java/org/onap/aai/esr/util/ExtsysUtilTest.java4
-rw-r--r--esr-mgr/src/test/java/org/onap/aai/esr/util/VimManagerUtilTest.java4
3 files changed, 5 insertions, 5 deletions
diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EsrSystemInfo.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EsrSystemInfo.java
index 4faae16..623b645 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EsrSystemInfo.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EsrSystemInfo.java
@@ -52,7 +52,7 @@ public class EsrSystemInfo implements Serializable {
@SerializedName("protocol")
private String protocol;
- @SerializedName("ssl-cassert")
+ @SerializedName("ssl-cacert")
private String sslCassert;
@SerializedName("ssl-insecure")
diff --git a/esr-mgr/src/test/java/org/onap/aai/esr/util/ExtsysUtilTest.java b/esr-mgr/src/test/java/org/onap/aai/esr/util/ExtsysUtilTest.java
index 08468ed..30deb1f 100644
--- a/esr-mgr/src/test/java/org/onap/aai/esr/util/ExtsysUtilTest.java
+++ b/esr-mgr/src/test/java/org/onap/aai/esr/util/ExtsysUtilTest.java
@@ -65,7 +65,7 @@ public class ExtsysUtilTest {
String listStr = "{\"esr-system-info\":[{" + "\"esr-system-info-id\":\"123456\"," + "\"system-name\":\"vnfm\","
+ "\"type\":\"test\"," + "\"vendor\":\"zte\"," + "\"version\":\"v1.0\","
+ "\"service-url\":\"http://127.0.0.1:8080\"," + "\"user-name\":\"root\"," + "\"password\":\"qwelk\","
- + "\"system-type\":\"VNFM\"," + "\"protocol\":\"http\"," + "\"ssl-cassert\":\"sslCassert\","
+ + "\"system-type\":\"VNFM\"," + "\"protocol\":\"http\"," + "\"ssl-cacert\":\"sslCassert\","
+ "\"ssl-insecure\":false," + "\"ip-address\":\"127.0.0.1\"," + "\"port\":\"5000\","
+ "\"cloud-domain\":\"cloudDomain\"," + "\"default-tenant\":\"admin\"," + "\"passive\":true,"
+ "\"remote-path\":\"/root/test\"," + "\"system-status\":\"normal\"}]}";
@@ -103,7 +103,7 @@ public class ExtsysUtilTest {
String listStr = "{\"esr-system-info\":[{" + "\"esr-system-info-id\":\"123456\"," + "\"system-name\":\"vnfm\","
+ "\"type\":\"test\"," + "\"vendor\":\"zte\"," + "\"version\":\"v1.0\","
+ "\"service-url\":\"http://127.0.0.1:8080\"," + "\"user-name\":\"root\"," + "\"password\":\"qwelk\","
- + "\"system-type\":\"VNFM\"," + "\"protocol\":\"http\"," + "\"ssl-cassert\":\"sslCassert\","
+ + "\"system-type\":\"VNFM\"," + "\"protocol\":\"http\"," + "\"ssl-cacert\":\"sslCassert\","
+ "\"ssl-insecure\":false," + "\"ip-address\":\"127.0.0.1\"," + "\"port\":\"5000\","
+ "\"cloud-domain\":\"cloudDomain\"," + "\"default-tenant\":\"admin\"," + "\"passive\":true,"
+ "\"remote-path\":\"/root/test\"," + "\"system-status\":\"normal\"}]}";
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 160de58..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
@@ -61,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);
}
@@ -77,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);