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=20e72bb85fa04c77fb62698a6cbb94cc3f65ea06;hpb=0bcfde8903ba3f1fb99fcab3bf39f7f4e6ccbe1e;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 20e72bb..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 @@ -33,24 +33,20 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import javax.net.ssl.SSLException; - 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.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; -import org.springframework.web.client.HttpClientErrorException; -import org.springframework.web.client.HttpServerErrorException; @Component("PolicyAgentApi") public class PolicyAgentApiImpl implements PolicyAgentApi { @@ -76,134 +72,181 @@ public class PolicyAgentApiImpl implements PolicyAgentApi { @Override public ResponseEntity getAllPolicyTypes() { try { - final String url = "/policy_schemas"; + 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(); // + + for (JsonElement policyTypeId : policyTypeIds) { + + String typeId = policyTypeId.getAsString(); - JsonArray schemas = JsonParser.parseString(rsp.getBody()).getAsJsonArray(); - for (JsonElement schema : schemas) { - JsonObject schemaObj = schema.getAsJsonObject(); - if (schemaObj.get("title") != null) { - String title = schemaObj.get("title").getAsString(); - String schemaAsStr = schemaObj.toString(); - PolicyType pt = new PolicyType(title, schemaAsStr); - result.add(pt); - } else { - logger.warn("Ignoring schema: {}", schemaObj); - } + 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 handleException(e); + 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) { try { - String url = "/policies?type=" + type; + String url = "/a1-policy/v2/policies?policytype_id=" + type; ResponseEntity rsp = webClient.getForEntity(url).block(); if (!rsp.getStatusCode().is2xxSuccessful()) { return rsp; } - - Type listType = new TypeToken>() {}.getType(); - List rspParsed = gson.fromJson(rsp.getBody(), listType); - PolicyInstances result = new PolicyInstances(); - for (PolicyInfo p : rspParsed) { - result.add(p); + 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(result), rsp.getStatusCode()); + + return new ResponseEntity<>(gson.toJson(res), rsp.getStatusCode()); } catch (Exception e) { - return handleException(e); + return ErrorResponseHandler.handleException(e); } } - @Override - public ResponseEntity getPolicyInstance(String id) { + public ResponseEntity getIndividualPolicyInstance(String id) { try { - String url = "/policy?id=" + id; + String url = "/a1-policy/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()); + + // 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) { - ResponseEntity rsp = handleException(e); + 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) { + 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 = - "/policy?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 { - String jsonStr = json.toString(); + 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 handleException(e); + return ErrorResponseHandler.handleException(e); } } @Override public ResponseEntity deletePolicy(String policyInstanceId) { - String url = "/policy?id=" + policyInstanceId; + String url = "/a1-policy/v2/policies/" + policyInstanceId; try { webClient.deleteForEntity(url).block(); return new ResponseEntity<>(HttpStatus.OK); } catch (Exception e) { - return handleException(e); + 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) { try { - String url = "/rics?policyType=" + typeName; + 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.getBody(), 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()); } String json = gson.toJson(result); return new ResponseEntity<>(json, HttpStatus.OK); } catch (Exception e) { - return handleException(e); - } - } - - private ResponseEntity handleException(Exception throwable) { - if (throwable instanceof HttpClientErrorException) { - HttpClientErrorException e = (HttpClientErrorException) throwable; - return new ResponseEntity<>(e.getMessage(), e.getStatusCode()); - } else if (throwable instanceof HttpServerErrorException) { - HttpServerErrorException e = (HttpServerErrorException) throwable; - return new ResponseEntity<>(e.getResponseBodyAsString(), e.getStatusCode()); - } else if (throwable instanceof SSLException) { - SSLException e = (SSLException) throwable; - return new ResponseEntity<>("Could not create WebClient " + e.getMessage(), - HttpStatus.INTERNAL_SERVER_ERROR); + return ErrorResponseHandler.handleException(e); } - return new ResponseEntity<>(throwable.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR); } }