import java.util.List;
import java.util.Optional;
-import org.oransc.policyagent.configuration.ApplicationConfig;
+import org.oransc.policyagent.repository.PolicyTypes;
import org.oransc.policyagent.repository.Ric;
import org.oransc.policyagent.repository.Rics;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;
@RestController
-@Api(value = "RIC Management API")
+@Api(tags = "RIC Repository")
public class RicRepositoryController {
@Autowired
private Rics rics;
+ @Autowired
+ PolicyTypes types;
+
private static Gson gson = new GsonBuilder() //
.serializeNulls() //
.create(); //
- @Autowired
- RicRepositoryController(ApplicationConfig appConfig) {
- }
-
/**
* Example: http://localhost:8081/rics?managedElementId=kista_1
*/
@ApiOperation(value = "Returns the name of a RIC managing one Mananged Element")
@ApiResponses(
value = { //
- @ApiResponse(code = 200, message = "RIC is fond", response = String.class), //
- @ApiResponse(code = 404, message = "RIC is not fond", response = String.class) //
+ @ApiResponse(code = 200, message = "RIC is found", response = String.class), //
+ @ApiResponse(code = 404, message = "RIC is not found", response = String.class) //
})
public ResponseEntity<String> getRic(
- @RequestParam(name = "managedElementId", required = false, defaultValue = "") String managedElementId) {
+ @RequestParam(name = "managedElementId", required = true) String managedElementId) {
Optional<Ric> ric = this.rics.lookupRicForManagedElement(managedElementId);
if (ric.isPresent()) {
return new ResponseEntity<>(ric.get().name(), HttpStatus.OK);
} else {
- return new ResponseEntity<>("", HttpStatus.NOT_FOUND);
+ return new ResponseEntity<>("No RIC found", HttpStatus.NOT_FOUND);
}
}
/**
- * @return a Json array of all RIC data
- * Example: http://localhost:8081/ric
+ * @return a Json array of all RIC data Example: http://localhost:8081/ric
*/
@GetMapping("/rics")
- @ApiOperation(value = "Query NearRT RIC information")
+ @ApiOperation(value = "Query Near-RT RIC information")
@ApiResponses(
value = { //
- @ApiResponse(code = 200, message = "OK", response = RicInfo.class, responseContainer = "List") //
- })
+ @ApiResponse(code = 200, message = "OK", response = RicInfo.class, responseContainer = "List"), //
+ @ApiResponse(code = 404, message = "Policy type is not found", response = String.class)})
public ResponseEntity<String> getRics(
@RequestParam(name = "policyType", required = false) String supportingPolicyType) {
+ if ((supportingPolicyType != null) && (this.types.get(supportingPolicyType) == null)) {
+ return new ResponseEntity<>("Policy type not found", HttpStatus.NOT_FOUND);
+ }
+
List<RicInfo> result = new ArrayList<>();
- synchronized (rics) {
- for (Ric ric : rics.getRics()) {
- if (supportingPolicyType == null || ric.isSupportingType(supportingPolicyType)) {
- result.add(new RicInfo(ric.name(), ric.getManagedElementIds(), ric.getSupportedPolicyTypeNames()));
- }
+ for (Ric ric : rics.getRics()) {
+ if (supportingPolicyType == null || ric.isSupportingType(supportingPolicyType)) {
+ result.add(new RicInfo(ric.name(), ric.getManagedElementIds(), ric.getSupportedPolicyTypeNames(),
+ ric.getState().toString()));
}
}