summaryrefslogtreecommitdiffstats
path: root/holmes-actions
diff options
context:
space:
mode:
authorGuangrongFu <fu.guangrong@zte.com.cn>2018-11-02 14:36:32 +0800
committerGuangrongFu <fu.guangrong@zte.com.cn>2018-11-02 14:36:32 +0800
commitdd26bae61d5323e03bde0bbf8570f0af1de1af41 (patch)
tree96b12392e420c45236ceac8d59c273c69b50eb93 /holmes-actions
parentb54a82564793ad96f5704daa371cd64a6187199a (diff)
Added the Port Info for AAI Queries1.2.6casablanca
Change-Id: Ibf9428296e11b5ab36ca059848acdca172cfc939 Issue-ID: HOLMES-177 Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
Diffstat (limited to 'holmes-actions')
-rw-r--r--holmes-actions/pom.xml2
-rw-r--r--holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery.java2
-rw-r--r--holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryTest.java6
3 files changed, 5 insertions, 5 deletions
diff --git a/holmes-actions/pom.xml b/holmes-actions/pom.xml
index c2b6302..4c9be2a 100644
--- a/holmes-actions/pom.xml
+++ b/holmes-actions/pom.xml
@@ -12,7 +12,7 @@
<parent>
<groupId>org.onap.holmes.common</groupId>
<artifactId>holmes-common-parent</artifactId>
- <version>1.2.5</version>
+ <version>1.2.6</version>
</parent>
<name>holmes-common-service</name>
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery.java b/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery.java
index ef11769..d528547 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery.java
@@ -94,7 +94,7 @@ public class AaiQuery {
}
private String getBaseUrl(String suffixUrl) {
- return "https://aai.onap" + suffixUrl;
+ return "https://aai.onap:8443" + suffixUrl;
}
private String getMsbSuffixAddr(String suffixUrl) {
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryTest.java
index 5598354..9f211d9 100644
--- a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryTest.java
@@ -99,7 +99,7 @@ public class AaiQueryTest {
headers.put("X-FromAppId", AaiConfig.X_FROMAPP_ID);
headers.put("Authorization", AaiConfig.getAuthenticationCredentials());
headers.put("Accept", "application/json");
- String url = "https://aai.onap/aai/v11/cloud-infrastructure";
+ String url = "https://aai.onap:8443/aai/v11/cloud-infrastructure";
HttpResponse httpResponse = PowerMock.createMock(HttpResponse.class);
CloseableHttpClient httpClient = PowerMock.createMock(CloseableHttpClient.class);
when(HttpsUtils.getHttpClient(30000)).thenReturn(httpClient);
@@ -136,7 +136,7 @@ public class AaiQueryTest {
headers.put("X-FromAppId", AaiConfig.X_FROMAPP_ID);
headers.put("Authorization", AaiConfig.getAuthenticationCredentials());
headers.put("Accept", "application/json");
- String url = "https://aai.onap/aai/v11/cloud-infrastructure";
+ String url = "https://aai.onap:8443/aai/v11/cloud-infrastructure";
CloseableHttpClient httpClient = PowerMock.createMock(CloseableHttpClient.class);
when(HttpsUtils.getHttpClient(30000)).thenReturn(httpClient);
HttpGet httpGet = new HttpGet(url);
@@ -291,7 +291,7 @@ public class AaiQueryTest {
String actual = Whitebox.invokeMethod(aaiQuery,"getBaseUrl", "/url");
PowerMock.verifyAll();
- assertThat(actual, equalTo("https://aai.onap/url"));
+ assertThat(actual, equalTo("https://aai.onap:8443/url"));
}
@Test