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=a1456c15e79420821d7066c4bd465ee8806a7266;hb=HEAD;hp=019d6f116b89b21a5d96b6eb08546835e4517851;hpb=5210055db2f00f42fea4717b2726dda52e1c1a59;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 019d6f116..a1456c15e 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.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019, 2023 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,26 +23,29 @@
 
 package org.onap.policy.simulators;
 
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+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.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.SoRequest3gpp;
 
 @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
@@ -62,8 +67,8 @@ public class SoSimulatorJaxRs {
     /**
      * SO post query.
      *
-     * @param serviceInstanceId the service instance Id
-     * @param vnfInstanceId the VNF Id
+     * @param serviceInstanceId the service instance ID
+     * @param vnfInstanceId the VNF ID
      * @return the response
      */
     @POST
@@ -71,16 +76,23 @@ public class SoSimulatorJaxRs {
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces("application/json")
     public String soPostQuery(@PathParam("serviceInstanceId") final String serviceInstanceId,
-                    @PathParam("vnfInstanceId") final String vnfInstanceId) {
+                    @PathParam("vnfInstanceId") final String vnfInstanceId,
+                    SoRequest request) {
 
+        List<Map<String, String>> userParam = null;
+        userParam = request.getRequestDetails().getRequestParameters().getUserParams();
+        if (!userParam.isEmpty() && userParam.toString().contains("FAIL")) {
+            // this will be treated as a failure by the SO actor as it's missing the request ID
+            return "{}";
+        }
         return (requirePolling ? makeStarted() : makeImmediateComplete());
     }
 
     /**
      * SO Delete.
      *
-     * @param serviceInstanceId the service instance Id
-     * @param vnfInstanceId the VNF Id
+     * @param serviceInstanceId the service instance ID
+     * @param vnfInstanceId the VNF ID
      * @return the response
      */
     @DELETE
@@ -114,10 +126,26 @@ public class SoSimulatorJaxRs {
         }
     }
 
+    @PUT
+    @Path("/3gppservices/v7/modify")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces("application/json")
+    public String soPost3gpp(SoRequest3gpp request) {
+        return ResourceUtils.getResourceAsString("org/onap/policy/simulators/so/so.3gpp.success.json");
+    }
+
+    @PUT
+    @Path("/infra/serviceIntent/v1/modify")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces("application/json")
+    public String soPostModifyCll(SoRequest3gpp request) {
+        return ResourceUtils.getResourceAsString("org/onap/policy/simulators/so/so.cll.success.json");
+    }
+
     private String makeStarted() {
-        String requestId = UUID.randomUUID().toString();
+        var requestId = UUID.randomUUID().toString();
 
-        String response = ResourceUtils.getResourceAsString("org/onap/policy/simulators/so/so.started.json");
+        var response = ResourceUtils.getResourceAsString("org/onap/policy/simulators/so/so.started.json");
 
         incomplete.add(requestId);
 
@@ -125,17 +153,17 @@ public class SoSimulatorJaxRs {
     }
 
     private String makeImmediateComplete() {
-        String response = ResourceUtils.getResourceAsString("org/onap/policy/simulators/so/so.immediate.success.json");
+        var response = ResourceUtils.getResourceAsString("org/onap/policy/simulators/so/so.immediate.success.json");
         return response.replace(REPLACE_ME, UUID.randomUUID().toString());
     }
 
     private String makeComplete(String requestId) {
-        String response = ResourceUtils.getResourceAsString("org/onap/policy/simulators/so/so.complete.success.json");
+        var response = ResourceUtils.getResourceAsString("org/onap/policy/simulators/so/so.complete.success.json");
         return response.replace(REPLACE_ME, requestId);
     }
 
     private String makeStillRunning(String requestId) {
-        String response = ResourceUtils.getResourceAsString("org/onap/policy/simulators/so/so.still.running.json");
+        var response = ResourceUtils.getResourceAsString("org/onap/policy/simulators/so/so.still.running.json");
         return response.replace(REPLACE_ME, requestId);
     }
 }