summaryrefslogtreecommitdiffstats
path: root/holmes-actions/src/main
diff options
context:
space:
mode:
authorGuangrongFu <fu.guangrong@zte.com.cn>2018-11-02 09:16:06 +0800
committerGuangrongFu <fu.guangrong@zte.com.cn>2018-11-02 09:16:06 +0800
commitb54a82564793ad96f5704daa371cd64a6187199a (patch)
tree5813e0c78ab6b8310da927f38507f67864e2517b /holmes-actions/src/main
parent75b8475a3c9a55a154db8d5d2a05dd5f993907a0 (diff)
Fixed the AAI Query Problem1.2.5
Change-Id: I07062658fe6e23e7b6bf1f194d480a3e1c322ec9 Issue-ID: HOLMES-177 Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
Diffstat (limited to 'holmes-actions/src/main')
-rw-r--r--holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery.java29
-rw-r--r--holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java5
2 files changed, 13 insertions, 21 deletions
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 683836e..ef11769 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
@@ -1,11 +1,11 @@
/**
* Copyright 2017 ZTE Corporation.
- *
+ * <p>
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
- *
+ * <p>
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
@@ -18,6 +18,7 @@ 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;
@@ -69,7 +70,7 @@ public class AaiQuery {
if (!linkList.isEmpty()) {
return aaiResponseUtil.convertJsonToVmResourceLink(response).get(0).getResourceLink();
}
- return "";
+ return "";
}
private String getResourceLinksResponse(String vserverId, String vserverName) throws CorrelationException {
@@ -83,7 +84,7 @@ public class AaiQuery {
}
private String getVnfDataResponse(String vnfId, String vnfName) throws CorrelationException {
- String url = getBaseUrl(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(AaiConfig.AaiConsts.AAI_VNF_ADDR + "?vnf-name=" + vnfName);
@@ -93,21 +94,7 @@ public class AaiQuery {
}
private String getBaseUrl(String suffixUrl) {
- String url = "";
- try {
- url = MicroServiceConfig.getMsbServerAddrWithHttpPrefix()+ suffixUrl;
- } catch (Exception e) {
- log.info("Failed to get msb address");
- }
- if ("".equals(url)) {
- try {
- url = "https://" + MicroServiceConfig.getServiceConfigInfoFromCBS("aai_config").replace("http://", "")
- + suffixUrl;
- } catch (Exception e) {
- log.info("Failed to get the address of A&AI.", e);
- }
- }
- return url;
+ return "https://aai.onap" + suffixUrl;
}
private String getMsbSuffixAddr(String suffixUrl) {
@@ -118,7 +105,7 @@ public class AaiQuery {
String[] conv = addrSplits[2].split("-");
addrSplits[2] = conv[0];
if (conv.length > 1) {
- for(int i = 1; i < conv.length; i++) {
+ for (int i = 1; i < conv.length; i++) {
addrSplits[2] = addrSplits[2] + conv[i].substring(0, 1).toUpperCase() + conv[i]
.substring(1);
}
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java b/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
index 66daebf..f0cad0e 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
@@ -38,6 +38,7 @@ public class MicroServiceConfig {
final static public String DOCKER_HOST = "DOCKER_HOST";
final static public String MSB_ADDR = "MSB_ADDR";
final static public Pattern IP_REG = Pattern.compile("(http(s)?://)?(\\d+\\.\\d+\\.\\d+\\.\\d+)(:(\\d+))?");
+ final static public String AAI_HOSTNAME = "aai.onap";
public static String getEnv(String name) {
String value = System.getenv(name);
@@ -96,6 +97,10 @@ public class MicroServiceConfig {
return ret;
}
+ public static String getAaiAddr() {
+ return AlarmConst.HTTPS + AAI_HOSTNAME;
+ }
+
public static String[] getMsbIpAndPort() {
return split(getEnv(MSB_ADDR));
}