From: GuangrongFu Date: Thu, 10 Jun 2021 03:40:40 +0000 (+0800) Subject: Refactored AaiQuery4Ccvpn and related classes X-Git-Tag: 1.3.5~4 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=holmes%2Fcommon.git;a=commitdiff_plain;h=6f99775bd30cea7a2471ba37b875067a40bd5aeb Refactored AaiQuery4Ccvpn and related classes Change-Id: Ie2971a4f03a0b8e1897e66430b2e0880abd2abcb Issue-ID: HOLMES-442 Signed-off-by: GuangrongFu --- 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 9feba18..c34c405 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 @@ -14,24 +14,16 @@ package org.onap.holmes.common.aai; -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.onap.holmes.common.utils.JerseyClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; import java.util.HashMap; import java.util.Map; import java.util.regex.Matcher; @@ -41,7 +33,7 @@ public class AaiQuery4Ccvpn { private final Logger log = LoggerFactory.getLogger(AaiQuery4Ccvpn.class); - private MultivaluedMap headers; + private Map headers; public static AaiQuery4Ccvpn newInstance() { return new AaiQuery4Ccvpn(); @@ -52,12 +44,12 @@ public class AaiQuery4Ccvpn { private static final JsonObject EMPTY_JSON = new JsonObject(); private AaiQuery4Ccvpn() { - headers = new MultivaluedHashMap<>(); - headers.add("X-TransactionId", AaiConfig.X_TRANSACTION_ID); - headers.add("X-FromAppId", AaiConfig.X_FROMAPP_ID); - headers.add("Authorization", AaiConfig.getAuthenticationCredentials()); - headers.add("Accept", "application/json"); - headers.add("Content-Type", "application/json"); + headers = new HashMap<>(); + headers.put("X-TransactionId", AaiConfig.X_TRANSACTION_ID); + headers.put("X-FromAppId", AaiConfig.X_FROMAPP_ID); + headers.put("Authorization", AaiConfig.getAuthenticationCredentials()); + headers.put("Accept", "application/json"); + headers.put("Content-Type", "application/json"); } /** @@ -71,15 +63,17 @@ public class AaiQuery4Ccvpn { * @param status * @return the ID of the logic link */ - public String getLogicLink(String networkId, String pnfName, String ifName, String status) throws CorrelationException { + public String getLogicLink(String networkId, String pnfName, String ifName, String status) { Map params = new HashMap<>(); params.put("networkId", networkId); params.put("pnfName", pnfName); params.put("ifName", ifName); - Response response = get(getHostAddr(), getPath(AaiConfig.MsbConsts.AAI_LINK_QUERY, params) + String response = get(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"); + + JsonObject linkInfo = getInfo(response, "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)); @@ -102,103 +96,93 @@ public class AaiQuery4Ccvpn { * @return service instances in JSONObject format */ public JsonObject getServiceInstance(String networkId, String pnfName, String ifName, String status) { - try { - 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 = 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/(.+)"); - Matcher matcher = pattern.matcher(serviceInstancePath); - if (matcher.find()) { - params[0] = matcher.group(1); - params[1] = matcher.group(2); - } - instance.addProperty("globalSubscriberId", params[0]); - instance.addProperty("serviceType", params[1]); - return instance; - } catch (CorrelationException e) { - throw new RuntimeException(e.getMessage(), e); + 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(); + + String response = get(serviceInstancePath); + JsonObject instance = JsonParser.parseString(response).getAsJsonObject(); + + String[] params = new String[2]; + Pattern pattern = Pattern.compile("/aai/v\\d+/business/customers/customer/(.+)" + + "/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.addProperty("globalSubscriberId", params[0]); + instance.addProperty("serviceType", params[1]); + return instance; } + public void updateTerminalPointStatus(String networkId, String pnfName, String ifName, - Map body) throws CorrelationException { + Map body) { Map params = new HashMap<>(); params.put("networkId", networkId); params.put("pnfName", pnfName); params.put("ifName", ifName); - Response r = get(getHostAddr(), getPath(AaiConfig.MsbConsts.AAI_TP_UPDATE, params)); - JsonObject jsonObject = JsonParser.parseString(r.readEntity(String.class)).getAsJsonObject(); + String r = get(getPath(AaiConfig.MsbConsts.AAI_TP_UPDATE, params)); + JsonObject jsonObject = JsonParser.parseString(r).getAsJsonObject(); body.put("resource-version", jsonObject.get("resource-version").toString()); - put(getHostAddr(), getPath(AaiConfig.MsbConsts.AAI_TP_UPDATE, params), body); + put(getPath(AaiConfig.MsbConsts.AAI_TP_UPDATE, params), body); } - public void updateLogicLinkStatus(String linkName, Map body) throws CorrelationException { - Response r = get(getHostAddr(), getPath(AaiConfig.MsbConsts.AAI_LINK_UPDATE, "linkName", linkName)); - JsonObject jsonObject = JsonParser.parseString(r.readEntity(String.class)).getAsJsonObject(); + + public void updateLogicLinkStatus(String linkName, Map body) { + String r = get(getPath(AaiConfig.MsbConsts.AAI_LINK_UPDATE, "linkName", linkName)); + JsonObject jsonObject = JsonParser.parseString(r).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); + put(getPath(AaiConfig.MsbConsts.AAI_LINK_UPDATE, "linkName", linkName), body); } private JsonObject getVpnBindingInfo(String networkId, String pnfName, - String ifName, String status) throws CorrelationException { + String ifName, String status) { Map params = new HashMap(); params.put("networkId", networkId); params.put("pnfName", pnfName); params.put("ifName", ifName); params.put("status", status); - Response response = get(getHostAddr(), getPath(AaiConfig.MsbConsts.AAI_VPN_ADDR, params)); - return getInfo(response.readEntity(String.class), "p-interface", "vpn-binding"); + String response = get(getPath(AaiConfig.MsbConsts.AAI_VPN_ADDR, params)); + return getInfo(response, "p-interface", "vpn-binding"); } - 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 getConnectivityInfo(String vpnId) { + String response = get(getPath(AaiConfig.MsbConsts.AAI_CONN_ADDR, "vpnId", vpnId)); + return getInfo(response, "vpn-binding", "connectivity"); } - private JsonObject getServiceInstanceByConn(String connectivityId) throws CorrelationException { - Response response = get(getHostAddr(), getPath(AaiConfig.MsbConsts.AAI_SERVICE_INSTANCE_ADDR_4_CCVPN, + private JsonObject getServiceInstanceByConn(String connectivityId) { + String response = get(getPath(AaiConfig.MsbConsts.AAI_SERVICE_INSTANCE_ADDR_4_CCVPN, "connectivityId", connectivityId)); - return getInfo(response.readEntity(String.class), "connectivity", "service-instance"); - } - - 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 JsonParser.parseString(response.readEntity(String.class)).getAsJsonObject(); + return getInfo(response, "connectivity", "service-instance"); } private String getPath(String urlTemplate, Map pathParams) { @@ -224,44 +208,6 @@ public class AaiQuery4Ccvpn { return ret; } - private Response get(String host, String path) throws CorrelationException { - Client client = ClientBuilder.newClient(); - WebTarget target = client.target(host).path(path); - try { - 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)); - } - 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); - } - } - - private void put(String host, String path, Map body) throws CorrelationException { - Client client = ClientBuilder.newClient(); - WebTarget target = client.target(host).path(path); - try { - Response response = target.request().headers(getAaiHeaders()).build("PUT", Entity.json(body)) - .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)); - } - } 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); - } - } - private JsonObject getInfo(String response, String pField, String field) { JsonObject jObject = JsonParser.parseString(response).getAsJsonObject(); JsonObject pInterface = extractJsonObject(jObject, pField); @@ -295,10 +241,6 @@ public class AaiQuery4Ccvpn { return null; } - private MultivaluedMap getAaiHeaders() { - return headers; - } - private String getHostAddr() { return MicroServiceConfig.getMsbServerAddrWithHttpPrefix(); } @@ -315,17 +257,11 @@ public class AaiQuery4Ccvpn { 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(gson.toJson(headers)).append("\n"); - if (body != null) { - sb.append("Request Body: ").append(gson.toJson(body)).append("\n"); - } - if (response != null) { - sb.append("Request Body: ").append(response.readEntity(String.class)); - } - return sb.toString(); + private String get(String path) { + return JerseyClient.newInstance().path(path).headers(headers).get(getHostAddr()); + } + + private String put(String path, Map body) { + return JerseyClient.newInstance().path(path).headers(headers).put(getHostAddr(), Entity.json(body)); } } 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 43fef11..97c7141 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 @@ -19,14 +19,10 @@ import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import org.onap.holmes.common.constant.AlarmConst; +import org.onap.holmes.common.utils.JerseyClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.Response; -import java.util.regex.Pattern; - import static org.onap.holmes.common.utils.CommonUtils.getEnv; import static org.onap.holmes.common.utils.CommonUtils.isIpAddress; @@ -37,7 +33,6 @@ public class MicroServiceConfig { final static public String HOSTNAME = "HOSTNAME"; final static public String POD_IP = "POD_IP"; final static public String CONFIG_BINDING_SERVICE = "CONFIG_BINDING_SERVICE"; - final static public String DOCKER_HOST = "DOCKER_HOST"; final static public String MSB_ADDR = "MSB_ADDR"; final static public String MSB_IAG_SERVICE_HOST = "MSB_IAG_SERVICE_HOST"; final static public String MSB_IAG_SERVICE_PORT = "MSB_IAG_SERVICE_PORT"; @@ -74,19 +69,12 @@ public class MicroServiceConfig { } private static String execQuery(String queryString) { - Client client = ClientBuilder.newBuilder().build(); - Response response = client.target(queryString).request().get(); - return response.readEntity(String.class); + return JerseyClient.newInstance().get(queryString); } public static String getServiceConfigInfoFromCBS(String hostname) { - String ret = null; String url = getServiceAddrInfoFromDcaeConsulByHostName(getEnv(CONFIG_BINDING_SERVICE)) + "/service_component/" + hostname; - try { - ret = execQuery(url); - } catch (Exception e) { - log.warn(e.getMessage(), e); - } + String ret = execQuery(url); log.info("The query url is: " + url + ". The corresponding configurations are " + ret); return ret; } @@ -125,7 +113,6 @@ public class MicroServiceConfig { } - private static String[] split(String addr) { String ip; String port = "80"; diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4CcvpnTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4CcvpnTest.java index f1855f9..55e7b6b 100644 --- a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4CcvpnTest.java +++ b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4CcvpnTest.java @@ -1,5 +1,5 @@ /** - * Copyright 2018-2020 ZTE Corporation. + * Copyright 2018-2021 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 @@ -17,34 +17,30 @@ package org.onap.holmes.common.aai; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import org.easymock.EasyMock; -import org.glassfish.jersey.client.HttpUrlConnectorProvider; import org.junit.*; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.onap.holmes.common.aai.config.AaiConfig; import org.onap.holmes.common.exception.CorrelationException; +import org.onap.holmes.common.utils.JerseyClient; import org.powermock.api.easymock.PowerMock; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import javax.ws.rs.client.*; -import javax.ws.rs.client.Invocation.Builder; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; import java.io.*; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.util.HashMap; +import java.util.Map; +import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.anyString; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; import static org.onap.holmes.common.config.MicroServiceConfig.MSB_ADDR; @RunWith(PowerMockRunner.class) -@PrepareForTest({ClientBuilder.class, Client.class, Builder.class, WebTarget.class, Response.class}) +@PrepareForTest(JerseyClient.class) public class AaiQuery4CcvpnTest { @Rule @@ -54,11 +50,9 @@ public class AaiQuery4CcvpnTest { private static AaiQuery4Ccvpn aai = AaiQuery4Ccvpn.newInstance(); - private static MultivaluedMap headers = new MultivaluedHashMap<>(); - private static Client client; - private static WebTarget webTarget; - private static Builder builder; - private static Response response; + private static Map headers = new HashMap<>(); + + private static JerseyClient client; @BeforeClass static public void beforeClass() { @@ -85,21 +79,19 @@ public class AaiQuery4CcvpnTest { } } - headers.add("X-TransactionId", AaiConfig.X_TRANSACTION_ID); - headers.add("X-FromAppId", AaiConfig.X_FROMAPP_ID); - headers.add("Authorization", AaiConfig.getAuthenticationCredentials()); - headers.add("Accept", "application/json"); - headers.add("Content-Type", "application/json"); + headers.put("X-TransactionId", AaiConfig.X_TRANSACTION_ID); + headers.put("X-FromAppId", AaiConfig.X_FROMAPP_ID); + headers.put("Authorization", AaiConfig.getAuthenticationCredentials()); + headers.put("Accept", "application/json"); + headers.put("Content-Type", "application/json"); Whitebox.setInternalState(aai, "headers", headers); } @Before public void before() { - PowerMock.mockStatic(ClientBuilder.class); - client = PowerMock.createMock(Client.class); - webTarget = PowerMock.createMock(WebTarget.class); - builder = PowerMock.createMock(Builder.class); - response = PowerMock.createMock(Response.class); + PowerMock.mockStatic(JerseyClient.class); + client = PowerMock.createMock(JerseyClient.class); + EasyMock.expect(JerseyClient.newInstance()).andReturn(client).anyTimes(); } @After @@ -108,25 +100,15 @@ public class AaiQuery4CcvpnTest { } @Test - public void test_getPath() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException { + public void test_getPath() throws Exception { String path = "/aai/v14/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances?service-instance-id={servId}"; - - Method method = AaiQuery4Ccvpn.class.getDeclaredMethod("getPath", String.class); - method.setAccessible(true); - - String ret = (String) method.invoke(aai, path); - + String ret = Whitebox.invokeMethod(aai, "getPath", path); assertThat(ret, equalTo("/api/aai-business/v14/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances?service-instance-id={servId}")); - } @Test - public void test_getLogicLink_exception() throws CorrelationException { - mockGetMethod(); - EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.NOT_FOUND).times(2); - EasyMock.expect(response.readEntity(String.class)).andReturn("Error!"); - - thrown.expect(CorrelationException.class); + public void test_getLogicLink() { + mockGetMethod(data.get("logic-link").toString()); PowerMock.replayAll(); @@ -138,77 +120,13 @@ public class AaiQuery4CcvpnTest { } - @Test - public void test_getLogicLink() throws CorrelationException { - mockGetMethod(); - EasyMock.expect(response.readEntity(String.class)).andReturn(data.get("logic-link").toString()); - EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK); - - PowerMock.replayAll(); - - String linkId = aai.getLogicLink("network-1", "pnf-1", "interface-1", "DOWN"); - - PowerMock.verifyAll(); - - assertThat(linkId, equalTo("logic-link-1")); - - } - - @Test - public void test_getServiceInstances_exception() { - mockGetMethod(); - EasyMock.expect(response.readEntity(String.class)).andReturn(data.get("vpn-binding").toString()); - EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK); - - mockGetMethod(); - EasyMock.expect(response.readEntity(String.class)).andReturn(data.get("connectivity").toString()); - EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK); - - mockGetMethod(); - EasyMock.expect(response.readEntity(String.class)) - .andReturn(data.get("service-instance-by-connectivity").toString()); - EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK); - - mockGetMethod(); - EasyMock.expect(response.readEntity(String.class)) - .andReturn(data.get("service-instances-by-service-type").toString()); - EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.NOT_FOUND).times(2); - - mockGetMethod(); - EasyMock.expect(response.readEntity(String.class)).andReturn(data.get("service-instance").toString()); - EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.NOT_FOUND).times(2); - - thrown.expect(RuntimeException.class); - - PowerMock.replayAll(); - - JsonObject instance = aai.getServiceInstance("network-1", "pnf-1", "interface-1", "DOWN"); - - PowerMock.verifyAll(); - - assertThat(instance, equalTo("logic-link-1")); - - } @Test public void test_getServiceInstance() { - mockGetMethod(); - EasyMock.expect(response.readEntity(String.class)).andReturn(data.get("vpn-binding").toString()); - EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK); - - mockGetMethod(); - EasyMock.expect(response.readEntity(String.class)).andReturn(data.get("connectivity").toString()); - EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK); - - mockGetMethod(); - EasyMock.expect(response.readEntity(String.class)) - .andReturn(data.get("service-instance-by-connectivity").toString()); - EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK); - - mockGetMethod(); - EasyMock.expect(response.readEntity(String.class)) - .andReturn(data.get("service-instances-by-service-type").toString()); - EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK); + mockGetMethod(data.get("vpn-binding").toString()); + mockGetMethod(data.get("connectivity").toString()); + mockGetMethod(data.get("service-instance-by-connectivity").toString()); + mockGetMethod(data.get("service-instances-by-service-type").toString()); PowerMock.replayAll(); @@ -221,51 +139,10 @@ public class AaiQuery4CcvpnTest { assertThat(instance.get("serviceType").getAsString(), equalTo("volte")); } - @Test - public void test_getServiceInstance_1() throws Exception { - mockGetMethod(); - EasyMock.expect(response.readEntity(String.class)) - .andReturn(data.get("service-instances-by-service-type").toString()); - EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK); - - PowerMock.replayAll(); - - JsonObject instance = Whitebox.invokeMethod(aai, "getServiceInstance", - "custom-1", "service-type-1"); - - PowerMock.verifyAll(); - - assertThat(instance.get("service-instance-id").getAsString(), equalTo("some id 1")); - } - - @Test - public void test_getServiceInstance_1_exception() throws Exception { - mockGetMethod(); - EasyMock.expect(response.readEntity(String.class)).andReturn("Failed to get the service instance by type."); - EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.NOT_FOUND).times(2); - - thrown.expect(CorrelationException.class); - - PowerMock.replayAll(); - - JsonObject instance = Whitebox.invokeMethod(aai, "getServiceInstance", - "custom-1", "service-type-1"); - - PowerMock.verifyAll(); - - assertThat(instance.get("service-instance-id").getAsString(), equalTo("some id 1")); - assertThat(instance.get("service-instance-id").getAsString(), equalTo("some id 2")); - assertThat(instance.get("service-instance-id").getAsString(), equalTo("some id 3")); - } - @Test public void test_updateTerminalPointStatus() throws CorrelationException { - mockGetMethod(); - EasyMock.expect(response.readEntity(String.class)).andReturn(data.toString()); - EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK); - - mockPatchMethod(); - EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK); + mockGetMethod(data.toString()); + mockPutMethod("ok"); PowerMock.replayAll(); @@ -274,79 +151,28 @@ public class AaiQuery4CcvpnTest { PowerMock.verifyAll(); } - @Test - public void test_updateTerminalPointStatus_exception() throws CorrelationException { - mockGetMethod(); - EasyMock.expect(response.readEntity(String.class)).andReturn(data.toString()); - EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK); - - mockPatchMethod(); - EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.NOT_FOUND).times(2); - EasyMock.expect(response.readEntity(String.class)).andReturn("Failed to update the TP information."); - - thrown.expect(CorrelationException.class); - - PowerMock.replayAll(); - - aai.updateTerminalPointStatus("network-1", "pnf-1", "if-1", new HashMap<>()); - - PowerMock.verifyAll(); - } - - @Test - public void test_updateLogicLinkStatus() throws CorrelationException { - mockGetMethod(); - EasyMock.expect(response.readEntity(String.class)).andReturn(data.toString()); - EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK); - - mockPatchMethod(); - EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK); - - PowerMock.replayAll(); - - aai.updateLogicLinkStatus("link-1", new HashMap<>()); - - PowerMock.verifyAll(); - } @Test - public void test_updateLogicLinkStatus_exception() throws CorrelationException { - mockGetMethod(); - EasyMock.expect(response.readEntity(String.class)).andReturn(data.toString()); - EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK); - - mockPatchMethod(); - EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.NOT_FOUND).times(2); - EasyMock.expect(response.readEntity(String.class)).andReturn("Failed to update the logic link information."); - - thrown.expect(CorrelationException.class); + public void test_updateLogicLinkStatus() { + mockGetMethod(data.toString()); + mockPutMethod("ok"); PowerMock.replayAll(); aai.updateLogicLinkStatus("link-1", new HashMap<>()); PowerMock.verifyAll(); - - } - - private void mockGetMethod() { - initCommonMock(); - EasyMock.expect(builder.get()).andReturn(response); } - private void mockPatchMethod() { - initCommonMock(); - Invocation invocation = PowerMock.createMock(Invocation.class); - EasyMock.expect(builder.build(EasyMock.anyObject(String.class), EasyMock.anyObject(Entity.class))).andReturn(invocation); - EasyMock.expect(invocation.property(HttpUrlConnectorProvider.SET_METHOD_WORKAROUND, true)).andReturn(invocation); - EasyMock.expect(invocation.invoke()).andReturn(response); + private void mockGetMethod(String ret) { + EasyMock.expect(client.path(anyString())).andReturn(client); + EasyMock.expect(client.headers(anyObject())).andReturn(client); + EasyMock.expect(client.get(anyString())).andReturn(ret); } - private void initCommonMock() { - EasyMock.expect(ClientBuilder.newClient()).andReturn(client); - EasyMock.expect(client.target(EasyMock.anyObject(String.class))).andReturn(webTarget); - EasyMock.expect(webTarget.path(EasyMock.anyObject(String.class))).andReturn(webTarget); - EasyMock.expect(webTarget.request()).andReturn(builder); - EasyMock.expect(builder.headers(headers)).andReturn(builder); + private void mockPutMethod(String ok) { + EasyMock.expect(client.path(anyString())).andReturn(client); + EasyMock.expect(client.headers(anyObject())).andReturn(client); + EasyMock.expect(client.put(anyString(), anyObject())).andReturn(ok); } } \ No newline at end of file diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/config/MicroServiceConfigTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/config/MicroServiceConfigTest.java index 1fdc335..dd0c71a 100644 --- a/holmes-actions/src/test/java/org/onap/holmes/common/config/MicroServiceConfigTest.java +++ b/holmes-actions/src/test/java/org/onap/holmes/common/config/MicroServiceConfigTest.java @@ -1,5 +1,5 @@ /** - * Copyright 2017-2020 ZTE Corporation. + * Copyright 2017-2021 ZTE Corporation. *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,28 +18,35 @@ package org.onap.holmes.common.config; import org.apache.commons.lang3.StringUtils; import org.easymock.EasyMock; +import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import org.onap.holmes.common.utils.JerseyClient; import org.powermock.api.easymock.PowerMock; -import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor; import org.powermock.modules.junit4.PowerMockRunner; -import org.powermock.reflect.internal.WhiteboxImpl; +import static org.easymock.EasyMock.anyString; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; import static org.hamcrest.core.IsNull.nullValue; import static org.junit.Assert.assertThat; import static org.onap.holmes.common.config.MicroServiceConfig.*; -@PrepareForTest(MicroServiceConfig.class) -@PowerMockIgnore({"javax.ws.*"}) @RunWith(PowerMockRunner.class) +@PrepareForTest({JerseyClient.class, MicroServiceConfig.class}) +@SuppressStaticInitializationFor("org.onap.holmes.common.utils.JerseyClient") public class MicroServiceConfigTest { private static String ACTUAL_HOSTNAME = System.getenv(HOSTNAME); + @Before + public void before() { + PowerMock.mockStatic(JerseyClient.class); + } + @Test public void getMsbServerAddrTest() { System.setProperty(MSB_IAG_SERVICE_HOST, "test"); @@ -67,14 +74,22 @@ public class MicroServiceConfigTest { @Test public void getServiceIpTest() { + mockGet(null); + String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME; String hostname = String.format("http://%s", ip); System.setProperty(HOSTNAME, hostname); - assertThat(ip, equalTo(getMicroServiceIpAndPort()[0])); - assertThat("80", equalTo(getMicroServiceIpAndPort()[1])); + + PowerMock.replayAll(); + String ret[] = getMicroServiceIpAndPort(); + PowerMock.verifyAll(); + + assertThat(ip, equalTo(ret[0])); + assertThat("80", equalTo(ret[1])); System.clearProperty(HOSTNAME); } + @Test public void getConsulAddrInfoTest() { System.setProperty(CONSUL_HOST, "127.0.0.1"); @@ -85,9 +100,8 @@ public class MicroServiceConfigTest { @Test public void getConfigBindingServiceAddrInfoTest_consul_not_exist() throws Exception { System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service"); - PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class); - PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject()) - .andThrow(new RuntimeException("Invalid URL.")); + + mockGet(null); PowerMock.replayAll(); @@ -101,9 +115,7 @@ public class MicroServiceConfigTest { @Test public void getServiceAddrInfoFromDcaeConsulByHostName_consul_exists() throws Exception { System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service"); - PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class); - PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject()) - .andReturn("[{\"ServiceAddress\": \"127.0.0.2\", \"ServicePort\": \"8080\"}]"); + mockGet("[{\"ServiceAddress\": \"127.0.0.2\", \"ServicePort\": \"8080\"}]"); System.setProperty(CONSUL_HOST, "127.0.0.1"); PowerMock.replayAll(); @@ -120,11 +132,10 @@ public class MicroServiceConfigTest { @Test public void getConfigBindingServiceAddrInfoTest_consul_return_empty_array() throws Exception { System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service"); - PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class); - PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject()) - .andReturn("[]"); System.setProperty(CONSUL_HOST, "127.0.0.1"); + mockGet("[]"); + PowerMock.replayAll(); assertThat(getServiceAddrInfoFromDcaeConsulByHostName(System.getProperty(CONFIG_BINDING_SERVICE)), @@ -139,11 +150,10 @@ public class MicroServiceConfigTest { @Test public void getConfigBindingServiceAddrInfoTest_consul_exists_property_not_exist() throws Exception { System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service"); - PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class); - PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject()) - .andReturn("[{\"ServiceAddress\": \"127.0.0.2\"}]"); System.setProperty(CONSUL_HOST, "127.0.0.1"); + mockGet("[{\"ServiceAddress\": \"127.0.0.2\"}]"); + PowerMock.replayAll(); assertThat(getServiceAddrInfoFromDcaeConsulByHostName(System.getProperty(CONFIG_BINDING_SERVICE)), @@ -156,10 +166,9 @@ public class MicroServiceConfigTest { } @Test - public void getServiceAddrInfoFromCBS_consul_not_exist() throws Exception { - PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class); - PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject()) - .andThrow(new RuntimeException("Invalid URL.")).times(2); + public void getServiceAddrInfoFromCBS_consul_not_exist() { + mockGet(null); + mockGet(null); PowerMock.replayAll(); @@ -170,12 +179,12 @@ public class MicroServiceConfigTest { @Test public void getServiceAddrInfoFromDcaeConsulByHostName_consul_exists_service_not_exist() throws Exception { - PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class); - PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject()) - .andReturn("[]"); + mockGet("[]"); PowerMock.replayAll(); + assertThat(getServiceAddrInfoFromDcaeConsulByHostName(HOSTNAME), is(nullValue())); + PowerMock.verifyAll(); } @@ -224,9 +233,8 @@ public class MicroServiceConfigTest { @Test public void getMicroServiceIpAndPort_service_registered_to_consul() throws Exception { System.setProperty(HOSTNAME, "rule-mgmt"); - PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class); - PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject()) - .andReturn("[{\"ServiceAddress\": \"127.0.0.3\", \"ServicePort\": \"5432\"}]"); + + mockGet("[{\"ServiceAddress\": \"127.0.0.3\", \"ServicePort\": \"5432\"}]"); PowerMock.replayAll(); String[] msbInfo = getMicroServiceIpAndPort(); @@ -244,9 +252,8 @@ public class MicroServiceConfigTest { String port = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "1545" : "80"; String hostname = String.format("http://%s:%s", ip, port); System.setProperty(HOSTNAME, hostname); - PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class); - PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject()) - .andReturn("[]"); + + mockGet("[]"); PowerMock.replayAll(); String[] msbInfo = getMicroServiceIpAndPort(); @@ -264,9 +271,8 @@ public class MicroServiceConfigTest { String port = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "1545" : "80"; String hostname = String.format("http://%s:%s", ip, port); System.setProperty(HOSTNAME, hostname); - PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class); - PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject()) - .andReturn("{}"); + + mockGet("{}"); PowerMock.replayAll(); String[] msbInfo = getMicroServiceIpAndPort(); @@ -283,9 +289,8 @@ public class MicroServiceConfigTest { String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME; String hostname = String.format("http://%s", ip); System.setProperty(HOSTNAME, hostname); - PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class); - PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject()) - .andReturn("{}"); + + mockGet("{}"); PowerMock.replayAll(); String[] msbInfo = getMicroServiceIpAndPort(); @@ -302,9 +307,8 @@ public class MicroServiceConfigTest { String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME; String hostname = String.format("http://%s", ip); System.setProperty(HOSTNAME, hostname); - PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class); - PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject()) - .andReturn("{}"); + + mockGet("{}"); PowerMock.replayAll(); String[] msbInfo = getMicroServiceIpAndPort(); @@ -322,9 +326,8 @@ public class MicroServiceConfigTest { String port = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "1545" : "80"; String hostname = String.format("http://%s:%s", ip, port); System.setProperty(HOSTNAME, hostname); - PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class); - PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject()) - .andReturn("[]"); + + mockGet("[]"); PowerMock.replayAll(); String[] msbInfo = getMicroServiceIpAndPort(); @@ -335,4 +338,10 @@ public class MicroServiceConfigTest { System.clearProperty(HOSTNAME); } + + private void mockGet(String ret) { + JerseyClient client = PowerMock.createMock(JerseyClient.class); + EasyMock.expect(JerseyClient.newInstance()).andReturn(client); + EasyMock.expect(client.get(anyString())).andReturn(ret); + } } \ No newline at end of file