commit d5bf1069b9e67314dc4bde552515beb23fcae57a
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Thu Feb 25 10:26:02 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Thu Feb 25 21:42:16 2016 +0000
tree fff2e17bb8ee2ad2005835cb32ce550c7809ba28
parent 0cfdeedeb8ce03a0cf7e8f3aaca28cb7163e7377

Load ComponentConfigService in IntentManager

Change-Id: I8b292edc9afdc7a8c3aaab511ed338b8497eb6de

core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
index fecda7c..16f05d6 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
@@ -24,6 +24,7 @@
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.apache.felix.scr.annotations.Service;
 import org.onlab.util.Tools;
+import org.onosproject.cfg.ComponentConfigService;
 import org.onosproject.core.CoreService;
 import org.onosproject.core.IdGenerator;
 import org.onosproject.event.AbstractListenerManager;
@@ -115,6 +116,10 @@
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected ResourceService resourceService;
 
+    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+    protected ComponentConfigService configService;
+
+
     private ExecutorService batchExecutor;
     private ExecutorService workerExecutor;
 
@@ -131,6 +136,8 @@
 
     @Activate
     public void activate() {
+        configService.registerProperties(getClass());
+
         intentInstaller.init(store, trackerService, flowRuleService, flowObjectiveService);
         if (skipReleaseResourcesOnWithdrawal) {
             store.setDelegate(testOnlyDelegate);
@@ -154,6 +161,7 @@
         } else {
             store.unsetDelegate(delegate);
         }
+        configService.unregisterProperties(getClass(), false);
         trackerService.unsetDelegate(topoDelegate);
         eventDispatcher.removeSink(IntentEvent.class);
         batchExecutor.shutdown();

core/net/src/test/java/org/onosproject/net/intent/impl/IntentManagerTest.java

diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/IntentManagerTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/IntentManagerTest.java
index 3f40de0..d047883 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/IntentManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/IntentManagerTest.java
@@ -28,6 +28,7 @@
 import org.junit.Test;
 import org.onosproject.TestApplicationId;
 import org.onosproject.cfg.ComponentConfigAdapter;
+import org.onosproject.cfg.ComponentConfigService;
 import org.onosproject.common.event.impl.TestEventDispatcher;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.impl.TestCoreManager;
@@ -57,6 +58,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
+import static org.easymock.EasyMock.mock;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
@@ -231,6 +233,7 @@
         manager.trackerService = new TestIntentTracker();
         manager.flowRuleService = flowRuleService;
         manager.coreService = new TestCoreManager();
+        manager.configService = mock(ComponentConfigService.class);
         service = manager;
         extensionService = manager;