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;
@Override
public ResponseEntity<String> getAllPolicyTypes() {
- final String TITLE = "title";
try {
- final String url = "/policy_schemas";
+ final String url = "/a1-policy/v2/policy-types";
ResponseEntity<String> rsp = webClient.getForEntity(url).block();
if (!rsp.getStatusCode().is2xxSuccessful()) {
return rsp;
}
PolicyTypes result = new PolicyTypes();
- JsonArray schemas = JsonParser.parseString(rsp.getBody()).getAsJsonArray();
- for (JsonElement schema : schemas) {
- JsonObject schemaObj = schema.getAsJsonObject();
- String title = "";
- if (schemaObj.get(TITLE) != null) {
- title = schemaObj.get(TITLE).getAsString();
- }
- PolicyType pt = new PolicyType(title, schemaObj.toString());
+ JsonArray policyTypeIds = JsonParser.parseString(rsp.getBody()).getAsJsonObject() //
+ .get("policytype_ids") //
+ .getAsJsonArray(); //
+
+ 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());
}
}
+ public JsonObject getIndividualPolicySchema(String id) {
+ try {
+ final String url = "/a1-policy/v2/policy-types/" + id;
+ ResponseEntity<String> 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<String> getPolicyInstancesForType(String type) {
try {
- String url = "/policies?type=" + type;
+ String url = "/a1-policy/v2/policies?policytype_id=" + type;
ResponseEntity<String> rsp = webClient.getForEntity(url).block();
if (!rsp.getStatusCode().is2xxSuccessful()) {
return rsp;
}
-
- Type listType = new TypeToken<List<ImmutablePolicyInfo>>() {}.getType();
- List<PolicyInfo> 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<Object> res = new ArrayList<>();
+ for (JsonElement p : policyInstances) {
+ ResponseEntity<Object> 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 ErrorResponseHandler.handleException(e);
}
}
- @Override
- public ResponseEntity<Object> getPolicyInstance(String id) {
+ public ResponseEntity<Object> getIndividualPolicyInstance(String id) {
try {
- String url = "/policy?id=" + id;
+ String url = "/a1-policy/v2/policies/" + id;
ResponseEntity<String> 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<String> 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<String> rsp = ErrorResponseHandler.handleException(e);
+ return new ResponseEntity<>(rsp.getBody(), rsp.getStatusCode());
+ }
+ }
+
+ public ResponseEntity<String> getPolicyStatus(String id) {
+ try {
+ String url = "/a1-policy/v2/policies/" + id + "/status";
+ ResponseEntity<String> rsp = webClient.getForEntity(url).block();
+ return new ResponseEntity<>(rsp.getBody(), rsp.getStatusCode());
} catch (Exception e) {
ResponseEntity<String> rsp = ErrorResponseHandler.handleException(e);
return new ResponseEntity<>(rsp.getBody(), rsp.getStatusCode());
}
}
+ @Override
+ public ResponseEntity<Object> getPolicyInstance(String id) {
+ ResponseEntity<Object> rsp = getIndividualPolicyInstance(id);
+ PolicyInfo i = (PolicyInfo) rsp.getBody();
+ return new ResponseEntity<>(i.policyData, rsp.getStatusCode());
+ }
+
@Override
public ResponseEntity<String> 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) {
@Override
public ResponseEntity<String> 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);
@Value.Immutable
@Gson.TypeAdapters
interface RicInfo {
- public String ricName();
+ public String ric_id();
- public Collection<String> nodeNames();
+ public Collection<String> managed_element_ids();
- public Collection<String> policyTypes();
+ public Collection<String> policytype_ids();
}
@Override
public ResponseEntity<String> getRicsSupportingType(String typeName) {
try {
- String url = "/rics?policyType=" + typeName;
+ String url = "/a1-policy/v2/rics?policytype_id=" + typeName;
ResponseEntity<String> 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<List<ImmutableRicInfo>>() {}.getType();
- List<RicInfo> rspParsed = gson.fromJson(rsp.getBody(), listType);
+ List<RicInfo> rspParsed = gson.fromJson(rics, listType);
Collection<String> 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);
Code Review / portal / nonrtric-controlpanel.git / blobdiff