commit f00087c1326a5f713c6fe8eeb7f4e12168a29172
author Andreas Papazois <andreas.papazois@gmail.com> Wed Nov 23 11:36:55 2016 +0200
committer Luca Prete <luca@onlab.us> Thu May 04 22:23:59 2017 +0000
tree b0eb181ec3f83197d7193c9d82a1d29a9e3ffebb
parent 03df2a57f28cf427b663adb68b349b9d75824990

Intent installer and operations for domain intents.

Change-Id: Id4597baebf587b1bc9b3ae9013383ae50472fa4c

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 353af4d..3b542bd 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
@@ -30,6 +30,7 @@
 import org.onosproject.event.AbstractListenerManager;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.config.NetworkConfigService;
+import org.onosproject.net.domain.DomainIntentService;
 import org.onosproject.net.flow.FlowRuleService;
 import org.onosproject.net.flowobjective.FlowObjectiveService;
 import org.onosproject.net.group.GroupKey;
@@ -126,6 +127,9 @@
     protected FlowObjectiveService flowObjectiveService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+    protected DomainIntentService domainIntentService;
+
+    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected ResourceService resourceService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
@@ -157,7 +161,7 @@
         configService.registerProperties(getClass());
 
         intentInstaller.init(store, trackerService, flowRuleService, flowObjectiveService,
-                             networkConfigService);
+                             networkConfigService, domainIntentService);
         if (skipReleaseResourcesOnWithdrawal) {
             store.setDelegate(testOnlyDelegate);
         } else {
@@ -175,7 +179,7 @@
 
     @Deactivate
     public void deactivate() {
-        intentInstaller.init(null, null, null, null, null);
+        intentInstaller.init(null, null, null, null, null, null);
         if (skipReleaseResourcesOnWithdrawal) {
             store.unsetDelegate(testOnlyDelegate);
         } else {