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=bfd8ef65e1316ca8e6e6a640fe4aa9a58cd5be77;hpb=63036ab25f7878781e74b2ca0706b28451f59f27;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 bfd8ef65..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 @@ -20,8 +20,12 @@ package org.oransc.policyagent.repository; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.Vector; + import org.oransc.policyagent.configuration.RicConfig; -import org.oransc.policyagent.repository.Ric.RicState; /** * Represents the dynamic information about a NearRealtime-RIC. @@ -29,6 +33,7 @@ import org.oransc.policyagent.repository.Ric.RicState; public class Ric { private final RicConfig ricConfig; private RicState state = RicState.NOT_INITIATED; + private Map supportedPolicyTypes = new HashMap<>(); /** * Creates the Ric. Initial state is {@link RicState.NOT_INITIATED}. @@ -51,34 +56,93 @@ public class Ric { state = newState; } + public RicConfig getConfig() { + return this.ricConfig; + } + + /** + * Gets the nodes managed by this Ric. + * + * @return a vector containing the nodes managed by this Ric. + */ + 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 removeManagedElement(String managedElementId) { + ricConfig.managedElementIds().remove(managedElementId); + } + + /** + * Gets the policy types supported by this Ric. + * + * @return the policy types supported by this Ric in an unmodifiable list. + */ + public Collection getSupportedPolicyTypes() { + return supportedPolicyTypes.values(); + } + + public Collection getSupportedPolicyTypeNames() { + return supportedPolicyTypes.keySet(); + } + + /** + * Adds a policy type as supported by this Ric. + * + * @param type the policy type to support. */ - public void removeManagedNode(String nodeName) { - ricConfig.managedElementIds().remove(nodeName); + public void addSupportedPolicyType(PolicyType type) { + supportedPolicyTypes.put(type.name(), type); + } + + /** + * Removes all policy type as supported by this Ric. + */ + public void clearSupportedPolicyTypes() { + supportedPolicyTypes.clear(); + } + + /** + * Checks if a type is supported by this Ric. + * + * @param typeName the name of the type to check if it is supported. + * + * @return true if the given type is supported by this Ric, false otherwise. + */ + public boolean isSupportingType(String typeName) { + return supportedPolicyTypes.containsKey(typeName); + } + + @Override + public String toString() { + return Ric.class.getSimpleName() + ": " + "name: " + name() + ", state: " + state + ", baseUrl: " + + ricConfig.baseUrl() + ", managedNodes: " + ricConfig.managedElementIds(); } /** @@ -94,12 +158,8 @@ public class Ric { */ ACTIVE, /** - * Something is wrong with the Ric. - */ - FAULTY, - /** - * The node is unreachable at the moment. + * The Ric cannot be contacted. */ - UNREACHABLE + NOT_REACHABLE, RECOVERING } }