Remove policies from repository when Ric is removed from configuration

[nonrtric.git] / policy-agent / src / main / java / org / oransc / policyagent / tasks / StartupService.java

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/tasks/StartupService.java b/policy-agent/src/main/java/org/oransc/policyagent/tasks/StartupService.java
index 90358b2..590b010 100644 (file)
--- a/policy-agent/src/main/java/org/oransc/policyagent/tasks/StartupService.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/tasks/StartupService.java
@@ -20,8 +20,9 @@
 
 package org.oransc.policyagent.tasks;
 
-import org.oransc.policyagent.clients.A1Client;
+import org.oransc.policyagent.clients.A1ClientFactory;
 import org.oransc.policyagent.configuration.ApplicationConfig;
+import org.oransc.policyagent.configuration.ApplicationConfig.RicConfigUpdate;
 import org.oransc.policyagent.configuration.RicConfig;
 import org.oransc.policyagent.repository.Policies;
 import org.oransc.policyagent.repository.PolicyTypes;
@@ -47,6 +48,9 @@ public class StartupService implements ApplicationConfig.Observer {
     @Autowired
     ApplicationConfig applicationConfig;
 
+    @Autowired
+    RefreshConfigTask refreshConfigTask;
+
     @Autowired
     private Rics rics;
 
@@ -54,7 +58,7 @@ public class StartupService implements ApplicationConfig.Observer {
     PolicyTypes policyTypes;
 
     @Autowired
-    private A1Client a1Client;
+    private A1ClientFactory a1ClientFactory;
 
     @Autowired
     private Policies policies;
@@ -62,30 +66,37 @@ public class StartupService implements ApplicationConfig.Observer {
     @Autowired
     private Services services;
 
-    // Only for unittesting
-    StartupService(ApplicationConfig appConfig, Rics rics, PolicyTypes policyTypes, A1Client a1Client,
-        Policies policies, Services services) {
+    // Only for unit testing
+    StartupService(ApplicationConfig appConfig, RefreshConfigTask refreshTask, Rics rics, PolicyTypes policyTypes,
+        A1ClientFactory a1ClientFactory, Policies policies, Services services) {
         this.applicationConfig = appConfig;
+        this.refreshConfigTask = refreshTask;
         this.rics = rics;
         this.policyTypes = policyTypes;
-        this.a1Client = a1Client;
+        this.a1ClientFactory = a1ClientFactory;
         this.policies = policies;
         this.services = services;
     }
 
     @Override
-    public void onRicConfigUpdate(RicConfig ricConfig, ApplicationConfig.RicConfigUpdate event) {
+    public void onRicConfigUpdate(RicConfig ricConfig, RicConfigUpdate event) {
         synchronized (this.rics) {
-            if (event.equals(ApplicationConfig.RicConfigUpdate.ADDED)
-                || event.equals(ApplicationConfig.RicConfigUpdate.CHANGED)) {
-                Ric ric = new Ric(ricConfig);
-                rics.put(ric);
-                RicRecoveryTask recoveryTask = new RicRecoveryTask(a1Client, policyTypes, policies, services);
-                recoveryTask.run(ric);
-            } else if (event.equals(ApplicationConfig.RicConfigUpdate.REMOVED)) {
-                rics.remove(ricConfig.name());
-            } else {
-                logger.debug("Unhandled event :" + event);
+            switch (event) {
+                case ADDED:
+                case CHANGED:
+                    Ric ric = new Ric(ricConfig);
+                    rics.put(ric);
+                    RicSynchronizationTask synchronizationTask = createSynchronizationTask();
+                    synchronizationTask.run(ric);
+                    break;
+
+                case REMOVED:
+                    rics.remove(ricConfig.name());
+                    policies.removePoliciesForRic(ricConfig.name());
+                    break;
+
+                default:
+                    logger.error("Unhandled ric event: {}", event);
             }
         }
     }
@@ -96,7 +107,10 @@ public class StartupService implements ApplicationConfig.Observer {
     public void startup() {
         logger.debug("Starting up");
         applicationConfig.addObserver(this);
-        applicationConfig.initialize();
+        refreshConfigTask.start();
     }
 
+    RicSynchronizationTask createSynchronizationTask() {
+        return new RicSynchronizationTask(a1ClientFactory, policyTypes, policies, services);
+    }
 }