X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=holmes-actions%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Fcommon%2Faai%2FAaiQuery4Ccvpn.java;h=9feba18d64ea047736120e4d11df54821ca51e59;hb=490fc3c1fafe50d5fb0e23db5cfd10730be96866;hp=89cc9914a16e74973a4dc0fa4d6cb3e58402748c;hpb=5728f2d081afbf4c89d2128ba952200877155f7d;p=holmes%2Fcommon.git diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn.java b/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn.java index 89cc991..9feba18 100644 --- a/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn.java +++ b/holmes-actions/src/main/java/org/onap/holmes/common/aai/AaiQuery4Ccvpn.java @@ -1,5 +1,5 @@ /** - * Copyright 2018 ZTE Corporation. + * Copyright 2018-2020 ZTE Corporation. *

* 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 @@ -14,13 +14,16 @@ package org.onap.holmes.common.aai; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.google.gson.Gson; +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; import org.glassfish.jersey.client.HttpUrlConnectorProvider; import org.onap.holmes.common.aai.config.AaiConfig; import org.onap.holmes.common.config.MicroServiceConfig; import org.onap.holmes.common.exception.CorrelationException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; @@ -36,12 +39,18 @@ import java.util.regex.Pattern; public class AaiQuery4Ccvpn { + private final Logger log = LoggerFactory.getLogger(AaiQuery4Ccvpn.class); + private MultivaluedMap headers; - static public AaiQuery4Ccvpn newInstance() { + public static AaiQuery4Ccvpn newInstance() { return new AaiQuery4Ccvpn(); } + private static final String EMPTY_STR = ""; + + private static final JsonObject EMPTY_JSON = new JsonObject(); + private AaiQuery4Ccvpn() { headers = new MultivaluedHashMap<>(); headers.add("X-TransactionId", AaiConfig.X_TRANSACTION_ID); @@ -70,8 +79,13 @@ public class AaiQuery4Ccvpn { Response response = get(getHostAddr(), getPath(AaiConfig.MsbConsts.AAI_LINK_QUERY, params) + (status == null ? "" : String.format("&operational-status=%s", status))); - JSONObject linkInfo = getInfo(response.readEntity(String.class), "p-interface", "logical-link"); - return extractValueFromJsonArray(linkInfo.getJSONArray("relationship-data"), "logical-link.link-name"); + JsonObject linkInfo = getInfo(response.readEntity(String.class), "p-interface", "logical-link"); + if (linkInfo == null) { + log.warn(String.format("Link information is missing from AAI. Method: [getLogicLink], " + + "params: [networkId - %s, pnfName - %s, ifName - %s].", networkId, pnfName, ifName)); + return EMPTY_STR; + } + return extractValueFromJsonArray(linkInfo.get("relationship-data").getAsJsonArray(), "logical-link.link-name"); } /** @@ -87,31 +101,49 @@ public class AaiQuery4Ccvpn { * @param status * @return service instances in JSONObject format */ - public JSONObject getServiceInstance(String networkId, String pnfName, String ifName, String status) { + public JsonObject getServiceInstance(String networkId, String pnfName, String ifName, String status) { try { - JSONObject vpnBindingInfo = getVpnBindingInfo(networkId, pnfName, ifName, status); - String vpnBindingId = extractValueFromJsonArray(vpnBindingInfo.getJSONArray("relationship-data"), - "vpn-binding.vpn-id"); - JSONObject connectivityInfo = getConnectivityInfo(vpnBindingId); - String connectivityId = extractValueFromJsonArray(connectivityInfo.getJSONArray("relationship-data"), - "connectivity.connectivity-id"); - JSONObject serviceInstanceInfo = getServiceInstanceByConn(connectivityId); - String serviceInstancePath = serviceInstanceInfo.getString("related-link"); + JsonObject vpnBindingInfo = getVpnBindingInfo(networkId, pnfName, ifName, status); + if (vpnBindingInfo == null) { + log.warn(String.format("VPN binding information is missing from AAI. " + + "Method: [getServiceInstance], params: [networkId - %s, pnfName - %s, " + + "ifName - %s, status - %s].", networkId, pnfName, ifName, status)); + return EMPTY_JSON; + } + String vpnBindingId = extractValueFromJsonArray(vpnBindingInfo.get("relationship-data").getAsJsonArray(), + "vpn-binding.vpn-id"); + JsonObject connectivityInfo = getConnectivityInfo(vpnBindingId); + if (connectivityInfo == null) { + log.warn(String.format("Connectivity information is missing from AAI. " + + "Method: [getServiceInstance], params: [networkId - %s, pnfName - %s, " + + "ifName - %s, status - %s].", networkId, pnfName, ifName, status)); + return EMPTY_JSON; + } + String connectivityId = extractValueFromJsonArray(connectivityInfo.get("relationship-data").getAsJsonArray(), + "connectivity.connectivity-id"); + JsonObject serviceInstanceInfo = getServiceInstanceByConn(connectivityId); + if (serviceInstanceInfo == null) { + log.warn(String.format("Service instance information is missing from AAI. " + + "Method: [getServiceInstance], params: [networkId - %s, pnfName - %s, " + + "ifName - %s, status - %s].", networkId, pnfName, ifName, status)); + return EMPTY_JSON; + } + String serviceInstancePath = serviceInstanceInfo.get("related-link").getAsString(); Response response = get(getHostAddr(), getPath(serviceInstancePath)); - JSONObject instance = JSON.parseObject(response.readEntity(String.class)); + JsonObject instance = JsonParser.parseString(response.readEntity(String.class)).getAsJsonObject(); String[] params = new String[2]; Pattern pattern = Pattern.compile("/aai/v\\d+/business/customers/customer/(.+)" + - "/service-subscriptions/service-subscription/(.+)" + - "/service-instances/service-instance/(.+)"); + "/service-subscriptions/service-subscription/(.+)" + + "/service-instances/service-instance/(.+)"); Matcher matcher = pattern.matcher(serviceInstancePath); if (matcher.find()) { params[0] = matcher.group(1); params[1] = matcher.group(2); } - instance.put("globalSubscriberId", params[0]); - instance.put("serviceType", params[1]); + instance.addProperty("globalSubscriberId", params[0]); + instance.addProperty("serviceType", params[1]); return instance; } catch (CorrelationException e) { throw new RuntimeException(e.getMessage(), e); @@ -125,7 +157,7 @@ public class AaiQuery4Ccvpn { params.put("pnfName", pnfName); params.put("ifName", ifName); Response r = get(getHostAddr(), getPath(AaiConfig.MsbConsts.AAI_TP_UPDATE, params)); - JSONObject jsonObject = JSONObject.parseObject(r.readEntity(String.class)); + JsonObject jsonObject = JsonParser.parseString(r.readEntity(String.class)).getAsJsonObject(); body.put("resource-version", jsonObject.get("resource-version").toString()); put(getHostAddr(), getPath(AaiConfig.MsbConsts.AAI_TP_UPDATE, params), body); @@ -133,13 +165,13 @@ public class AaiQuery4Ccvpn { public void updateLogicLinkStatus(String linkName, Map body) throws CorrelationException { Response r = get(getHostAddr(), getPath(AaiConfig.MsbConsts.AAI_LINK_UPDATE, "linkName", linkName)); - JSONObject jsonObject = JSONObject.parseObject(r.readEntity(String.class)); + JsonObject jsonObject = JsonParser.parseString(r.readEntity(String.class)).getAsJsonObject(); body.put("resource-version", jsonObject.get("resource-version").toString()); body.put("link-type", jsonObject.get("link-type").toString()); put(getHostAddr(), getPath(AaiConfig.MsbConsts.AAI_LINK_UPDATE, "linkName", linkName), body); } - private JSONObject getVpnBindingInfo(String networkId, String pnfName, + private JsonObject getVpnBindingInfo(String networkId, String pnfName, String ifName, String status) throws CorrelationException { Map params = new HashMap(); params.put("networkId", networkId); @@ -150,29 +182,29 @@ public class AaiQuery4Ccvpn { return getInfo(response.readEntity(String.class), "p-interface", "vpn-binding"); } - private JSONObject getConnectivityInfo(String vpnId) throws CorrelationException { + private JsonObject getConnectivityInfo(String vpnId) throws CorrelationException { Response response = get(getHostAddr(), getPath(AaiConfig.MsbConsts.AAI_CONN_ADDR, "vpnId", vpnId)); return getInfo(response.readEntity(String.class), "vpn-binding", "connectivity"); } - private JSONObject getServiceInstanceByConn(String connectivityId) throws CorrelationException { + private JsonObject getServiceInstanceByConn(String connectivityId) throws CorrelationException { Response response = get(getHostAddr(), getPath(AaiConfig.MsbConsts.AAI_SERVICE_INSTANCE_ADDR_4_CCVPN, - "connectivityId", connectivityId)); + "connectivityId", connectivityId)); return getInfo(response.readEntity(String.class), "connectivity", "service-instance"); } - private JSONObject getServiceInstance(String globalCustomerId, String serviceType) throws CorrelationException { + private JsonObject getServiceInstance(String globalCustomerId, String serviceType) throws CorrelationException { Map params = new HashMap(); params.put("global-customer-id", globalCustomerId); params.put("service-type", serviceType); Response response = get(getHostAddr(), getPath(AaiConfig.MsbConsts.AAI_SERVICE_INSTANCES_ADDR_4_CCVPN, params)); - return JSON.parseObject(response.readEntity(String.class)); + return JsonParser.parseString(response.readEntity(String.class)).getAsJsonObject(); } private String getPath(String urlTemplate, Map pathParams) { String url = urlTemplate; - for (String key : pathParams.keySet()) { - url = url.replaceAll("\\{" + key + "\\}", pathParams.get(key)); + for (Map.Entry entry : pathParams.entrySet()) { + url = url.replaceAll("\\{" + entry.getKey() + "\\}", entry.getValue()); } return url; } @@ -199,15 +231,15 @@ public class AaiQuery4Ccvpn { Response response = target.request().headers(getAaiHeaders()).get(); if (response.getStatusInfo().getFamily() != Response.Status.Family.SUCCESSFUL) { throw new CorrelationException("Failed to connect to AAI. \nCause: " - + response.getStatusInfo().getReasonPhrase() + "\nDetails: \n" - + getErrorMsg(String.format("%s%s", host, path), null, response)); + + response.getStatusInfo().getReasonPhrase() + "\nDetails: \n" + + getErrorMsg(String.format("%s%s", host, path), null, response)); } return response; } catch (CorrelationException e) { throw e; } catch (Exception e) { throw new CorrelationException(e.getMessage() + "More info: " - + getErrorMsg(String.format("%s%s", host, path), null, null), e); + + getErrorMsg(String.format("%s%s", host, path), null, null), e); } } @@ -219,29 +251,29 @@ public class AaiQuery4Ccvpn { .property(HttpUrlConnectorProvider.SET_METHOD_WORKAROUND, true).invoke(); if (response.getStatusInfo().getFamily() != Response.Status.Family.SUCCESSFUL) { throw new CorrelationException("Failed to connect to AAI. \nCause: " - + response.getStatusInfo().getReasonPhrase() + "\nDetails: \n" - + getErrorMsg(String.format("%s%s", host, path), body, response)); + + response.getStatusInfo().getReasonPhrase() + "\nDetails: \n" + + getErrorMsg(String.format("%s%s", host, path), body, response)); } } catch (CorrelationException e) { throw e; } catch (Exception e) { throw new CorrelationException(e.getMessage() + "More info: " - + getErrorMsg(String.format("%s%s", host, path), body, null), e); + + getErrorMsg(String.format("%s%s", host, path), body, null), e); } } - private JSONObject getInfo(String response, String pField, String field) { - JSONObject jObject = JSONObject.parseObject(response); - JSONObject pInterface = extractJsonObject(jObject, pField); + private JsonObject getInfo(String response, String pField, String field) { + JsonObject jObject = JsonParser.parseString(response).getAsJsonObject(); + JsonObject pInterface = extractJsonObject(jObject, pField); if (pInterface == null) { pInterface = jObject; } - JSONObject relationshipList = extractJsonObject(pInterface, "relationship-list"); - JSONArray relationShip = extractJsonArray(relationshipList, "relationship"); + JsonObject relationshipList = extractJsonObject(pInterface, "relationship-list"); + JsonArray relationShip = extractJsonArray(relationshipList, "relationship"); if (relationShip != null) { for (int i = 0; i < relationShip.size(); ++i) { - final JSONObject object = relationShip.getJSONObject(i); - if (object.getString("related-to").equals(field)) { + final JsonObject object = relationShip.get(i).getAsJsonObject(); + if (object.get("related-to").getAsString().equals(field)) { return object; } } @@ -249,16 +281,16 @@ public class AaiQuery4Ccvpn { return null; } - private JSONObject extractJsonObject(JSONObject obj, String key) { - if (obj != null && key != null && obj.containsKey(key)) { - return obj.getJSONObject(key); + private JsonObject extractJsonObject(JsonObject obj, String key) { + if (obj != null && key != null && obj.has(key)) { + return obj.get(key).getAsJsonObject(); } return null; } - private JSONArray extractJsonArray(JSONObject obj, String key) { - if (obj != null && key != null && obj.containsKey(key)) { - return obj.getJSONArray(key); + private JsonArray extractJsonArray(JsonObject obj, String key) { + if (obj != null && key != null && obj.has(key)) { + return obj.get(key).getAsJsonArray(); } return null; } @@ -271,22 +303,25 @@ public class AaiQuery4Ccvpn { return MicroServiceConfig.getMsbServerAddrWithHttpPrefix(); } - private String extractValueFromJsonArray(JSONArray relationshipData, String keyName) { - for (int i = 0; i < relationshipData.size(); ++i) { - JSONObject item = relationshipData.getJSONObject(i); - if (item.getString("relationship-key").equals(keyName)) { - return item.getString("relationship-value"); + private String extractValueFromJsonArray(JsonArray relationshipData, String keyName) { + if (relationshipData != null) { + for (int i = 0; i < relationshipData.size(); ++i) { + JsonObject item = relationshipData.get(i).getAsJsonObject(); + if (item.get("relationship-key").getAsString().equals(keyName)) { + return item.get("relationship-value").getAsString(); + } } } return null; } private String getErrorMsg(String url, Map body, Response response) { + Gson gson = new Gson(); StringBuilder sb = new StringBuilder(); sb.append("Rerquest URL: ").append(url).append("\n"); - sb.append("Request Header: ").append(JSONObject.toJSONString(headers)).append("\n"); + sb.append("Request Header: ").append(gson.toJson(headers)).append("\n"); if (body != null) { - sb.append("Request Body: ").append(JSONObject.toJSONString(body)).append("\n"); + sb.append("Request Body: ").append(gson.toJson(body)).append("\n"); } if (response != null) { sb.append("Request Body: ").append(response.readEntity(String.class));