X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Frepository%2FRic.java;h=82d84f1271e50aaa8ee5ef4df806e96e56f4b4a8;hb=de026fb34e3dc3200acdb022782fe68615176ead;hp=18a2dc7e2830ce140fd5309f7bd4d1d61fcd8c02;hpb=023c1b75327ff105348f9dc8eedc0cbf45e7a419;p=nonrtric.git diff --git a/policy-agent/src/main/java/org/oransc/policyagent/repository/Ric.java b/policy-agent/src/main/java/org/oransc/policyagent/repository/Ric.java index 18a2dc7e..82d84f12 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/repository/Ric.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/repository/Ric.java @@ -65,38 +65,38 @@ public class Ric { * * @return a vector containing the nodes managed by this Ric. */ - public Vector getManagedNodes() { + public Vector getManagedElementIds() { return ricConfig.managedElementIds(); } /** * Determines if the given node is managed by this Ric. * - * @param nodeName the node name to check. + * @param managedElementId the node name to check. * @return true if the given node is managed by this Ric. */ - public boolean isManaging(String nodeName) { - return ricConfig.managedElementIds().contains(nodeName); + public boolean isManaging(String managedElementId) { + return ricConfig.managedElementIds().contains(managedElementId); } /** * Adds the given node as managed by this Ric. * - * @param nodeName the node to add. + * @param managedElementId the node to add. */ - public void addManagedNode(String nodeName) { - if (!ricConfig.managedElementIds().contains(nodeName)) { - ricConfig.managedElementIds().add(nodeName); + public void addManagedElement(String managedElementId) { + if (!ricConfig.managedElementIds().contains(managedElementId)) { + ricConfig.managedElementIds().add(managedElementId); } } /** * Removes the given node as managed by this Ric. * - * @param nodeName the node to remove. + * @param managedElementId the node to remove. */ - public void removeManagedNode(String nodeName) { - ricConfig.managedElementIds().remove(nodeName); + public void removeManagedElement(String managedElementId) { + ricConfig.managedElementIds().remove(managedElementId); } /** @@ -122,23 +122,10 @@ public class Ric { } /** - * Adds policy types as supported by this Ric. - * - * @param types the policy types to support. + * Removes all policy type as supported by this Ric. */ - public void addSupportedPolicyTypes(Collection types) { - for (PolicyType type : types) { - addSupportedPolicyType(type); - } - } - - /** - * Removes a policy type as supported by this Ric. - * - * @param type the policy type to remove as supported by this Ric. - */ - public void removeSupportedPolicyType(PolicyType type) { - supportedPolicyTypes.remove(type.name()); + public void clearSupportedPolicyTypes() { + supportedPolicyTypes.clear(); } /** @@ -152,6 +139,12 @@ public class Ric { return supportedPolicyTypes.containsKey(typeName); } + @Override + public String toString() { + return Ric.class.getSimpleName() + ": " + "name: " + name() + ", state: " + state + ", baseUrl: " + + ricConfig.baseUrl() + ", managedNodes: " + ricConfig.managedElementIds(); + } + /** * Represents the states possible for a Ric. */ @@ -163,6 +156,10 @@ public class Ric { /** * The Ric is working fine. */ - ACTIVE + ACTIVE, + /** + * The Ric cannot be contacted. + */ + NOT_REACHABLE, RECOVERING } }