private String getVmUrl(String vserverId, String vserverName) throws CorrelationException {
String url = "";
String resourceLinkUrl = getVmResourceLinks(vserverId, vserverName);
- String baseUrl = getBaseUrl("");
- if (baseUrl.startsWith("http")) {
- url = baseUrl + getMsbSuffixAddr(resourceLinkUrl);
- } else {
- url = baseUrl + resourceLinkUrl;
- }
- return url;
+ return getBaseUrl("") + resourceLinkUrl;
}
private String getVmResourceLinks(String vserverId, String vserverName) throws CorrelationException {
String response = getResourceLinksResponse(vserverId, vserverName);
List linkList = aaiResponseUtil.convertJsonToVmResourceLink(response);
- if (linkList.size() != 0) {
+ if (!linkList.isEmpty()) {
return aaiResponseUtil.convertJsonToVmResourceLink(response).get(0).getResourceLink();
}
return "";
}
private String getResourceLinksResponse(String vserverId, String vserverName) throws CorrelationException {
- String url = getBaseUrl(getMsbSuffixAddr(AaiConfig.AaiConsts.AAI_VM_ADDR) + "vserver-id:EQUALS:" + vserverId);
+ String url = getBaseUrl(AaiConfig.AaiConsts.AAI_VM_ADDR + "vserver-id:EQUALS:" + vserverId);
String response = getResponse(url);
if ("".equals(response) || "{}".equals(response)) {
- url = getBaseUrl(getMsbSuffixAddr(AaiConfig.AaiConsts.AAI_VM_ADDR) + "vserver-name:EQUALS:" + vserverName);
+ url = getBaseUrl(AaiConfig.AaiConsts.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.AaiConsts.AAI_VNF_ADDR)+ "/" + vnfId);
+ String url = getBaseUrl(AaiConfig.AaiConsts.AAI_VNF_ADDR+ "/" + vnfId);
String response = getResponse(url);
if ("".equals(response) || "{}".equals(response)) {
- url = getBaseUrl(getMsbSuffixAddr(AaiConfig.AaiConsts.AAI_VNF_ADDR) + "vnf-name=" + vnfName);
+ url = getBaseUrl(AaiConfig.AaiConsts.AAI_VNF_ADDR + "?vnf-name=" + vnfName);
response = getResponse(url);
}
return response;
private String getBaseUrl(String suffixUrl) {
String url = "";
try {
- String[] msbUrl = MicroServiceConfig.getMsbServerAddrWithHttpPrefix().split(":");
- url = msbUrl[0] + ":" + msbUrl[1] + suffixUrl;
+ url = MicroServiceConfig.getMsbServerAddrWithHttpPrefix()+ suffixUrl;
} catch (Exception e) {
log.info("Failed to get msb address");
}
addrSplits[1] = addrSplits[0] + "-" + addrSplits[2];
addrSplits[2] = ret;
addrSplits[0] = "api";
- StringBuffer stringBuffer = new StringBuffer();
+ StringBuilder stringBuffer = new StringBuilder();
for (String split : addrSplits) {
stringBuffer.append("/" + split);
}