X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=holmes-actions%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Fcommon%2Faai%2FAaiQuery.java;h=f409c27c57b67a934c53ef74c2f21330331e04bf;hb=490fc3c1fafe50d5fb0e23db5cfd10730be96866;hp=ef11769eb9c98d63c19253d1e4266402c1964545;hpb=b54a82564793ad96f5704daa371cd64a6187199a;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 ef11769..f409c27 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
@@ -13,25 +13,23 @@
  */
 package org.onap.holmes.common.aai;
 
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.inject.Inject;
-
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpRequestBase;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.jvnet.hk2.annotations.Service;
 import org.onap.holmes.common.aai.config.AaiConfig;
 import org.onap.holmes.common.aai.entity.VmEntity;
 import org.onap.holmes.common.aai.entity.VnfEntity;
-import org.onap.holmes.common.config.MicroServiceConfig;
 import org.onap.holmes.common.exception.CorrelationException;
 import org.onap.holmes.common.utils.HttpsUtils;
 
+import javax.inject.Inject;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 @Service
 @Slf4j
 public class AaiQuery {
@@ -59,7 +57,6 @@ public class AaiQuery {
     }
 
     private String getVmUrl(String vserverId, String vserverName) throws CorrelationException {
-        String url = "";
         String resourceLinkUrl = getVmResourceLinks(vserverId, vserverName);
         return getBaseUrl("") + resourceLinkUrl;
     }
@@ -94,31 +91,7 @@ public class AaiQuery {
     }
 
     private String getBaseUrl(String suffixUrl) {
-        return "https://aai.onap" + suffixUrl;
-    }
-
-    private String getMsbSuffixAddr(String suffixUrl) {
-        if (suffixUrl.length() <= 0) {
-            return "";
-        }
-        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[0] + "-" + addrSplits[2];
-        addrSplits[2] = ret;
-        addrSplits[0] = "api";
-        StringBuilder stringBuffer = new StringBuilder();
-        for (String split : addrSplits) {
-            stringBuffer.append("/" + split);
-        }
-        return stringBuffer.toString();
+        return "https://aai.onap:8443" + suffixUrl;
     }
 
     private String getResponse(String url) throws CorrelationException {
@@ -126,7 +99,7 @@ public class AaiQuery {
         CloseableHttpClient httpClient = null;
         HttpGet httpGet = new HttpGet(url);
         try {
-            httpClient = HttpsUtils.getHttpClient(HttpsUtils.DEFUALT_TIMEOUT);
+            httpClient = HttpsUtils.getHttpsClient(HttpsUtils.DEFUALT_TIMEOUT);
             HttpResponse httpResponse = HttpsUtils.get(httpGet, getHeaders(), httpClient);
             response = HttpsUtils.extractResponseEntity(httpResponse);
         } catch (Exception e) {