commit 055489695b5c807fe21cb4fd4c8cd4db748aae72
author Andreas Papazois <andreas.papazois@gmail.com> Wed Nov 23 11:36:55 2016 +0200
committer Yuta HIGUCHI <y-higuchi@onlab.us> Fri Jan 27 21:54:54 2017 +0000
tree 7d033f08528f3d09da20f9caecdeb33c8b28c6d8
parent 4994c3dc8b9c873e13caccbe86b4881aab88bab1

ONOS-5855 Intent installer for Protection

- This patch is effectively combination of following to unblock
  protection related code:
  + Intent installer and operations for domain intents.
    Change-Id  Id4597baebf587b1bc9b3ae9013383ae50472fa4c
    by Andreas Papazois <andreas.papazois@gmail.com>
  + ONOS-5604 IntentInstaller for protection
    adds ProtectionConfigOperationContext
    Change-Id Ia9f5ddd44c9765867b5e2daaa7a7478c1dc2f2e3
  - removed dependency to Intent Domain related classes.

Change-Id: I027eedb020b3f4240c545dc92e47c4262d8b6ec6

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 5524d63..68304eb 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
@@ -29,6 +29,7 @@
 import org.onosproject.core.IdGenerator;
 import org.onosproject.event.AbstractListenerManager;
 import org.onosproject.net.DeviceId;
+import org.onosproject.net.config.NetworkConfigService;
 import org.onosproject.net.flow.FlowRuleService;
 import org.onosproject.net.flowobjective.FlowObjectiveService;
 import org.onosproject.net.group.GroupKey;
@@ -132,6 +133,10 @@
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected GroupService groupService;
 
+    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+    private NetworkConfigService networkConfigService;
+
+
     private ExecutorService batchExecutor;
     private ExecutorService workerExecutor;
 
@@ -150,7 +155,8 @@
     public void activate() {
         configService.registerProperties(getClass());
 
-        intentInstaller.init(store, trackerService, flowRuleService, flowObjectiveService);
+        intentInstaller.init(store, trackerService, flowRuleService, flowObjectiveService,
+                             networkConfigService);
         if (skipReleaseResourcesOnWithdrawal) {
             store.setDelegate(testOnlyDelegate);
         } else {
@@ -167,7 +173,7 @@
 
     @Deactivate
     public void deactivate() {
-        intentInstaller.init(null, null, null, null);
+        intentInstaller.init(null, null, null, null, null);
         if (skipReleaseResourcesOnWithdrawal) {
             store.unsetDelegate(testOnlyDelegate);
         } else {