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;
private final Logger log = LoggerFactory.getLogger(AaiQuery4Ccvpn.class);
- private MultivaluedMap<String, Object> headers;
+ private Map<String, Object> headers;
public static AaiQuery4Ccvpn newInstance() {
return new 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");
}
/**
* @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<String, String> 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));
* @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<String, Object> body) throws CorrelationException {
+ Map<String, Object> body) {
Map<String, String> 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<String, Object> 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<String, Object> 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<String, String> 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<String, String> 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<String, String> pathParams) {
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<String, Object> 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);
return null;
}
- private MultivaluedMap getAaiHeaders() {
- return headers;
- }
-
private String getHostAddr() {
return MicroServiceConfig.getMsbServerAddrWithHttpPrefix();
}
return null;
}
- private String getErrorMsg(String url, Map<String, Object> 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<String, Object> body) {
+ return JerseyClient.newInstance().path(path).headers(headers).put(getHostAddr(), Entity.json(body));
}
}
import com.google.gson.JsonObject;\r
import com.google.gson.JsonParser;\r
import org.onap.holmes.common.constant.AlarmConst;\r
+import org.onap.holmes.common.utils.JerseyClient;\r
import org.slf4j.Logger;\r
import org.slf4j.LoggerFactory;\r
\r
-import javax.ws.rs.client.Client;\r
-import javax.ws.rs.client.ClientBuilder;\r
-import javax.ws.rs.core.Response;\r
-import java.util.regex.Pattern;\r
-\r
import static org.onap.holmes.common.utils.CommonUtils.getEnv;\r
import static org.onap.holmes.common.utils.CommonUtils.isIpAddress;\r
\r
final static public String HOSTNAME = "HOSTNAME";\r
final static public String POD_IP = "POD_IP";\r
final static public String CONFIG_BINDING_SERVICE = "CONFIG_BINDING_SERVICE";\r
- final static public String DOCKER_HOST = "DOCKER_HOST";\r
final static public String MSB_ADDR = "MSB_ADDR";\r
final static public String MSB_IAG_SERVICE_HOST = "MSB_IAG_SERVICE_HOST";\r
final static public String MSB_IAG_SERVICE_PORT = "MSB_IAG_SERVICE_PORT";\r
}\r
\r
private static String execQuery(String queryString) {\r
- Client client = ClientBuilder.newBuilder().build();\r
- Response response = client.target(queryString).request().get();\r
- return response.readEntity(String.class);\r
+ return JerseyClient.newInstance().get(queryString);\r
}\r
\r
public static String getServiceConfigInfoFromCBS(String hostname) {\r
- String ret = null;\r
String url = getServiceAddrInfoFromDcaeConsulByHostName(getEnv(CONFIG_BINDING_SERVICE)) + "/service_component/" + hostname;\r
- try {\r
- ret = execQuery(url);\r
- } catch (Exception e) {\r
- log.warn(e.getMessage(), e);\r
- }\r
+ String ret = execQuery(url);\r
log.info("The query url is: " + url + ". The corresponding configurations are " + ret);\r
return ret;\r
}\r
}\r
\r
\r
-\r
private static String[] split(String addr) {\r
String ip;\r
String port = "80";\r
/**
- * Copyright 2018-2020 ZTE Corporation.
+ * Copyright 2018-2021 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
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
private static AaiQuery4Ccvpn aai = AaiQuery4Ccvpn.newInstance();
- private static MultivaluedMap<String, Object> headers = new MultivaluedHashMap<>();
- private static Client client;
- private static WebTarget webTarget;
- private static Builder builder;
- private static Response response;
+ private static Map<String, Object> headers = new HashMap<>();
+
+ private static JerseyClient client;
@BeforeClass
static public void beforeClass() {
}
}
- 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
}
@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();
}
- @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();
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();
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
/**\r
- * Copyright 2017-2020 ZTE Corporation.\r
+ * Copyright 2017-2021 ZTE Corporation.\r
* <p>\r
* Licensed under the Apache License, Version 2.0 (the "License");\r
* you may not use this file except in compliance with the License.\r
\r
import org.apache.commons.lang3.StringUtils;\r
import org.easymock.EasyMock;\r
+import org.junit.Before;\r
import org.junit.Ignore;\r
import org.junit.Test;\r
import org.junit.runner.RunWith;\r
+import org.onap.holmes.common.utils.JerseyClient;\r
import org.powermock.api.easymock.PowerMock;\r
-import org.powermock.core.classloader.annotations.PowerMockIgnore;\r
import org.powermock.core.classloader.annotations.PrepareForTest;\r
+import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;\r
import org.powermock.modules.junit4.PowerMockRunner;\r
-import org.powermock.reflect.internal.WhiteboxImpl;\r
\r
+import static org.easymock.EasyMock.anyString;\r
import static org.hamcrest.core.Is.is;\r
import static org.hamcrest.core.IsEqual.equalTo;\r
import static org.hamcrest.core.IsNull.nullValue;\r
import static org.junit.Assert.assertThat;\r
import static org.onap.holmes.common.config.MicroServiceConfig.*;\r
\r
-@PrepareForTest(MicroServiceConfig.class)\r
-@PowerMockIgnore({"javax.ws.*"})\r
@RunWith(PowerMockRunner.class)\r
+@PrepareForTest({JerseyClient.class, MicroServiceConfig.class})\r
+@SuppressStaticInitializationFor("org.onap.holmes.common.utils.JerseyClient")\r
public class MicroServiceConfigTest {\r
\r
private static String ACTUAL_HOSTNAME = System.getenv(HOSTNAME);\r
\r
+ @Before\r
+ public void before() {\r
+ PowerMock.mockStatic(JerseyClient.class);\r
+ }\r
+\r
@Test\r
public void getMsbServerAddrTest() {\r
System.setProperty(MSB_IAG_SERVICE_HOST, "test");\r
\r
@Test\r
public void getServiceIpTest() {\r
+ mockGet(null);\r
+\r
String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME;\r
String hostname = String.format("http://%s", ip);\r
System.setProperty(HOSTNAME, hostname);\r
- assertThat(ip, equalTo(getMicroServiceIpAndPort()[0]));\r
- assertThat("80", equalTo(getMicroServiceIpAndPort()[1]));\r
+\r
+ PowerMock.replayAll();\r
+ String ret[] = getMicroServiceIpAndPort();\r
+ PowerMock.verifyAll();\r
+\r
+ assertThat(ip, equalTo(ret[0]));\r
+ assertThat("80", equalTo(ret[1]));\r
System.clearProperty(HOSTNAME);\r
}\r
\r
+\r
@Test\r
public void getConsulAddrInfoTest() {\r
System.setProperty(CONSUL_HOST, "127.0.0.1");\r
@Test\r
public void getConfigBindingServiceAddrInfoTest_consul_not_exist() throws Exception {\r
System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service");\r
- PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);\r
- PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
- .andThrow(new RuntimeException("Invalid URL."));\r
+\r
+ mockGet(null);\r
\r
PowerMock.replayAll();\r
\r
@Test\r
public void getServiceAddrInfoFromDcaeConsulByHostName_consul_exists() throws Exception {\r
System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service");\r
- PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);\r
- PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
- .andReturn("[{\"ServiceAddress\": \"127.0.0.2\", \"ServicePort\": \"8080\"}]");\r
+ mockGet("[{\"ServiceAddress\": \"127.0.0.2\", \"ServicePort\": \"8080\"}]");\r
System.setProperty(CONSUL_HOST, "127.0.0.1");\r
\r
PowerMock.replayAll();\r
@Test\r
public void getConfigBindingServiceAddrInfoTest_consul_return_empty_array() throws Exception {\r
System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service");\r
- PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);\r
- PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
- .andReturn("[]");\r
System.setProperty(CONSUL_HOST, "127.0.0.1");\r
\r
+ mockGet("[]");\r
+\r
PowerMock.replayAll();\r
\r
assertThat(getServiceAddrInfoFromDcaeConsulByHostName(System.getProperty(CONFIG_BINDING_SERVICE)),\r
@Test\r
public void getConfigBindingServiceAddrInfoTest_consul_exists_property_not_exist() throws Exception {\r
System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service");\r
- PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);\r
- PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
- .andReturn("[{\"ServiceAddress\": \"127.0.0.2\"}]");\r
System.setProperty(CONSUL_HOST, "127.0.0.1");\r
\r
+ mockGet("[{\"ServiceAddress\": \"127.0.0.2\"}]");\r
+\r
PowerMock.replayAll();\r
\r
assertThat(getServiceAddrInfoFromDcaeConsulByHostName(System.getProperty(CONFIG_BINDING_SERVICE)),\r
}\r
\r
@Test\r
- public void getServiceAddrInfoFromCBS_consul_not_exist() throws Exception {\r
- PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);\r
- PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
- .andThrow(new RuntimeException("Invalid URL.")).times(2);\r
+ public void getServiceAddrInfoFromCBS_consul_not_exist() {\r
+ mockGet(null);\r
+ mockGet(null);\r
\r
PowerMock.replayAll();\r
\r
\r
@Test\r
public void getServiceAddrInfoFromDcaeConsulByHostName_consul_exists_service_not_exist() throws Exception {\r
- PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);\r
- PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
- .andReturn("[]");\r
+ mockGet("[]");\r
\r
PowerMock.replayAll();\r
+\r
assertThat(getServiceAddrInfoFromDcaeConsulByHostName(HOSTNAME), is(nullValue()));\r
+\r
PowerMock.verifyAll();\r
}\r
\r
@Test\r
public void getMicroServiceIpAndPort_service_registered_to_consul() throws Exception {\r
System.setProperty(HOSTNAME, "rule-mgmt");\r
- PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);\r
- PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
- .andReturn("[{\"ServiceAddress\": \"127.0.0.3\", \"ServicePort\": \"5432\"}]");\r
+\r
+ mockGet("[{\"ServiceAddress\": \"127.0.0.3\", \"ServicePort\": \"5432\"}]");\r
\r
PowerMock.replayAll();\r
String[] msbInfo = getMicroServiceIpAndPort();\r
String port = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "1545" : "80";\r
String hostname = String.format("http://%s:%s", ip, port);\r
System.setProperty(HOSTNAME, hostname);\r
- PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);\r
- PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
- .andReturn("[]");\r
+\r
+ mockGet("[]");\r
\r
PowerMock.replayAll();\r
String[] msbInfo = getMicroServiceIpAndPort();\r
String port = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "1545" : "80";\r
String hostname = String.format("http://%s:%s", ip, port);\r
System.setProperty(HOSTNAME, hostname);\r
- PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);\r
- PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
- .andReturn("{}");\r
+\r
+ mockGet("{}");\r
\r
PowerMock.replayAll();\r
String[] msbInfo = getMicroServiceIpAndPort();\r
String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME;\r
String hostname = String.format("http://%s", ip);\r
System.setProperty(HOSTNAME, hostname);\r
- PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);\r
- PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
- .andReturn("{}");\r
+\r
+ mockGet("{}");\r
\r
PowerMock.replayAll();\r
String[] msbInfo = getMicroServiceIpAndPort();\r
String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME;\r
String hostname = String.format("http://%s", ip);\r
System.setProperty(HOSTNAME, hostname);\r
- PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);\r
- PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
- .andReturn("{}");\r
+\r
+ mockGet("{}");\r
\r
PowerMock.replayAll();\r
String[] msbInfo = getMicroServiceIpAndPort();\r
String port = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "1545" : "80";\r
String hostname = String.format("http://%s:%s", ip, port);\r
System.setProperty(HOSTNAME, hostname);\r
- PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);\r
- PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
- .andReturn("[]");\r
+\r
+ mockGet("[]");\r
\r
PowerMock.replayAll();\r
String[] msbInfo = getMicroServiceIpAndPort();\r
\r
System.clearProperty(HOSTNAME);\r
}\r
+\r
+ private void mockGet(String ret) {\r
+ JerseyClient client = PowerMock.createMock(JerseyClient.class);\r
+ EasyMock.expect(JerseyClient.newInstance()).andReturn(client);\r
+ EasyMock.expect(client.get(anyString())).andReturn(ret);\r
+ }\r
}
\ No newline at end of file
Code Review / holmes / common.git / commitdiff