}
private String getResourceLinksResponse(String vserverId, String vserverName) throws CorrelationException {
- String url = getBaseUrl(getMsbSuffixAddr(AaiConfig.AAI_VNF_ADDR) + "vserver-id:EQUALS:" + vserverId);
+ String url = getBaseUrl(getMsbSuffixAddr(AaiConfig.AAI_VM_ADDR) + "vserver-id:EQUALS:" + vserverId);
String response = getResponse(url);
if ("".equals(response) || "{}".equals(response)) {
- url = getBaseUrl(AaiConfig.AAI_VM_ADDR + "vserver-name:EQUALS:" + vserverName);
+ 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 {
- String url = getBaseUrl(getMsbSuffixAddr(AaiConfig.AAI_VM_ADDR)+ "vnf-id=" + vnfId);
+ String url = getBaseUrl(getMsbSuffixAddr(AaiConfig.AAI_VNF_ADDR)+ "/" + vnfId);
String response = getResponse(url);
if ("".equals(response) || "{}".equals(response)) {
- url = getBaseUrl(AaiConfig.AAI_VNF_ADDR + "vnf-name=" + vnfName);
+ url = getBaseUrl(getMsbSuffixAddr(AaiConfig.AAI_VNF_ADDR) + "vnf-name=" + vnfName);
response = getResponse(url);
}
return response;
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");
}
- if (url.equals("")) {
+ if ("".equals(url)) {
try {
- url = "https:\\\\" + MicroServiceConfig.getServiceAddrInfoFromCBS("aai_config")
+ url = "https://" + MicroServiceConfig.getServiceConfigInfoFromCBS("aai_config").replace("http://", "")
+ 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) {
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];
- addrSplits[1] = addrSplits[2];
+ addrSplits[1] = addrSplits[0] + "-" + addrSplits[2];
addrSplits[2] = ret;
+ addrSplits[0] = "api";
StringBuffer stringBuffer = new StringBuffer();
for (String split : addrSplits) {
stringBuffer.append("/" + split);