X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fportal%2Fnonrtric%2Fcontrolpanel%2Fpolicyagentapi%2FPolicyAgentApiImpl.java;h=f8b7c3ea9606d0c62e818ac7b1cbb79ada21d1b1;hb=b75ca3906ec5d7eb2b48501e9c2abec3c3243ce4;hp=86eb81ef0219f0e44680c89e7f089079facfb544;hpb=f507d92d55ee77fad16cc024ea95c869e0d5dc32;p=portal%2Fnonrtric-controlpanel.git diff --git a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/policyagentapi/PolicyAgentApiImpl.java b/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/policyagentapi/PolicyAgentApiImpl.java index 86eb81e..f8b7c3e 100644 --- a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/policyagentapi/PolicyAgentApiImpl.java +++ b/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/policyagentapi/PolicyAgentApiImpl.java @@ -32,147 +32,160 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import java.util.Map; import org.immutables.gson.Gson; import org.immutables.value.Value; import org.oransc.portal.nonrtric.controlpanel.model.ImmutablePolicyInfo; import org.oransc.portal.nonrtric.controlpanel.model.PolicyInfo; -import org.oransc.portal.nonrtric.controlpanel.model.PolicyInstances; import org.oransc.portal.nonrtric.controlpanel.model.PolicyType; import org.oransc.portal.nonrtric.controlpanel.model.PolicyTypes; +import org.oransc.portal.nonrtric.controlpanel.util.AsyncRestClient; +import org.oransc.portal.nonrtric.controlpanel.util.ErrorResponseHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; -import org.springframework.web.client.RestTemplate; @Component("PolicyAgentApi") public class PolicyAgentApiImpl implements PolicyAgentApi { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - RestTemplate restTemplate; + private final AsyncRestClient webClient; private static com.google.gson.Gson gson = new GsonBuilder() // .serializeNulls() // .create(); // - private final String urlPrefix; - @Autowired public PolicyAgentApiImpl( @org.springframework.beans.factory.annotation.Value("${policycontroller.url.prefix}") final String urlPrefix) { - this(urlPrefix, new RestTemplate()); + this(new AsyncRestClient(urlPrefix)); logger.debug("ctor prefix '{}'", urlPrefix); } - public PolicyAgentApiImpl(String urlPrefix, RestTemplate restTemplate) { - this.urlPrefix = urlPrefix; - this.restTemplate = restTemplate; - } - - private String baseUrl() { - return urlPrefix; - } - - @Value.Immutable - @Gson.TypeAdapters - interface PolicyTypeInfo { - - public String name(); - - public String schema(); + public PolicyAgentApiImpl(AsyncRestClient webClient) { + this.webClient = webClient; } @Override public ResponseEntity getAllPolicyTypes() { try { - String url = baseUrl() + "/policy_schemas"; - ResponseEntity rsp = this.restTemplate.getForEntity(url, String.class); + final String url = "/v2/policy-types"; + ResponseEntity rsp = webClient.getForEntity(url).block(); if (!rsp.getStatusCode().is2xxSuccessful()) { return rsp; } PolicyTypes result = new PolicyTypes(); + JsonArray policyTypeIds = JsonParser.parseString(rsp.getBody()).getAsJsonObject() // + .get("policytype_ids") // + .getAsJsonArray(); // + + for (JsonElement policyTypeId : policyTypeIds) { + + String typeId = policyTypeId.getAsString(); - JsonArray schemas = JsonParser.parseString(rsp.getBody()).getAsJsonArray(); - for (JsonElement schema : schemas) { - JsonObject schemaObj = schema.getAsJsonObject(); - String title = schemaObj.get("title").getAsString(); - String schemaAsStr = schemaObj.toString(); - PolicyType pt = new PolicyType(title, schemaAsStr); + JsonObject schemaObj = getIndividualPolicySchema(typeId); + PolicyType pt = new PolicyType(typeId, schemaObj.toString()); result.add(pt); } return new ResponseEntity<>(gson.toJson(result), rsp.getStatusCode()); } catch (Exception e) { - return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR); + return ErrorResponseHandler.handleException(e); } } - @Override - public ResponseEntity getPolicyInstancesForType(String type) { - String url = baseUrl() + "/policies?type={type}"; - Map uriVariables = Map.of("type", type); - ResponseEntity rsp = this.restTemplate.getForEntity(url, String.class, uriVariables); - if (!rsp.getStatusCode().is2xxSuccessful()) { - return rsp; + public JsonObject getIndividualPolicySchema(String id) { + try { + final String url = "/v2/policy-types/" + id; + ResponseEntity rsp = webClient.getForEntity(url).block(); + if (!rsp.getStatusCode().is2xxSuccessful()) { + return null; + } + + JsonObject policy_schema = JsonParser.parseString(rsp.getBody()).getAsJsonObject() // + .get("policy_schema") // + .getAsJsonObject(); // + + return policy_schema; + } catch (Exception e) { + return null; } + } + @Override + public ResponseEntity getPolicyInstancesForType(String type) { try { - Type listType = new TypeToken>() {}.getType(); - List rspParsed = gson.fromJson(rsp.getBody(), listType); - PolicyInstances result = new PolicyInstances(); - for (PolicyInfo p : rspParsed) { - result.add(p); + String url = "/v2/policies?policytype_id=" + type; + ResponseEntity rsp = webClient.getForEntity(url).block(); + if (!rsp.getStatusCode().is2xxSuccessful()) { + return rsp; } - return new ResponseEntity<>(gson.toJson(result), rsp.getStatusCode()); + JsonArray policyInstances = JsonParser.parseString(rsp.getBody()).getAsJsonObject() // + .get("policy_ids") // + .getAsJsonArray(); // + + Type listType = new TypeToken>() {}.getType(); + List rspParsed = gson.fromJson(policyInstances, listType); + + return new ResponseEntity<>(gson.toJson(rspParsed), rsp.getStatusCode()); } catch (Exception e) { - return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR); + return ErrorResponseHandler.handleException(e); } } @Override public ResponseEntity getPolicyInstance(String id) { - String url = baseUrl() + "/policy?instance={id}"; - Map uriVariables = Map.of("id", id); + try { + String url = "/v2/policies/" + id; + ResponseEntity rsp = webClient.getForEntity(url).block(); + JsonObject obj = JsonParser.parseString(rsp.getBody()).getAsJsonObject(); + String str = obj.toString(); + return new ResponseEntity<>(str, rsp.getStatusCode()); + } catch (Exception e) { + ResponseEntity rsp = ErrorResponseHandler.handleException(e); + return new ResponseEntity<>(rsp.getBody(), rsp.getStatusCode()); + } + } - return this.restTemplate.getForEntity(url, Object.class, uriVariables); + private String getTimeStampUTC() { + return java.time.Instant.now().toString(); } @Override public ResponseEntity putPolicy(String policyTypeIdString, String policyInstanceId, Object json, String ric) { - String url = baseUrl() + "/policy?type={type}&instance={instance}&ric={ric}&service={service}"; - Map uriVariables = Map.of( // - "type", policyTypeIdString, // - "instance", policyInstanceId, // - "ric", ric, // - "service", "controlpanel"); + String url = "/v2/policies/"; + + PolicyInfo i = ImmutablePolicyInfo.builder() // + .id(policyInstanceId) // + .type(policyTypeIdString) // + .ric(ric) // + .json(json) // + .service("controlpanel") // + .lastModified(getTimeStampUTC()) // + .build(); // try { - this.restTemplate.put(url, createJsonHttpEntity(json), uriVariables); + String jsonStr = gson.toJson(i, PolicyInfo.class); + webClient.putForEntity(url, jsonStr).block(); return new ResponseEntity<>(HttpStatus.OK); } catch (Exception e) { - return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR); + return ErrorResponseHandler.handleException(e); } } @Override public ResponseEntity deletePolicy(String policyInstanceId) { - String url = baseUrl() + "/policy?instance={instance}"; - Map uriVariables = Map.of("instance", policyInstanceId); + String url = "/v2/policies/" + policyInstanceId; try { - this.restTemplate.delete(url, uriVariables); + webClient.deleteForEntity(url).block(); return new ResponseEntity<>(HttpStatus.OK); } catch (Exception e) { - return new ResponseEntity<>(e.getMessage(), HttpStatus.NOT_FOUND); + return ErrorResponseHandler.handleException(e); } - } @Value.Immutable @@ -187,27 +200,27 @@ public class PolicyAgentApiImpl implements PolicyAgentApi { @Override public ResponseEntity getRicsSupportingType(String typeName) { - String url = baseUrl() + "/rics?policyType={typeName}"; - Map uriVariables = Map.of("typeName", typeName); - String rsp = this.restTemplate.getForObject(url, String.class, uriVariables); - try { + String url = "/v2/rics?policytype_id=" + typeName; + ResponseEntity rsp = webClient.getForEntity(url).block(); + if (!rsp.getStatusCode().is2xxSuccessful()) { + return rsp; + } + + JsonArray rics = JsonParser.parseString(rsp.getBody()).getAsJsonObject() // + .get("rics") // + .getAsJsonArray(); // + Type listType = new TypeToken>() {}.getType(); - List rspParsed = gson.fromJson(rsp, listType); + List rspParsed = gson.fromJson(rics, listType); Collection result = new ArrayList<>(rspParsed.size()); for (RicInfo ric : rspParsed) { result.add(ric.ricName()); } - return new ResponseEntity<>(gson.toJson(result), HttpStatus.OK); + String json = gson.toJson(result); + return new ResponseEntity<>(json, HttpStatus.OK); } catch (Exception e) { - return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR); + return ErrorResponseHandler.handleException(e); } } - - private HttpEntity createJsonHttpEntity(Object content) { - HttpHeaders headers = new HttpHeaders(); - headers.setContentType(MediaType.APPLICATION_JSON); - return new HttpEntity<>(content, headers); - } - }