diff options
| -rw-r--r-- | holmes-actions/pom.xml | 2 | ||||
| -rw-r--r-- | holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery.java | 2 | ||||
| -rw-r--r-- | holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryTest.java | 6 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | version.properties | 2 |
5 files changed, 7 insertions, 7 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 @@ -20,7 +20,7 @@ <artifactId>holmes-common-parent</artifactId>
<packaging>pom</packaging>
- <version>1.2.5</version>
+ <version>1.2.6</version>
<name>holmes-common</name>
<modules>
<module>holmes-actions</module>
diff --git a/version.properties b/version.properties index 9538460..d78165d 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ major=1
minor=2
-patch=5
+patch=6
base_version=${major}.${minor}.${patch}
|