package org.onap.policy.controlloop.actor.aai;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.concurrent.CompletableFuture;
import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.Invocation.Builder;
+import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import lombok.Getter;
public static final String RESOURCE_LINK = "resource-link";
public static final String RESULT_DATA = "result-data";
+ // TODO make this configurable
private static final String PREFIX = "/aai/v16";
@Getter
@Override
protected CompletableFuture<OperationOutcome> startOperationAsync(int attempt, OperationOutcome outcome) {
- Map<String, String> request = makeRequest();
+ final Map<String, String> request = makeRequest();
+ Map<String, Object> headers = makeHeaders();
- Entity<Map<String, String>> entity = Entity.entity(request, MediaType.APPLICATION_JSON);
+ StringBuilder str = new StringBuilder(getClient().getBaseUrl());
- Map<String, Object> headers = makeHeaders();
+ String path = getPath();
+ WebTarget web = getClient().getWebTarget().path(path);
+ str.append(path);
+
+ web = addQuery(web, str, "?", "format", "resource");
+
+ Builder webldr = web.request();
+ for (Entry<String, Object> header : headers.entrySet()) {
+ webldr.header(header.getKey(), header.getValue());
+ }
- headers.put("Accept", MediaType.APPLICATION_JSON);
- String url = makeUrl();
+ String url = str.toString();
logMessage(EventType.OUT, CommInfrastructure.REST, url, request);
- // @formatter:off
- return handleResponse(outcome, url,
- callback -> getClient().put(callback, makePath(), entity, headers));
- // @formatter:on
+ Entity<Map<String, String>> entity = Entity.entity(request, MediaType.APPLICATION_JSON);
+
+ return handleResponse(outcome, url, callback -> webldr.async().put(entity, callback));
+ }
+
+ private WebTarget addQuery(WebTarget web, StringBuilder str, String separator, String name, String value) {
+ str.append(separator);
+ str.append(name);
+ str.append('=');
+ str.append(value);
+
+ return web.queryParam(name, value);
}
/**
package org.onap.policy.controlloop.actor.aai;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
+import javax.ws.rs.client.Invocation.Builder;
+import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.onap.policy.aai.AaiConstants;
Map<String, Object> headers = makeHeaders();
headers.put("Accept", MediaType.APPLICATION_JSON);
- String url = makeUrl();
+
+ StringBuilder str = new StringBuilder(getClient().getBaseUrl());
+
+ String path = getPath();
+ WebTarget web = getClient().getWebTarget().path(path);
+ str.append(path);
+
+ web = addQuery(web, str, "?", "search-node-type", "vserver");
+ web = addQuery(web, str, "&", "filter", "vserver-name:EQUALS:" + params.getTargetEntity());
+
+ Builder webldr = web.request();
+ for (Entry<String, Object> header : headers.entrySet()) {
+ webldr.header(header.getKey(), header.getValue());
+ }
+
+ String url = str.toString();
logMessage(EventType.OUT, CommInfrastructure.REST, url, null);
- // @formatter:off
- return handleResponse(outcome, url,
- callback -> getClient().get(callback, makePath(), headers));
- // @formatter:on
+ return handleResponse(outcome, url, callback -> webldr.async().get(callback));
+ }
+
+ private WebTarget addQuery(WebTarget web, StringBuilder str, String separator, String name, String value) {
+ str.append(separator);
+ str.append(name);
+ str.append('=');
+ str.append(value);
+
+ return web.queryParam(name, value);
}
@Override
@Override
public String makePath() {
- return (getPath() + "/" + params.getTargetEntity());
+ return (getPath() + params.getTargetEntity());
}
/**
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.InvocationCallback;
import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
}
@Test
+ @SuppressWarnings("unchecked")
public void testStartOperationAsync_testStartPreprocessorAsync_testMakeRequest_testPostProcess() throws Exception {
// need two responses
when(rawResponse.readEntity(String.class)).thenReturn(makeTenantReply()).thenReturn(makeCqReply());
- when(client.get(any(), any(), any())).thenAnswer(provideResponse(rawResponse));
- when(client.put(any(), any(), any(), any())).thenAnswer(provideResponse(rawResponse));
+ when(webAsync.get(any(InvocationCallback.class))).thenAnswer(provideResponse(rawResponse));
+ when(webAsync.put(any(), any(InvocationCallback.class))).thenAnswer(provideResponse(rawResponse, 1));
CompletableFuture<OperationOutcome> future2 = oper.start();
* Tests when preprocessor step is not needed.
*/
@Test
+ @SuppressWarnings("unchecked")
public void testStartOperationAsync_testStartPreprocessorAsyncNotNeeded() throws Exception {
// pre-load the tenant data
final StandardCoderObject data = preloadTenantData();
// only need one response
when(rawResponse.readEntity(String.class)).thenReturn(makeCqReply());
- when(client.put(any(), any(), any(), any())).thenAnswer(provideResponse(rawResponse));
+ when(webAsync.put(any(), any(InvocationCallback.class))).thenAnswer(provideResponse(rawResponse, 1));
CompletableFuture<OperationOutcome> future2 = oper.start();
}
@Test
+ @SuppressWarnings("unchecked")
public void testMakeRequest() throws Exception {
// preload
preloadTenantData();
when(rawResponse.readEntity(String.class)).thenReturn(makeCqReply());
- when(client.put(any(), any(), any(), any())).thenAnswer(provideResponse(rawResponse));
+ when(webAsync.put(any(), any(InvocationCallback.class))).thenAnswer(provideResponse(rawResponse, 1));
oper.start();
executor.runAll(100);
- verify(client).put(any(), any(), entityCaptor.capture(), any());
+ verify(webAsync).put(entityCaptor.capture(), any(InvocationCallback.class));
// sort the request fields so they match the order in cq.json
Map<String, String> request = new TreeMap<>(entityCaptor.getValue().getEntity());
}
@Test
+ @SuppressWarnings("unchecked")
public void testMakeRequestNoResourceLink() throws Exception {
// pre-load EMPTY tenant data
preloadTenantData(new StandardCoderObject());
when(rawResponse.readEntity(String.class)).thenReturn(makeCqReply());
- when(client.put(any(), any(), any(), any())).thenAnswer(provideResponse(rawResponse));
+ when(webAsync.put(any(), any(InvocationCallback.class))).thenAnswer(provideResponse(rawResponse, 1));
CompletableFuture<OperationOutcome> future2 = oper.start();
import java.util.Map;
import java.util.concurrent.CompletableFuture;
+import javax.ws.rs.client.InvocationCallback;
import org.junit.Before;
import org.junit.Test;
import org.onap.policy.aai.AaiConstants;
}
@Test
+ @SuppressWarnings("unchecked")
public void testStartOperationAsync_testStartQueryAsync_testPostProcessResponse() throws Exception {
// return a map in the reply
Map<String, String> reply = Map.of(INPUT_FIELD, TEXT);
when(rawResponse.readEntity(String.class)).thenReturn(new StandardCoder().encode(reply));
- when(client.get(any(), any(), any())).thenAnswer(provideResponse(rawResponse));
+ when(webAsync.get(any(InvocationCallback.class))).thenAnswer(provideResponse(rawResponse));
CompletableFuture<OperationOutcome> future2 = oper.startOperationAsync(1, outcome);
assertFalse(future2.isDone());
* Tests startOperationAsync() when there's a failure.
*/
@Test
+ @SuppressWarnings("unchecked")
public void testStartOperationAsyncFailure() throws Exception {
when(rawResponse.getStatus()).thenReturn(500);
when(rawResponse.readEntity(String.class)).thenReturn("");
- when(client.get(any(), any(), any())).thenAnswer(provideResponse(rawResponse));
+ when(webAsync.get(any(InvocationCallback.class))).thenAnswer(provideResponse(rawResponse));
CompletableFuture<OperationOutcome> future2 = oper.startOperationAsync(1, outcome);
assertFalse(future2.isDone());
@Test
public void testMakePath() {
- assertEquals(PATH + "/" + TARGET_ENTITY, oper.makePath());
+ assertEquals(PATH + TARGET_ENTITY, oper.makePath());
}
@Test
- clientName: my-client
hostname: localhost
port: 80
- basePath: base-url
+ basePath: base-url/
managed: true
actors:
AAI:
resetGetCount();
Pair<String, SoRequest> pair = makeRequest();
- String path = pair.getLeft();
+ String path = getPath() + pair.getLeft();
SoRequest request = pair.getRight();
Entity<SoRequest> entity = Entity.entity(request, MediaType.APPLICATION_JSON);
logMessage(EventType.OUT, CommInfrastructure.REST, url, request);
- // TODO should this use "path" or the full "url"?
-
return handleResponse(outcome, url, callback -> getClient().post(callback, path, entity, null));
}
buildConfigurationParameters().ifPresent(request.getRequestDetails()::setConfigurationParameters);
// compute the path
- String path = "/serviceInstantiation/v7/serviceInstances/" + vnfServiceItem.getServiceInstanceId() + "/vnfs/"
- + vnfItem.getVnfId() + "/vfModules/scaleOut";
+ String path = "/serviceInstances/" + vnfServiceItem.getServiceInstanceId() + "/vnfs/" + vnfItem.getVnfId()
+ + "/vfModules/scaleOut";
return Pair.of(path, request);
}
// @formatter:off
assertEquals(
- "/serviceInstantiation/v7/serviceInstances/my-service-instance-id/vnfs/my-vnf-id/vfModules/scaleOut",
+ "/serviceInstances/my-service-instance-id/vnfs/my-vnf-id/vfModules/scaleOut",
pair.getLeft());
// @formatter:on
- clientName: my-client
hostname: localhost
port: 80
- basePath: base-url
+ basePath: base-url/
managed: true
actors:
SO:
clientName: my-client
operations:
VF Module Create:
- path: create
\ No newline at end of file
+ path: serviceInstantiation/v7
\ No newline at end of file
package org.onap.policy.controlloop.actor.test;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
+import javax.ws.rs.client.AsyncInvoker;
import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.Invocation.Builder;
import javax.ws.rs.client.InvocationCallback;
+import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.Response;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
@Mock
protected HttpConfig config;
@Mock
+ protected WebTarget webTarget;
+ @Mock
+ protected Builder webBuilder;
+ @Mock
+ protected AsyncInvoker webAsync;
+ @Mock
protected HttpClient client;
@Mock
protected HttpClientFactory factory;
when(rawResponse.getStatus()).thenReturn(200);
+ when(webBuilder.async()).thenReturn(webAsync);
+
+ when(webTarget.request()).thenReturn(webBuilder);
+ when(webTarget.path(any())).thenReturn(webTarget);
+ when(webTarget.queryParam(any(), any())).thenReturn(webTarget);
+
+ when(client.getWebTarget()).thenReturn(webTarget);
+
when(client.getBaseUrl()).thenReturn(BASE_URI);
initConfig();
* @return a function that provides the response to the call
*/
protected Answer<CompletableFuture<Response>> provideResponse(Response response) {
+ return provideResponse(response, 0);
+ }
+
+ /**
+ * Provides a response to an asynchronous HttpClient call.
+ *
+ * @param response response to be provided to the call
+ * @param index index of the callback within the arguments
+ * @return a function that provides the response to the call
+ */
+ protected Answer<CompletableFuture<Response>> provideResponse(Response response, int index) {
return args -> {
- InvocationCallback<Response> cb = args.getArgument(0);
+ InvocationCallback<Response> cb = args.getArgument(index);
cb.completed(response);
return CompletableFuture.completedFuture(response);
};
}
/**
- * Makes the URL to which the "get" request should be posted. This ir primarily used
+ * Makes the URL to which the "get" request should be posted. This is primarily used
* for logging purposes. This particular method returns the base URL appended with the
* return value from {@link #makePath()}.
*
return "{\"result-data\":[{\"resource-type\": \"vserver\",\"resource-link\":\"/aai/v15/"
+ "cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants"
+ "/tenant/3f2aaef74ecb4b19b35e26d0849fe9a2/vservers/vserver/"
- + "6c3b3714-e36c-45af-9f16-7d3a73d99497\"}]}}";
+ + "6c3b3714-e36c-45af-9f16-7d3a73d99497\"}]}";
} else {
return null;
}
Code Review / policy / models.git / commitdiff