Code Review
/
holmes
/
common.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Change HTTP Requests into HTTPS Ones
[holmes/common.git]
/
holmes-actions
/
src
/
main
/
java
/
org
/
onap
/
holmes
/
common
/
aai
/
AaiQuery.java
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
aa840ba
..
ef96476
100644
(file)
--- 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
@@
-14,10
+14,11
@@
package org.onap.holmes.common.aai;
import java.util.HashMap;
package org.onap.holmes.common.aai;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Map;
-import java.util.stream.Stream;
import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j;
import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpResponse;
import org.jvnet.hk2.annotations.Service;
import org.onap.holmes.common.aai.config.AaiConfig;
import org.onap.holmes.common.aai.entity.VmEntity;
import org.jvnet.hk2.annotations.Service;
import org.onap.holmes.common.aai.config.AaiConfig;
import org.onap.holmes.common.aai.entity.VmEntity;
@@
-66,28
+67,28
@@
public class AaiQuery {
private String getVmResourceLinks(String vserverId, String vserverName) throws CorrelationException {
String response = getResourceLinksResponse(vserverId, vserverName);
private String getVmResourceLinks(String vserverId, String vserverName) throws CorrelationException {
String response = getResourceLinksResponse(vserverId, vserverName);
- try {
+ List linkList = aaiResponseUtil.convertJsonToVmResourceLink(response);
+ if (linkList.size() != 0) {
return aaiResponseUtil.convertJsonToVmResourceLink(response).get(0).getResourceLink();
return aaiResponseUtil.convertJsonToVmResourceLink(response).get(0).getResourceLink();
- } catch (Exception e) {
- throw new CorrelationException("Failed to get aai resource link", e);
}
}
+ return "";
}
private String getResourceLinksResponse(String vserverId, String vserverName) throws CorrelationException {
}
private String getResourceLinksResponse(String vserverId, String vserverName) throws CorrelationException {
- String url = getBaseUrl(getMsbSuffixAddr(AaiConfig.AAI_V
NF
_ADDR) + "vserver-id:EQUALS:" + vserverId);
+ String url = getBaseUrl(getMsbSuffixAddr(AaiConfig.AAI_V
M
_ADDR) + "vserver-id:EQUALS:" + vserverId);
String response = getResponse(url);
String response = getResponse(url);
- if (
response.equals(""
)) {
- url = getBaseUrl(
AaiConfig.AAI_VM_ADDR
+ "vserver-name:EQUALS:" + vserverName);
+ if (
"".equals(response) || "{}".equals(response
)) {
+ url = getBaseUrl(
getMsbSuffixAddr(AaiConfig.AAI_VM_ADDR)
+ "vserver-name:EQUALS:" + vserverName);
response = getResponse(url);
}
return response;
}
private String getVnfDataResponse(String vnfId, String vnfName) throws CorrelationException {
response = getResponse(url);
}
return response;
}
private String getVnfDataResponse(String vnfId, String vnfName) throws CorrelationException {
- String url = getBaseUrl(getMsbSuffixAddr(AaiConfig.AAI_V
M_ADDR)+ "vnf-id=
" + vnfId);
+ String url = getBaseUrl(getMsbSuffixAddr(AaiConfig.AAI_V
NF_ADDR)+ "/
" + vnfId);
String response = getResponse(url);
String response = getResponse(url);
- if (
response.equals(""
)) {
- url = getBaseUrl(
AaiConfig.AAI_VNF_ADDR
+ "vnf-name=" + vnfName);
+ if (
"".equals(response) || "{}".equals(response
)) {
+ url = getBaseUrl(
getMsbSuffixAddr(AaiConfig.AAI_VNF_ADDR)
+ "vnf-name=" + vnfName);
response = getResponse(url);
}
return response;
response = getResponse(url);
}
return response;
@@
-96,26
+97,39
@@
public class AaiQuery {
private String getBaseUrl(String suffixUrl) {
String url = "";
try {
private String getBaseUrl(String suffixUrl) {
String url = "";
try {
- url = MicroServiceConfig.getMsbServerAddr() + suffixUrl;
+ String[] msbUrl = MicroServiceConfig.getMsbServerAddrWithHttpPrefix().split(":");
+ url = msbUrl[0] + ":" + msbUrl[1] + suffixUrl;
} catch (Exception e) {
log.info("Failed to get msb address");
}
} catch (Exception e) {
log.info("Failed to get msb address");
}
- if (
url.equals(""
)) {
+ if (
"".equals(url
)) {
try {
try {
- url = "https:
\\\\" + MicroServiceConfig.getServiceAddrInfoFromCBS("aai_config
")
+ url = "https:
//" + MicroServiceConfig.getServiceConfigInfoFromCBS("aai_config").replace("http://", "
")
+ suffixUrl;
} catch (Exception e) {
+ suffixUrl;
} catch (Exception e) {
- log.info("Failed to get
aai address"
);
+ log.info("Failed to get
the address of A&AI.", e
);
}
}
return url;
}
private String getMsbSuffixAddr(String suffixUrl) {
}
}
return url;
}
private String getMsbSuffixAddr(String suffixUrl) {
+ if (suffixUrl.length() <= 0) {
+ return "";
+ }
String[] addrSplits = suffixUrl.substring(1).split("/");
String[] addrSplits = suffixUrl.substring(1).split("/");
+ String[] conv = addrSplits[2].split("-");
+ addrSplits[2] = conv[0];
+ if (conv.length > 1) {
+ for(int i = 1; i < conv.length; i++) {
+ addrSplits[2] = addrSplits[2] + conv[i].substring(0, 1).toUpperCase() + conv[i]
+ .substring(1);
+ }
+ }
String ret = addrSplits[1];
String ret = addrSplits[1];
- addrSplits[1] = addrSplits[2];
+ addrSplits[1] = addrSplits[
0] + "-" + addrSplits[
2];
addrSplits[2] = ret;
addrSplits[2] = ret;
+ addrSplits[0] = "api";
StringBuffer stringBuffer = new StringBuffer();
for (String split : addrSplits) {
stringBuffer.append("/" + split);
StringBuffer stringBuffer = new StringBuffer();
for (String split : addrSplits) {
stringBuffer.append("/" + split);
@@
-124,9
+138,10
@@
public class AaiQuery {
}
private String getResponse(String url) throws CorrelationException {
}
private String getResponse(String url) throws CorrelationException {
- String response
= ""
;
+ String response;
try {
try {
- response = HttpsUtils.get(url, getHeaders());
+ HttpResponse httpResponse = HttpsUtils.get(url, getHeaders());
+ response = HttpsUtils.extractResponseEntity(httpResponse);
} catch (Exception e) {
throw new CorrelationException("Failed to get data from aai", e);
}
} catch (Exception e) {
throw new CorrelationException("Failed to get data from aai", e);
}