*/
protected void resetGetCount() {
getCount = 0;
+ setSubRequestId(null);
}
/**
// still incomplete
// need a request ID with which to query
- if (!extractSubRequestId(response)) {
+ if (getSubRequestId() == null && !extractSubRequestId(response)) {
throw new IllegalArgumentException("missing request ID in response");
}
}
// sleep and then perform a "get" operation
- Function<Void, CompletableFuture<OperationOutcome>> doGet = unused -> issueGet(outcome, response);
+ Function<Void, CompletableFuture<OperationOutcome>> doGet = unused -> issueGet(outcome);
return sleep(getWaitMsGet(), TimeUnit.MILLISECONDS).thenComposeAsync(doGet);
}
* Issues a "get" request to see if the original request is complete yet.
*
* @param outcome outcome to be populated with the response
- * @param response previous response
* @return a future that can be used to cancel the "get" request or await its response
*/
- private CompletableFuture<OperationOutcome> issueGet(OperationOutcome outcome, SoResponse response) {
- String path = getPathGet() + response.getRequestReferences().getRequestId();
+ private CompletableFuture<OperationOutcome> issueGet(OperationOutcome outcome) {
+ String path = getPathGet() + getSubRequestId();
String url = getClient().getBaseUrl() + path;
logger.debug("{}: 'get' count {} for {}", getFullName(), getCount, params.getRequestId());
logMessage(EventType.OUT, CommInfrastructure.REST, url, null);
- // TODO should this use "path" or the full "url"?
return handleResponse(outcome, url, callback -> getClient().get(callback, path, null));
}
import org.onap.policy.common.endpoints.event.comm.bus.internal.BusTopicParams;
import org.onap.policy.common.endpoints.http.client.HttpClientFactoryInstance;
import org.onap.policy.common.endpoints.http.server.HttpServletServerFactoryInstance;
+import org.onap.policy.common.gson.GsonMessageBodyHandler;
import org.onap.policy.controlloop.actor.test.BasicHttpOperation;
import org.onap.policy.controlloop.actorserviceprovider.Util;
import org.onap.policy.controlloop.policy.Target;
+import org.onap.policy.simulators.SoSimulatorJaxRs;
import org.onap.policy.so.SoRequest;
import org.onap.policy.so.SoRequestParameters;
import org.onap.policy.so.SoRequestReferences;
protected static void initBeforeClass() throws Exception {
org.onap.policy.simulators.Util.buildSoSim();
- BusTopicParams clientParams =
- BusTopicParams.builder().clientName(MY_CLIENT).basePath("").hostname("localhost")
- .managed(true).port(org.onap.policy.simulators.Util.SOSIM_SERVER_PORT).build();
+ BusTopicParams clientParams = BusTopicParams.builder().clientName(MY_CLIENT).basePath("").hostname("localhost")
+ .managed(true).port(org.onap.policy.simulators.Util.SOSIM_SERVER_PORT)
+ .serializationProvider(GsonMessageBodyHandler.class.getName()).build();
HttpClientFactoryInstance.getClientFactory().build(clientParams);
+
+ SoSimulatorJaxRs.setYieldIncomplete(true);
}
protected static void destroyAfterClass() {
+ SoSimulatorJaxRs.setYieldIncomplete(false);
HttpClientFactoryInstance.getClientFactory().destroy();
HttpServletServerFactoryInstance.getServerFactory().destroy();
}
assertThatThrownBy(() -> resp.bufferEntity()).isInstanceOf(UnsupportedOperationException.class);
assertThatThrownBy(() -> resp.getLength()).isInstanceOf(UnsupportedOperationException.class);
assertThatThrownBy(() -> resp.readEntity(generic)).isInstanceOf(UnsupportedOperationException.class);
+ assertThatThrownBy(() -> resp.readEntity(String.class, null)).isInstanceOf(UnsupportedOperationException.class);
assertThatThrownBy(() -> resp.readEntity(generic, null)).isInstanceOf(UnsupportedOperationException.class);
assertThatThrownBy(() -> resp.getStatusInfo()).isInstanceOf(UnsupportedOperationException.class);
assertThatThrownBy(() -> resp.getEntity()).isInstanceOf(UnsupportedOperationException.class);
assertNotNull(oper.getSubRequestId());
// no request id in the response
+ oper.generateSubRequestId(2);
+ assertNull(oper.getSubRequestId());
response.getRequestReferences().setRequestId(null);
response.getRequest().getRequestStatus().setRequestState("unknown");
assertThatIllegalArgumentException()
CompletableFuture<OperationOutcome> future2 = oper.postProcessResponse(outcome, PATH, rawResponse, response);
- assertSame(outcome, future2.get(500, TimeUnit.SECONDS));
+ assertSame(outcome, future2.get(5, TimeUnit.SECONDS));
assertEquals(PolicyResult.SUCCESS, outcome.getResult());
assertEquals(2, oper.getGetCount());
oper.resetGetCount();
assertEquals(0, oper.getGetCount());
+ assertNull(oper.getSubRequestId());
}
@Test
@Test
public void testSuccess() throws Exception {
SoParams opParams = SoParams.builder().clientName(MY_CLIENT).path("serviceInstantiation/v7/serviceInstances")
- .pathGet("orchestrationRequests/v5/").build();
+ .pathGet("orchestrationRequests/v5/").maxGets(2).build();
config = new SoConfig(blockingExecutor, opParams, HttpClientFactoryInstance.getClientFactory());
params = params.toBuilder().retry(0).timeoutSec(5).executor(blockingExecutor).build();
@Test
public void testSuccess() throws Exception {
SoParams opParams = SoParams.builder().clientName(MY_CLIENT).path("serviceInstances/v7")
- .pathGet("orchestrationRequests/v5/").build();
+ .pathGet("orchestrationRequests/v5/").maxGets(2).build();
config = new SoConfig(blockingExecutor, opParams, HttpClientFactoryInstance.getClientFactory());
params = params.toBuilder().retry(0).timeoutSec(5).executor(blockingExecutor).build();
* ============LICENSE_START=======================================================
* simulators
* ================================================================================
- * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
import java.util.Collections;
import java.util.Map;
-
import javax.ws.rs.Consumes;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
-
import org.onap.policy.models.decisions.concepts.DecisionRequest;
import org.onap.policy.models.decisions.concepts.DecisionResponse;
package org.onap.policy.simulators;
-import com.google.gson.Gson;
-
+import java.util.Set;
import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
+import lombok.Setter;
+import org.onap.policy.common.utils.coder.Coder;
+import org.onap.policy.common.utils.coder.CoderException;
+import org.onap.policy.common.utils.coder.StandardCoder;
import org.onap.policy.so.SoRequest;
import org.onap.policy.so.SoRequestReferences;
import org.onap.policy.so.SoRequestStatus;
@Path("/")
public class SoSimulatorJaxRs {
+ private final Coder coder = new StandardCoder();
+
+ /**
+ * Set of incomplete request IDs. When a POST or DELETE is performed, the new request
+ * ID is added to the set. When the request is polled, the ID is removed and an empty
+ * response is returned. When the request is polled again, it sees that there is no
+ * entry and returns a completion indication.
+ *
+ * <p/>
+ * This is static so request IDs are retained across servlets.
+ */
+ private static final Set<String> incomplete = ConcurrentHashMap.newKeySet();
+
+ /**
+ * {@code True} if the initial request should yield an incomplete, {@code false}
+ * otherwise. This is used when junit testing the SO actor.
+ */
+ @Setter
+ private static boolean yieldIncomplete = false;
/**
* SO post query.
@Consumes(MediaType.APPLICATION_JSON)
@Produces("application/json")
public String soPostQuery(@PathParam("serviceInstanceId") final String serviceInstanceId,
- @PathParam("vnfInstanceId") final String vnfInstanceId) {
- return makeCompleteSuccess();
+ @PathParam("vnfInstanceId") final String vnfInstanceId) throws CoderException {
+
+ return coder.encode(yieldIncomplete ? makeIncomplete() : makeComplete(UUID.randomUUID().toString()));
}
/**
@Produces("application/json")
public String soDelete(@PathParam("serviceInstanceId") final String serviceInstanceId,
@PathParam("vnfInstanceId") final String vnfInstanceId,
- @PathParam("vfModuleInstanceId") final String vfModuleInstanceId) {
- return makeCompleteSuccess();
+ @PathParam("vfModuleInstanceId") final String vfModuleInstanceId) throws CoderException {
+
+ return coder.encode(yieldIncomplete ? makeIncomplete() : makeComplete(UUID.randomUUID().toString()));
+ }
+
+ /**
+ * Poll SO result.
+ *
+ * @param requestId the ID of the request whose status is to be queried
+ * @return the response
+ */
+ @GET
+ @Path("/orchestrationRequests/v5/{requestId}")
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces("application/json")
+ public String soGetQuery(@PathParam("requestId") final String requestId) throws CoderException {
+ if (incomplete.remove(requestId)) {
+ // first poll - return empty response
+ return coder.encode(new SoResponse());
+
+ } else {
+ return coder.encode(makeComplete(requestId));
+ }
+ }
+
+ private SoResponse makeIncomplete() {
+ final SoResponse response = makeResponse();
+ response.getRequest().getRequestStatus().setRequestState("INCOMPLETE");
+
+ incomplete.add(response.getRequestReferences().getRequestId());
+
+ return response;
+ }
+
+ private SoResponse makeComplete(String requestId) {
+ final SoResponse response = makeResponse();
+
+ response.getRequest().getRequestStatus().setRequestState("COMPLETE");
+ response.getRequest().setRequestId(UUID.fromString(requestId));
+
+ return response;
}
- private String makeCompleteSuccess() {
+ private SoResponse makeResponse() {
final SoRequest request = new SoRequest();
final SoRequestStatus requestStatus = new SoRequestStatus();
- requestStatus.setRequestState("COMPLETE");
request.setRequestStatus(requestStatus);
request.setRequestId(UUID.randomUUID());
response.setRequest(request);
- return new Gson().toJson(response);
+ return response;
}
}
* ============LICENSE_START=======================================================
* simulators
* ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* VFC post query.
- *
+ *
* @param nsInstanceId the NS instance
* @param response the response
* @return the response
/**
* VFC get query.
- *
+ *
* @param jobId tthe job id
* @return the response
*/
* ============LICENSE_START=======================================================
* simulators
* ================================================================================
- * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
package org.onap.policy.simulators;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
import java.util.HashMap;
@AfterClass
public static void tearDownSimulator() {
HttpServletServerFactoryInstance.getServerFactory().destroy();
+ SoSimulatorJaxRs.setYieldIncomplete(false);
}
/**
@Test
public void testPost() {
- final String request = Serialization.gsonPretty.toJson(this.createTestRequest());
- final Pair<Integer, String> httpDetails = new RestManager().post(
+ SoSimulatorJaxRs.setYieldIncomplete(false);
+ String request = Serialization.gsonPretty.toJson(this.createTestRequest());
+ Pair<Integer, String> httpDetails = new RestManager().post(
"http://localhost:6667/serviceInstantiation/v7/serviceInstances/12345/vnfs/12345/vfModules/scaleOut",
"username",
"password", new HashMap<>(), "application/json", request);
assertNotNull(httpDetails);
- final SoResponse response = Serialization.gsonPretty.fromJson(httpDetails.second, SoResponse.class);
+ SoResponse response = Serialization.gsonPretty.fromJson(httpDetails.second, SoResponse.class);
assertNotNull(response);
+ assertNotNull(response.getRequestReferences());
+ assertNotNull(response.getRequestReferences().getRequestId());
+ assertEquals("COMPLETE", response.getRequest().getRequestStatus().getRequestState());
+
+ /*
+ * Repeat, but set the flag indicating that the request should yield incomplete.
+ */
+ SoSimulatorJaxRs.setYieldIncomplete(true);
+
+ request = Serialization.gsonPretty.toJson(this.createTestRequest());
+ httpDetails = new RestManager().post(
+ "http://localhost:6667/serviceInstantiation/v7/serviceInstances/12345/vnfs/12345/vfModules/scaleOut",
+ "username",
+ "password", new HashMap<>(), "application/json", request);
+ assertNotNull(httpDetails);
+ response = Serialization.gsonPretty.fromJson(httpDetails.second, SoResponse.class);
+ assertNotNull(response);
+ assertNotNull(response.getRequestReferences());
+ assertNotNull(response.getRequestReferences().getRequestId());
+ assertEquals("INCOMPLETE", response.getRequest().getRequestStatus().getRequestState());
+
+ // now poll for the response
+ String reqid = response.getRequestReferences().getRequestId();
+ httpDetails = new RestManager().get(
+ "http://localhost:6667//orchestrationRequests/v5/" + reqid,
+ "username",
+ "password", new HashMap<>());
+ assertNotNull(httpDetails);
+ response = Serialization.gsonPretty.fromJson(httpDetails.second, SoResponse.class);
+ assertNotNull(response);
+ assertNull(response.getRequest());
+
+ // poll again
+ httpDetails = new RestManager().get(
+ "http://localhost:6667//orchestrationRequests/v5/" + reqid,
+ "username",
+ "password", new HashMap<>());
+ assertNotNull(httpDetails);
+ response = Serialization.gsonPretty.fromJson(httpDetails.second, SoResponse.class);
+ assertNotNull(response);
+ assertNotNull(response.getRequest());
+ assertNotNull(response.getRequest().getRequestStatus());
+ assertEquals("COMPLETE", response.getRequest().getRequestStatus().getRequestState());
}
@Test
public void testDelete() {
- final String request = Serialization.gsonPretty.toJson(this.createTestRequest());
- final Pair<Integer, String> httpDetails = new RestManager().delete(
+ SoSimulatorJaxRs.setYieldIncomplete(false);
+ String request = Serialization.gsonPretty.toJson(this.createTestRequest());
+ Pair<Integer, String> httpDetails = new RestManager().delete(
"http://localhost:6667/serviceInstances/v7/12345/vnfs/12345/vfModules/12345",
"username",
"password", new HashMap<>(), "application/json", request);
assertNotNull(httpDetails);
- final SoResponse response = Serialization.gsonPretty.fromJson(httpDetails.second, SoResponse.class);
+ SoResponse response = Serialization.gsonPretty.fromJson(httpDetails.second, SoResponse.class);
+ assertNotNull(response);
+ assertNotNull(response.getRequestReferences());
+ assertNotNull(response.getRequestReferences().getRequestId());
+ assertEquals("COMPLETE", response.getRequest().getRequestStatus().getRequestState());
+
+ /*
+ * Repeat, but set the flag indicating that the request should yield incomplete.
+ */
+ SoSimulatorJaxRs.setYieldIncomplete(true);
+
+ request = Serialization.gsonPretty.toJson(this.createTestRequest());
+ httpDetails = new RestManager().delete(
+ "http://localhost:6667/serviceInstances/v7/12345/vnfs/12345/vfModules/12345",
+ "username",
+ "password", new HashMap<>(), "application/json", request);
+ assertNotNull(httpDetails);
+ response = Serialization.gsonPretty.fromJson(httpDetails.second, SoResponse.class);
+ assertNotNull(response);
+ assertNotNull(response.getRequestReferences());
+ assertNotNull(response.getRequestReferences().getRequestId());
+ assertEquals("INCOMPLETE", response.getRequest().getRequestStatus().getRequestState());
+
+ // now poll for the response
+ String reqid = response.getRequestReferences().getRequestId();
+ httpDetails = new RestManager().get(
+ "http://localhost:6667//orchestrationRequests/v5/" + reqid,
+ "username",
+ "password", new HashMap<>());
+ assertNotNull(httpDetails);
+ response = Serialization.gsonPretty.fromJson(httpDetails.second, SoResponse.class);
+ assertNotNull(response);
+ assertNull(response.getRequest());
+
+ // poll again
+ httpDetails = new RestManager().get(
+ "http://localhost:6667//orchestrationRequests/v5/" + reqid,
+ "username",
+ "password", new HashMap<>());
+ assertNotNull(httpDetails);
+ response = Serialization.gsonPretty.fromJson(httpDetails.second, SoResponse.class);
assertNotNull(response);
+ assertNotNull(response.getRequest());
+ assertNotNull(response.getRequest().getRequestStatus());
+ assertEquals("COMPLETE", response.getRequest().getRequestStatus().getRequestState());
}
}
Code Review / policy / models.git / commitdiff