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=ee961ab66cc189dcd704fdf286a564acf0a1e721;hb=refs%2Fchanges%2F46%2F5546%2F1;hp=c08444322f43894ee60c0675a8975cbb96a9bbd0;hpb=626cd0f862a3513f9267fed66c21bf9053b7b163;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 c084443..ee961ab 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,182 +32,221 @@ 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.PolicyInstance; 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 = "/a1-policy/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(); // - 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); + for (JsonElement policyTypeId : policyTypeIds) { + + String typeId = policyTypeId.getAsString(); + + 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); + } + } + + public JsonObject getIndividualPolicySchema(String id) { + try { + final String url = "/a1-policy/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) { - 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; + try { + String url = "/a1-policy/v2/policies?policytype_id=" + type; + ResponseEntity rsp = webClient.getForEntity(url).block(); + if (!rsp.getStatusCode().is2xxSuccessful()) { + return rsp; + } + JsonArray policyInstances = JsonParser.parseString(rsp.getBody()).getAsJsonObject() // + .get("policy_ids") // + .getAsJsonArray(); // + + List res = new ArrayList<>(); + for (JsonElement p : policyInstances) { + ResponseEntity policyInstance = getIndividualPolicyInstance(p.getAsString()); + res.add(policyInstance.getBody()); + } + + return new ResponseEntity<>(gson.toJson(res), rsp.getStatusCode()); + } catch (Exception e) { + return ErrorResponseHandler.handleException(e); } + } + public ResponseEntity getIndividualPolicyInstance(String id) { try { - Type listType = new TypeToken>() {}.getType(); - List rspParsed = gson.fromJson(rsp.getBody(), listType); - PolicyInstances result = new PolicyInstances(); - for (PolicyInfo p : rspParsed) { - result.add(p); - } - return new ResponseEntity<>(gson.toJson(result), rsp.getStatusCode()); + String url = "/a1-policy/v2/policies/" + id; + ResponseEntity rsp = webClient.getForEntity(url).block(); + JsonObject obj = JsonParser.parseString(rsp.getBody()).getAsJsonObject(); + + // lastModified timestamp is fetched from PolicyStatus instead + ResponseEntity status = getPolicyStatus(id); + String lastModified = JsonParser.parseString(status.getBody()).getAsJsonObject() // + .get("last_modified") // + .getAsString(); // + obj.addProperty("lastModified", lastModified); + + PolicyInfo i = gson.fromJson(obj, PolicyInfo.class); + return new ResponseEntity<>(i, rsp.getStatusCode()); } catch (Exception e) { - return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR); + ResponseEntity rsp = ErrorResponseHandler.handleException(e); + return new ResponseEntity<>(rsp.getBody(), rsp.getStatusCode()); + } + } + + public ResponseEntity getPolicyStatus(String id) { + try { + String url = "/a1-policy/v2/policies/" + id + "/status"; + ResponseEntity rsp = webClient.getForEntity(url).block(); + return new ResponseEntity<>(rsp.getBody(), rsp.getStatusCode()); + } catch (Exception e) { + ResponseEntity rsp = ErrorResponseHandler.handleException(e); + return new ResponseEntity<>(rsp.getBody(), rsp.getStatusCode()); } } @Override public ResponseEntity getPolicyInstance(String id) { - String url = baseUrl() + "/policy?id={id}"; - Map uriVariables = Map.of("id", id); - - return this.restTemplate.getForEntity(url, Object.class, uriVariables); + ResponseEntity rsp = getIndividualPolicyInstance(id); + PolicyInfo i = (PolicyInfo) rsp.getBody(); + return new ResponseEntity<>(i.policyData, rsp.getStatusCode()); } @Override public ResponseEntity putPolicy(String policyTypeIdString, String policyInstanceId, Object json, String ric) { - String url = baseUrl() + "/policy?type={type}&id={id}&ric={ric}&service={service}"; - Map uriVariables = Map.of( // - "type", policyTypeIdString, // - "id", policyInstanceId, // - "ric", ric, // - "service", "controlpanel"); + String url = "/a1-policy/v2/policies/"; + + JsonElement data = JsonParser.parseString(json.toString()).getAsJsonObject(); + + PolicyInstance i = PolicyInstance.builder() // + .policyId(policyInstanceId) // + .policyTypeId(policyTypeIdString) // + .ricId(ric) // + .policyData(data) // + .serviceId("controlpanel") // + .build(); // try { - this.restTemplate.put(url, createJsonHttpEntity(json), uriVariables); + String jsonStr = gson.toJson(i, PolicyInstance.class); + logger.debug("PolicyInstance: " + jsonStr); + 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?id={id}"; - Map uriVariables = Map.of("id", policyInstanceId); + String url = "/a1-policy/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 @Gson.TypeAdapters interface RicInfo { - public String ricName(); + public String ric_id(); - public Collection nodeNames(); + public Collection managed_element_ids(); - public Collection policyTypes(); + public Collection policytype_ids(); } @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 = "/a1-policy/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()); + result.add(ric.ric_id()); } - 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); - } - }