X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=holmes-actions%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Fcommon%2Faai%2FAaiQuery.java;h=683836ea8da13ecb0bd8100cad30c2b5305bba94;hb=75b8475a3c9a55a154db8d5d2a05dd5f993907a0;hp=2a8d3e97c0ab1d555b1e9c6d39ba2fc79d52fca1;hpb=a7d62526f2e0752bd1daf84844ed137158aa3cff;p=holmes%2Fcommon.git

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 2a8d3e9..683836e 100644
--- 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
@@ -60,13 +60,7 @@ public class AaiQuery {
     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 {
@@ -79,20 +73,20 @@ public class AaiQuery {
     }
 
     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;