Change-Id: Ibf9428296e11b5ab36ca059848acdca172cfc939
Issue-ID: HOLMES-177
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
<parent>\r
<groupId>org.onap.holmes.common</groupId>\r
<artifactId>holmes-common-parent</artifactId>\r
<parent>\r
<groupId>org.onap.holmes.common</groupId>\r
<artifactId>holmes-common-parent</artifactId>\r
- <version>1.2.5</version>\r
+ <version>1.2.6</version>\r
</parent>\r
\r
<name>holmes-common-service</name>\r
</parent>\r
\r
<name>holmes-common-service</name>\r
}
private String getBaseUrl(String suffixUrl) {
}
private String getBaseUrl(String suffixUrl) {
- return "https://aai.onap" + suffixUrl;
+ return "https://aai.onap:8443" + suffixUrl;
}
private String getMsbSuffixAddr(String suffixUrl) {
}
private String getMsbSuffixAddr(String suffixUrl) {
headers.put("X-FromAppId", AaiConfig.X_FROMAPP_ID);
headers.put("Authorization", AaiConfig.getAuthenticationCredentials());
headers.put("Accept", "application/json");
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);
HttpResponse httpResponse = PowerMock.createMock(HttpResponse.class);
CloseableHttpClient httpClient = PowerMock.createMock(CloseableHttpClient.class);
when(HttpsUtils.getHttpClient(30000)).thenReturn(httpClient);
headers.put("X-FromAppId", AaiConfig.X_FROMAPP_ID);
headers.put("Authorization", AaiConfig.getAuthenticationCredentials());
headers.put("Accept", "application/json");
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);
CloseableHttpClient httpClient = PowerMock.createMock(CloseableHttpClient.class);
when(HttpsUtils.getHttpClient(30000)).thenReturn(httpClient);
HttpGet httpGet = new HttpGet(url);
String actual = Whitebox.invokeMethod(aaiQuery,"getBaseUrl", "/url");
PowerMock.verifyAll();
String actual = Whitebox.invokeMethod(aaiQuery,"getBaseUrl", "/url");
PowerMock.verifyAll();
- assertThat(actual, equalTo("https://aai.onap/url"));
+ assertThat(actual, equalTo("https://aai.onap:8443/url"));
<artifactId>holmes-common-parent</artifactId>\r
<packaging>pom</packaging>\r
\r
<artifactId>holmes-common-parent</artifactId>\r
<packaging>pom</packaging>\r
\r
- <version>1.2.5</version>\r
+ <version>1.2.6</version>\r
<name>holmes-common</name>\r
<modules>\r
<module>holmes-actions</module>\r
<name>holmes-common</name>\r
<modules>\r
<module>holmes-actions</module>\r
\r
base_version=${major}.${minor}.${patch}\r
\r
\r
base_version=${major}.${minor}.${patch}\r
\r