private String getVmResourceLinks(String vserverId, String vserverName) throws CorrelationException {
String response = getResourceLinksResponse(vserverId, vserverName);
- try {
- return aaiResponseUtil.convertJsonToVmResourceLink(response).get(0).getResourceLink();
- } catch (Exception e) {
- throw new CorrelationException("Failed to get aai resource link", e);
- }
+ return aaiResponseUtil.convertJsonToVmResourceLink(response).get(0).getResourceLink();
}
private String getResourceLinksResponse(String vserverId, String vserverName) throws CorrelationException {
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;
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 {
- String[] msbUrl = MicroServiceConfig.getMsbServerAddr().split(":");
+ String[] msbUrl = MicroServiceConfig.getMsbServerAddrWithHttpPrefix().split(":");
url = msbUrl[0] + ":" + msbUrl[1] + suffixUrl;
} catch (Exception e) {
log.info("Failed to get msb address");
}
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;