X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=plans%2Fso%2Fintegration-etsi-testing%2Fso-simulators%2Fsdnc-simulator%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fso%2Fsdncsimulator%2Fcontroller%2FOperationsController.java;h=2d901c42398128f7c16c69d403cc5d784c17bf2b;hb=413bbe636e82c268d588c08185422f94ab4f75f3;hp=007402988b89fb7c80f656ac33e9a94d13df1513;hpb=5b8c4f931930cde88eceba2059785dec7f6352f0;p=integration%2Fcsit.git

diff --git a/plans/so/integration-etsi-testing/so-simulators/sdnc-simulator/src/main/java/org/onap/so/sdncsimulator/controller/OperationsController.java b/plans/so/integration-etsi-testing/so-simulators/sdnc-simulator/src/main/java/org/onap/so/sdncsimulator/controller/OperationsController.java
index 00740298..2d901c42 100644
--- a/plans/so/integration-etsi-testing/so-simulators/sdnc-simulator/src/main/java/org/onap/so/sdncsimulator/controller/OperationsController.java
+++ b/plans/so/integration-etsi-testing/so-simulators/sdnc-simulator/src/main/java/org/onap/so/sdncsimulator/controller/OperationsController.java
@@ -23,6 +23,7 @@ import static org.onap.so.sdncsimulator.utils.Constants.OPERATIONS_URL;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.core.MediaType;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiServiceOperationInformation;
+import org.onap.sdnc.northbound.client.model.GenericResourceApiVnfOperationInformation;
 import org.onap.so.sdncsimulator.models.InputRequest;
 import org.onap.so.sdncsimulator.models.Output;
 import org.onap.so.sdncsimulator.models.OutputRequest;
@@ -55,15 +56,17 @@ public class OperationsController {
     }
 
     @PostMapping(value = "/GENERIC-RESOURCE-API:service-topology-operation/",
+            consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
             produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public ResponseEntity<?> postServiceOperationInformation(
             @RequestBody final InputRequest<GenericResourceApiServiceOperationInformation> inputRequest,
             final HttpServletRequest request) {
-        LOGGER.info("Request Received {}  ...", inputRequest);
+        LOGGER.info("Request Received: {}  ...", inputRequest);
 
         final GenericResourceApiServiceOperationInformation apiServiceOperationInformation = inputRequest.getInput();
 
         if (apiServiceOperationInformation == null) {
+            LOGGER.error("Invalid input request: {}", inputRequest);
             return ResponseEntity.badRequest().build();
         }
 
@@ -71,9 +74,37 @@ public class OperationsController {
         final OutputRequest outputRequest = new OutputRequest(output);
 
         if (output.getResponseCode().equals(HttpStatus.OK.toString())) {
+            LOGGER.info("Sucessfully added service in cache sending response: {}", outputRequest);
+            return ResponseEntity.ok(outputRequest);
+        }
+        LOGGER.error("Unable to add input request: {}, will send OutputRequest: {}", inputRequest, outputRequest);
+        return ResponseEntity.badRequest().body(outputRequest);
+
+    }
+
+    @PostMapping(value = "/GENERIC-RESOURCE-API:vnf-topology-operation/",
+            consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
+            produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+    public ResponseEntity<?> postVnfOperationInformation(
+            @RequestBody final InputRequest<GenericResourceApiVnfOperationInformation> inputRequest,
+            final HttpServletRequest request) {
+        LOGGER.info("Request Received: {}  ...", inputRequest);
+
+        final GenericResourceApiVnfOperationInformation apiVnfOperationInformation = inputRequest.getInput();
+        if (apiVnfOperationInformation == null) {
+            LOGGER.error("Invalid input request: {}", inputRequest);
+            return ResponseEntity.badRequest().build();
+        }
+
+        final Output output = cacheServiceProvider.putVnfOperationInformation(apiVnfOperationInformation);
+        final OutputRequest outputRequest = new OutputRequest(output);
+
+        if (output.getResponseCode().equals(HttpStatus.OK.toString())) {
+            LOGGER.info("Sucessfully added vnf in cache sending response: {}", outputRequest);
             return ResponseEntity.ok(outputRequest);
         }
 
+        LOGGER.error("Unable to add input request: {}, will send OutputRequest: {}", inputRequest, outputRequest);
         return ResponseEntity.badRequest().body(outputRequest);
 
     }