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
modify bug
[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
074c509
..
7cbb6f3
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
@@
-15,7
+15,6
@@
package org.onap.holmes.common.aai;
import java.util.HashMap;
import java.util.Map;
import java.util.HashMap;
import java.util.Map;
-import java.util.stream.Stream;
import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j;
import org.jvnet.hk2.annotations.Service;
import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j;
import org.jvnet.hk2.annotations.Service;
@@
-74,7
+73,7
@@
public class AaiQuery {
}
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);
if ("".equals(response) || "{}".equals(response)) {
url = getBaseUrl(AaiConfig.AAI_VM_ADDR + "vserver-name:EQUALS:" + vserverName);
String response = getResponse(url);
if ("".equals(response) || "{}".equals(response)) {
url = getBaseUrl(AaiConfig.AAI_VM_ADDR + "vserver-name:EQUALS:" + vserverName);
@@
-84,7
+83,7
@@
public class AaiQuery {
}
private String getVnfDataResponse(String vnfId, String vnfName) throws CorrelationException {
}
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);
if ("".equals(response) || "{}".equals(response)) {
url = getBaseUrl(AaiConfig.AAI_VNF_ADDR + "vnf-name=" + vnfName);
String response = getResponse(url);
if ("".equals(response) || "{}".equals(response)) {
url = getBaseUrl(AaiConfig.AAI_VNF_ADDR + "vnf-name=" + vnfName);
@@
-96,13
+95,14
@@
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.getMsbServerAddr().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.getServiceAddrInfoFromCBS("aai_config")
+ suffixUrl;
} catch (Exception e) {
log.info("Failed to get aai address");
+ suffixUrl;
} catch (Exception e) {
log.info("Failed to get aai address");
@@
-113,9
+113,18
@@
public class AaiQuery {
private String getMsbSuffixAddr(String suffixUrl) {
String[] addrSplits = suffixUrl.substring(1).split("/");
private String getMsbSuffixAddr(String suffixUrl) {
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);