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=e50a98ce517b051efdd70498fc802a878279d964;hb=9f9cde2f0d76ad943f5dfcf50548be5800834a2f;hp=3caadaed025ad936887cd2d6d827d85485ce1b18;hpb=f0273617b916cdc8633382291b9986e33cc13fa1;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 3caadaed..e50a98ce 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,20 +20,28 @@
 
 package org.oransc.policyagent.repository;
 
-import java.util.Collections;
-import java.util.List;
+import java.util.Collection;
+import java.util.HashMap;
+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;
-import org.oransc.policyagent.repository.Ric.RicState;
 
 /**
  * Represents the dynamic information about a NearRealtime-RIC.
  */
 public class Ric {
     private final RicConfig ricConfig;
-    private RicState state = RicState.NOT_INITIATED;
-    private Vector<PolicyType> supportedPolicyTypes = new Vector<>();
+
+    private RicState state = RicState.UNDEFINED;
+    private Map<String, PolicyType> supportedPolicyTypes = new HashMap<>();
+    @Getter
+    @Setter
+    private A1ProtocolType protocolVersion = A1ProtocolType.UNKNOWN;
 
     /**
      * Creates the Ric. Initial state is {@link RicState.NOT_INITIATED}.
@@ -48,12 +56,16 @@ public class Ric {
         return ricConfig.name();
     }
 
-    public RicState state() {
-        return state;
+    public RicConfig getConfig() {
+        return this.ricConfig;
     }
 
-    public void setState(RicState newState) {
-        state = newState;
+    public synchronized RicState getState() {
+        return this.state;
+    }
+
+    public synchronized void setState(RicState state) {
+        this.state = state;
     }
 
     /**
@@ -61,38 +73,38 @@ public class Ric {
      *
      * @return a vector containing the nodes managed by this Ric.
      */
-    public Vector<String> getManagedNodes() {
-        return ricConfig.managedElementIds();
+    public synchronized Collection<String> getManagedElementIds() {
+        return new Vector<>(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 synchronized 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 synchronized 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 synchronized void removeManagedElement(String managedElementId) {
+        ricConfig.managedElementIds().remove(managedElementId);
     }
 
     /**
@@ -100,50 +112,45 @@ public class Ric {
      *
      * @return the policy types supported by this Ric in an unmodifiable list.
      */
-    public List<PolicyType> getSupportedPolicyTypes() {
-        return Collections.unmodifiableList(supportedPolicyTypes);
+    public synchronized Collection<PolicyType> getSupportedPolicyTypes() {
+        return new Vector<>(supportedPolicyTypes.values());
     }
 
-    /**
-     * Adds a policy type as supported by this Ric.
-     *
-     * @param type the policy type to support.
-     */
-    public void addSupportedPolicyType(PolicyType type) {
-        if (!supportedPolicyTypes.contains(type)) {
-            supportedPolicyTypes.add(type);
-        }
+    public synchronized Collection<String> getSupportedPolicyTypeNames() {
+        return new Vector<>(supportedPolicyTypes.keySet());
     }
 
     /**
-     * Adds policy types as supported by this Ric.
+     * Adds a policy type as supported by this Ric.
      *
-     * @param types the policy types to support.
+     * @param type the policy type to support.
      */
-    public void addSupportedPolicyTypes(Vector<PolicyType> types) {
-        for (PolicyType type : types) {
-            addSupportedPolicyType(type);
-        }
+    public synchronized void addSupportedPolicyType(PolicyType type) {
+        supportedPolicyTypes.put(type.name(), type);
     }
 
     /**
-     * Removes a policy type as supported by this Ric.
-     *
-     * @param type the policy type to remove as supported by this Ric.
+     * Removes all policy type as supported by this Ric.
      */
-    public void removeSupportedPolicyType(PolicyType type) {
-        supportedPolicyTypes.remove(type);
+    public synchronized void clearSupportedPolicyTypes() {
+        supportedPolicyTypes.clear();
     }
 
     /**
      * Checks if a type is supported by this Ric.
      *
-     * @param type the type to check if it is supported.
+     * @param typeName the name of the type to check if it is supported.
      *
-     * @return true if the given type issupported by this Ric, false otherwise.
+     * @return true if the given type is supported by this Ric, false otherwise.
      */
-    public boolean isSupportingType(PolicyType type) {
-        return supportedPolicyTypes.contains(type);
+    public synchronized boolean isSupportingType(String typeName) {
+        return supportedPolicyTypes.containsKey(typeName);
+    }
+
+    @Override
+    public synchronized String toString() {
+        return Ric.class.getSimpleName() + ": " + "name: " + name() + ", state: " + state + ", baseUrl: "
+            + ricConfig.baseUrl() + ", managedNodes: " + ricConfig.managedElementIds();
     }
 
     /**
@@ -151,20 +158,16 @@ public class Ric {
      */
     public static enum RicState {
         /**
-         * The Ric has not been initiated yet.
-         */
-        NOT_INITIATED,
-        /**
-         * The Ric is working fine.
+         * The agent view of the agent may be inconsistent.
          */
-        ACTIVE,
+        UNDEFINED,
         /**
-         * Something is wrong with the Ric.
+         * The normal state. Policies can be configured.
          */
-        FAULTY,
+        IDLE,
         /**
-         * The node is unreachable at the moment.
+         * The Ric states are recovered.
          */
-        UNREACHABLE
+        RECOVERING
     }
 }