summaryrefslogtreecommitdiffstats
path: root/holmes-actions/src/test/java/org/onap
diff options
context:
space:
mode:
authorGuangrong Fu <fu.guangrong@zte.com.cn>2023-03-20 10:30:36 +0800
committerGuangrong Fu <fu.guangrong@zte.com.cn>2023-03-20 10:32:19 +0800
commit167b3d6d3f85e8d0ff3680a7d85ca1c9cf99b2b1 (patch)
treeb3776015132d5a9a110ca2c3792145df88d4b4a8 /holmes-actions/src/test/java/org/onap
parentf40805fd803fe7e6aa8f7bb4c5d41cf85d163738 (diff)
Removed MSB Invocation During AAI Calling
Issue-ID: HOLMES-327 Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn> Change-Id: I7e4319c3f6b17db53ffbb57efbe692ed523090e6
Diffstat (limited to 'holmes-actions/src/test/java/org/onap')
-rw-r--r--holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryMdonsTest.java6
-rw-r--r--holmes-actions/src/test/java/org/onap/holmes/common/aai/config/AaiConfigTest.java4
2 files changed, 6 insertions, 4 deletions
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryMdonsTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryMdonsTest.java
index 9ba284f..8b176eb 100644
--- a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryMdonsTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryMdonsTest.java
@@ -1,5 +1,5 @@
/**
- * Copyright 2020 - 2022 Fujitsu Limited, ZTE Corporation.
+ * Copyright 2020 - 2023 Fujitsu Limited, ZTE Corporation.
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
@@ -53,12 +53,14 @@ public class AaiQueryMdonsTest {
private static JsonObject data;
- private static final String AAI_ADDR = "https://aai.onap:8443/aai/v19/";
+ private static final String AAI_ADDR = "https://aai.onap:443/aai/v19/";
@BeforeClass
public static void beforeClass() {
System.setProperty(MSB_ADDR, "127.0.0.1:80");
System.setProperty("ENABLE_ENCRYPT", "true");
+ System.setProperty(MicroServiceConfig.AAI_ADDR, "aai");
+ System.setProperty(MicroServiceConfig.BASE_URL, "onap");
File file = new File(AaiQueryMdonsTest.class.getClassLoader().getResource("./aai-mdons.json").getFile());
BufferedReader reader = null;
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/aai/config/AaiConfigTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/aai/config/AaiConfigTest.java
index 68e9f84..377029c 100644
--- a/holmes-actions/src/test/java/org/onap/holmes/common/aai/config/AaiConfigTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/aai/config/AaiConfigTest.java
@@ -24,8 +24,8 @@ public class AaiConfigTest {
@Test
public void testAaiConfig_get_static_fields() {
- String aaiVnfAddr = "/aai/v11/network/generic-vnfs/generic-vnf";
- String aaiVmAddr = "/aai/v11/search/nodes-query?search-node-type=vserver&filter=";
+ String aaiVnfAddr = "/aai/v19/network/generic-vnfs/generic-vnf";
+ String aaiVmAddr = "/aai/v19/search/nodes-query?search-node-type=vserver&filter=";
String xTransactionId = "9999";
String xFromAppId = "jimmy-postman";
assertThat(aaiVnfAddr, equalTo(AaiConfig.AaiConsts.AAI_VNF_ADDR));