X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fpolicyagent%2FMockPolicyAgent.java;h=d7b9fec0290d9a2d2d31c8dbb0d2fbbbd7640c6b;hb=bca519150103ccd308dd492e07744bc494a4a4ec;hp=dda6426978139b328fa0f11f0d51d43fa20f7d9d;hpb=dfbd081159b02601a48162a647848223a9303ebf;p=nonrtric.git diff --git a/policy-agent/src/test/java/org/oransc/policyagent/MockPolicyAgent.java b/policy-agent/src/test/java/org/oransc/policyagent/MockPolicyAgent.java index dda64269..d7b9fec0 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/MockPolicyAgent.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/MockPolicyAgent.java @@ -35,6 +35,7 @@ import org.oransc.policyagent.clients.A1Client; import org.oransc.policyagent.configuration.ApplicationConfig; import org.oransc.policyagent.repository.ImmutablePolicyType; import org.oransc.policyagent.repository.Policies; +import org.oransc.policyagent.repository.Policy; import org.oransc.policyagent.repository.PolicyType; import org.oransc.policyagent.repository.PolicyTypes; import org.oransc.policyagent.repository.Rics; @@ -80,7 +81,7 @@ public class MockPolicyAgent { } @Override - public Flux getAllPolicyTypes(String nearRtRicUrl) { + public Flux getPolicyTypeIdentities(String nearRtRicUrl) { Vector result = new Vector<>(); for (PolicyType p : this.policyTypes.getAll()) { result.add(p.name()); @@ -89,14 +90,18 @@ public class MockPolicyAgent { } @Override - public Flux getPoliciesForType(String nearRtRicUrl, String policyTypeId) { - return Flux.empty(); + public Flux getPolicyIdentities(String nearRtRicUrl) { + Vector result = new Vector<>(); + for (Policy p : this.policies.getAll()) { + result.add(p.id()); + } + return Flux.fromIterable(result); } @Override - public Mono getPolicy(String nearRtRicUrl, String policyId) { + public Mono getPolicyType(String nearRtRicUrl, String policyTypeId) { try { - return Mono.just(this.policies.get(policyId).json()); + return Mono.just(this.policyTypes.getType(policyTypeId).toString()); } catch (Exception e) { return Mono.error(e); } @@ -188,7 +193,7 @@ public class MockPolicyAgent { try { String schema = readFile(file); String typeName = title(schema); - PolicyType type = ImmutablePolicyType.builder().name(typeName).jsonSchema(schema).build(); + PolicyType type = ImmutablePolicyType.builder().name(typeName).build(); policyTypes.put(type); } catch (Exception e) { System.out.println("Could not load json schema " + e);