X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fcontrollers%2FPolicyController.java;h=21521b77b4a31f76c66a451861405bc10bf6ab74;hb=3ed724aaef96d30347f9a60ca111627b28133721;hp=a507a2b14a60cf000395ec94a7060f6793dd2c67;hpb=412e0a2f5d16a227374ebd417e7545a514df1143;p=nonrtric.git

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/controllers/PolicyController.java b/policy-agent/src/main/java/org/oransc/policyagent/controllers/PolicyController.java
index a507a2b1..21521b77 100644
--- a/policy-agent/src/main/java/org/oransc/policyagent/controllers/PolicyController.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/controllers/PolicyController.java
@@ -19,94 +19,81 @@
  */
 package org.oransc.policyagent.controllers;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-
-import java.util.Vector;
-
 import org.oransc.policyagent.configuration.ApplicationConfig;
-import org.oransc.policyagent.configuration.RicConfig;
+import org.oransc.policyagent.exceptions.ServiceException;
+import org.oransc.policyagent.repository.ImmutablePolicy;
+import org.oransc.policyagent.repository.Policies;
+import org.oransc.policyagent.repository.Policy;
+import org.oransc.policyagent.repository.PolicyTypes;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import reactor.core.publisher.Mono;
 
 @RestController
 public class PolicyController {
 
     private final ApplicationConfig appConfig;
-    private static Gson gson = new GsonBuilder() //
-        .serializeNulls() //
-        .create(); //
+    private final PolicyTypes types;
+    private final Policies policies;
 
     @Autowired
-    PolicyController(ApplicationConfig config) {
+    PolicyController(ApplicationConfig config, PolicyTypes types, Policies policies) {
         this.appConfig = config;
+        this.types = types;
+        this.policies = policies;
     }
 
     // http://localhost:8080/policy?type=type3&instance=xxx
     @GetMapping("/policy")
-    public String getPolicy(@RequestParam(name = "type", required = false, defaultValue = "type1") String typeName,
+    public ResponseEntity<String> getPolicy( //
+        @RequestParam(name = "type", required = false, defaultValue = "type1") String typeName, //
         @RequestParam(name = "instance", required = false, defaultValue = "new") String instanceId) {
-        System.out.println("**** getPolicy " + typeName);
 
-        return "policy" + typeName + instanceId;
+        return new ResponseEntity<String>("policy" + typeName + instanceId, HttpStatus.OK);
     }
 
-    public String getHello() {
-        return "Howdy";
-    }
-
-    @GetMapping("/status")
-    @ApiOperation(value = "Returns status and statistics of the service")
-    @ApiResponses(
-        value = { //
-            @ApiResponse(code = 200, message = "DATAFILE service is living"),
-            @ApiResponse(code = 401, message = "You are not authorized to view the resource"),
-            @ApiResponse(code = 403, message = "Accessing the resource you were trying to reach is forbidden"),
-            @ApiResponse(code = 404, message = "The resource you were trying to reach is not found") //
-        })
-    public Mono<ResponseEntity<String>> getStatus() {
-        Mono<ResponseEntity<String>> response = Mono.just(new ResponseEntity<>("hunky dory", HttpStatus.OK));
-        return response;
-    }
-
-    // http://localhost:8080/rics?managedElementId=kista_1
-    @GetMapping("/rics")
-    @ApiOperation(value = "Returns defined NearRT RIC:s")
-    public ResponseEntity<String> getRics(
-        @RequestParam(name = "managedElementId", required = false, defaultValue = "") String managedElementId) {
-        Vector<RicInfo> result = new Vector<RicInfo>();
-        Vector<RicConfig> config = getRicConfigs(managedElementId);
-
-        for (RicConfig ricConfig : config) {
-            RicInfo ric = ImmutableRicInfo.builder() //
-                .managedElementIds(ricConfig.managedElementIds()) //
-                .name(ricConfig.name()) //
+    @PutMapping(path = "/policy")
+    public ResponseEntity<String> putPolicy( //
+        @RequestParam(name = "type", required = true) String type, //
+        @RequestParam(name = "instance", required = true) String instanceId, //
+        @RequestParam(name = "ric", required = true) String ric, //
+        @RequestParam(name = "service", required = true) String service, //
+        @RequestBody String jsonBody) {
+
+        System.out.println("*********************** " + jsonBody);
+
+        try {
+            Policy policy = ImmutablePolicy.builder() //
+                .id(instanceId) //
+                .json(jsonBody) //
+                .type(types.getType(type)) //
+                .ric(appConfig.getRic(ric)) //
+                .ownerServiceName(service) //
                 .build();
-            result.add(ric);
+            policies.put(instanceId, policy);
+            return new ResponseEntity<String>(HttpStatus.OK);
+        } catch (ServiceException e) {
+            System.out.println("*********************** " + e.getMessage());
+
+            return new ResponseEntity<String>(e.getMessage(), HttpStatus.NOT_FOUND);
         }
 
-        return new ResponseEntity<>(gson.toJson(result), HttpStatus.OK);
     }
 
-    private Vector<RicConfig> getRicConfigs(String managedElementId) {
-        if (managedElementId.equals("")) {
-            return this.appConfig.getRicConfigs();
-        }
-
-        Vector<RicConfig> result = new Vector<RicConfig>(1);
-        appConfig.getRicConfig(managedElementId).ifPresent((config) -> {
-            result.add(config);
-        });
-        return result;
+    @PutMapping(path = "/policyX")
+    public ResponseEntity<String> putPolicyX( //
+        // @RequestParam(name = "type", required = false) String type, //
+        // @RequestParam(name = "instance", required = true) String instance, //
+        // @RequestParam(name = "ric", required = true) String ric, //
+        @RequestBody String jsonBody) {
+        System.out.println("*********************** " + jsonBody);
+        // System.out.println("policy" + type + instance);
+        return new ResponseEntity<String>(HttpStatus.OK);
     }
 
 }