Merge "Added STD sim 2.0.0 tests"

[nonrtric.git] / policy-agent / src / main / java / org / oransc / policyagent / repository / Ric.java

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 6eece5e..fb2e4b9 100644 (file)
--- 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,39 +20,40 @@
 
 package org.oransc.policyagent.repository;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Vector;
+
 import lombok.Getter;
 import lombok.Setter;
+
 import org.oransc.policyagent.clients.A1Client.A1ProtocolType;
 import org.oransc.policyagent.configuration.RicConfig;
 
 /**
- * Represents the dynamic information about a NearRealtime-RIC.
+ * Represents the dynamic information about a Near-RT RIC.
  */
 public class Ric {
-    private final RicConfig ricConfig;
-    private final List<String> managedElementIds;
 
-    private RicState state = RicState.UNDEFINED;
+    @Setter
+    private RicConfig ricConfig;
+    private RicState state = RicState.UNAVAILABLE;
     private Map<String, PolicyType> 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.
      */
     public Ric(RicConfig ricConfig) {
         this.ricConfig = ricConfig;
-        this.managedElementIds = new ArrayList<>(ricConfig.managedElementIds());
     }
 
     public String name() {
@@ -77,7 +78,7 @@ public class Ric {
      * @return a vector containing the nodes managed by this Ric.
      */
     public synchronized Collection<String> getManagedElementIds() {
-        return managedElementIds;
+        return ricConfig.managedElementIds();
     }
 
     /**
@@ -87,27 +88,7 @@ public class Ric {
      * @return true if the given node is managed by this Ric.
      */
     public synchronized boolean isManaging(String managedElementId) {
-        return 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 (!managedElementIds.contains(managedElementId)) {
-            managedElementIds.add(managedElementId);
-        }
-    }
-
-    /**
-     * Removes the given node as managed by this Ric.
-     *
-     * @param managedElementId the node to remove.
-     */
-    public synchronized void removeManagedElement(String managedElementId) {
-        managedElementIds.remove(managedElementId);
+        return ricConfig.managedElementIds().contains(managedElementId);
     }
 
     /**
@@ -153,7 +134,7 @@ public class Ric {
     @Override
     public synchronized String toString() {
         return Ric.class.getSimpleName() + ": " + "name: " + name() + ", state: " + state + ", baseUrl: "
-            + ricConfig.baseUrl() + ", managedNodes: " + managedElementIds;
+            + ricConfig.baseUrl() + ", managedNodes: " + ricConfig.managedElementIds();
     }
 
     /**
@@ -163,14 +144,19 @@ public class Ric {
         /**
          * The agent view of the Ric may be inconsistent.
          */
-        UNDEFINED,
+        UNAVAILABLE,
         /**
          * The normal state. Policies can be configured.
          */
-        IDLE,
+        AVAILABLE,
         /**
          * The agent is synchronizing the view of the Ric.
          */
-        SYNCHRONIZING
+        SYNCHRONIZING,
+
+        /**
+         * A consistency check between the agent and the Ric is done
+         */
+        CONSISTENCY_CHECK
     }
 }