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=0242b90f841d7769320ead45d6e891b410186261;hb=3e8bccd59c63f424052fcef5930e94a6629a1a95;hp=e50a98ce517b051efdd70498fc802a878279d964;hpb=1b8d76de3262675c5afe45351929b0d5d2c0bab1;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 e50a98ce..0242b90f 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 @@ -35,16 +35,20 @@ import org.oransc.policyagent.configuration.RicConfig; * Represents the dynamic information about a NearRealtime-RIC. */ public class Ric { - private final RicConfig ricConfig; + @Setter + private RicConfig ricConfig; private RicState state = RicState.UNDEFINED; private Map supportedPolicyTypes = new HashMap<>(); @Getter @Setter private A1ProtocolType protocolVersion = A1ProtocolType.UNKNOWN; + @Getter + private final Lock lock = new Lock(); + /** - * Creates the Ric. Initial state is {@link RicState.NOT_INITIATED}. + * Creates the Ric. Initial state is {@link RicState.UNDEFINED}. * * @param ricConfig The {@link RicConfig} for this Ric. */ @@ -74,7 +78,7 @@ public class Ric { * @return a vector containing the nodes managed by this Ric. */ public synchronized Collection getManagedElementIds() { - return new Vector<>(ricConfig.managedElementIds()); + return ricConfig.managedElementIds(); } /** @@ -87,26 +91,6 @@ public class Ric { return ricConfig.managedElementIds().contains(managedElementId); } - /** - * Adds the given node as managed by this Ric. - * - * @param managedElementId the node to add. - */ - public synchronized void addManagedElement(String managedElementId) { - if (!ricConfig.managedElementIds().contains(managedElementId)) { - ricConfig.managedElementIds().add(managedElementId); - } - } - - /** - * Removes the given node as managed by this Ric. - * - * @param managedElementId the node to remove. - */ - public synchronized void removeManagedElement(String managedElementId) { - ricConfig.managedElementIds().remove(managedElementId); - } - /** * Gets the policy types supported by this Ric. * @@ -156,9 +140,9 @@ public class Ric { /** * Represents the states possible for a Ric. */ - public static enum RicState { + public enum RicState { /** - * The agent view of the agent may be inconsistent. + * The agent view of the Ric may be inconsistent. */ UNDEFINED, /** @@ -166,8 +150,8 @@ public class Ric { */ IDLE, /** - * The Ric states are recovered. + * The agent is synchronizing the view of the Ric. */ - RECOVERING + SYNCHRONIZING } }