X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-interactions%2Fmodel-simulators%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fsimulators%2FSoSimulatorJaxRs.java;h=9575419933d12ccf221e07ad61af80d4d86d7455;hb=80311ac0dedb0868d3837029c6e4b5fcb984efb2;hp=1af0b767c8023d37581c9f3cdd9ae3f2072b12ef;hpb=754f9a02943058dc03337c9550e8f37fece14d25;p=policy%2Fmodels.git
diff --git a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SoSimulatorJaxRs.java b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SoSimulatorJaxRs.java
index 1af0b767c..957541993 100644
--- a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SoSimulatorJaxRs.java
+++ b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SoSimulatorJaxRs.java
@@ -2,8 +2,10 @@
* ============LICENSE_START=======================================================
* simulators
* ================================================================================
- * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2020 Wipro Limited.
+ * Modifications Copyright (C) 2022 CTC, Inc. and others.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,24 +23,47 @@
package org.onap.policy.simulators;
-import com.google.gson.Gson;
-
+import java.util.List;
+import java.util.Map;
+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.PUT;
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.resources.ResourceUtils;
import org.onap.policy.so.SoRequest;
-import org.onap.policy.so.SoRequestReferences;
-import org.onap.policy.so.SoRequestStatus;
-import org.onap.policy.so.SoResponse;
-
+import org.onap.policy.so.SoRequest3gpp;
-@Path("/serviceInstantiation")
+@Path("/")
public class SoSimulatorJaxRs {
+ private static final String REPLACE_ME = "${replaceMe}";
+ /**
+ * 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 a "still
+ * running" response is returned. When the request is polled again, it sees that there
+ * is no entry and returns a completion indication.
+ *
+ *
+ * This is static so request IDs are retained across servlets.
+ */
+ private static final Set incomplete = ConcurrentHashMap.newKeySet();
+
+ /**
+ * {@code True} if requests should require polling, {@code false}
+ * otherwise. This is used when junit testing the SO actor.
+ */
+ @Setter
+ private static boolean requirePolling = false;
+
/**
* SO post query.
*
@@ -47,26 +72,98 @@ public class SoSimulatorJaxRs {
* @return the response
*/
@POST
- @Path("/v7/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/scaleOut")
+ @Path("/serviceInstantiation/v7/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/scaleOut")
@Consumes(MediaType.APPLICATION_JSON)
@Produces("application/json")
public String soPostQuery(@PathParam("serviceInstanceId") final String serviceInstanceId,
- @PathParam("vnfInstanceId") final String vnfInstanceId) {
- final SoRequest request = new SoRequest();
- final SoRequestStatus requestStatus = new SoRequestStatus();
- requestStatus.setRequestState("COMPLETE");
- request.setRequestStatus(requestStatus);
- request.setRequestId(UUID.randomUUID());
+ @PathParam("vnfInstanceId") final String vnfInstanceId,
+ SoRequest request) {
- final SoResponse response = new SoResponse();
+ List