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=235ee1ab9e116ecb1c3491bb2d8c99968610837b;hb=fb4bc7967a4733d10775351440a3af14327d5f20;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..235ee1ab 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,20 @@
 
 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 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<>();
 
     /**
      * Creates the Ric. Initial state is {@link RicState.NOT_INITIATED}.
@@ -56,43 +56,47 @@ 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<String> getManagedNodes() {
+    public Vector<String> 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);
     }
 
     /**
@@ -100,8 +104,12 @@ public class Ric {
      *
      * @return the policy types supported by this Ric in an unmodifiable list.
      */
-    public List<PolicyType> getSupportedPolicyTypes() {
-        return Collections.unmodifiableList(supportedPolicyTypes);
+    public Collection<PolicyType> getSupportedPolicyTypes() {
+        return supportedPolicyTypes.values();
+    }
+
+    public Collection<String> getSupportedPolicyTypeNames() {
+        return supportedPolicyTypes.keySet();
     }
 
     /**
@@ -110,40 +118,31 @@ public class Ric {
      * @param type the policy type to support.
      */
     public void addSupportedPolicyType(PolicyType type) {
-        if (!supportedPolicyTypes.contains(type)) {
-            supportedPolicyTypes.add(type);
-        }
-    }
-
-    /**
-     * Adds policy types as supported by this Ric.
-     *
-     * @param types the policy types to support.
-     */
-    public void addSupportedPolicyTypes(Vector<PolicyType> types) {
-        for (PolicyType type : types) {
-            addSupportedPolicyType(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 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 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();
     }
 
     /**
@@ -151,20 +150,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
     }
 }