홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Sho SHIMIZU
Committed by Gerrit Code Review
ec07ffd4 1 parent 990688b8

Remove dependency on LinkResourceAllocaations from IntentCompiler 

This change breaks backward compatibility of IntentCompier API

Change-Id: I471d0e28d97c2379f66d980d3176f89022c3a470
Inline Side-by-side
Showing 30 changed files with 44 additions and 142 deletions
...@@ -16,10 +16,8 @@ ...@@ -16,10 +16,8 @@
16 package org.onosproject.net.intent; 16 package org.onosproject.net.intent;
17 17
18 import com.google.common.annotations.Beta; 18 import com.google.common.annotations.Beta;
19 -import org.onosproject.net.resource.link.LinkResourceAllocations;
20 19
21 import java.util.List; 20 import java.util.List;
22 -import java.util.Set;
23 21
24 /** 22 /**
25 * Abstraction of a compiler which is capable of taking an intent 23 * Abstraction of a compiler which is capable of taking an intent
...@@ -34,11 +32,9 @@ public interface IntentCompiler<T extends Intent> { ...@@ -34,11 +32,9 @@ public interface IntentCompiler<T extends Intent> {
34 * 32 *
35 * @param intent intent to be compiled 33 * @param intent intent to be compiled
36 * @param installable previously compilation result; optional 34 * @param installable previously compilation result; optional
37 - * @param resources previously allocated resources; optional
38 * @return list of resulting intents 35 * @return list of resulting intents
39 * @throws IntentException if issues are encountered while compiling the intent 36 * @throws IntentException if issues are encountered while compiling the intent
40 */ 37 */
41 - List<Intent> compile(T intent, List<Intent> installable, 38 + List<Intent> compile(T intent, List<Intent> installable);
42 - Set<LinkResourceAllocations> resources);
43 39
44 } 40 }
......
1 -/*
2 - * Copyright 2014 Open Networking Laboratory
3 - *
4 - * Licensed under the Apache License, Version 2.0 (the "License");
5 - * you may not use this file except in compliance with the License.
6 - * You may obtain a copy of the License at
7 - *
8 - * http://www.apache.org/licenses/LICENSE-2.0
9 - *
10 - * Unless required by applicable law or agreed to in writing, software
11 - * distributed under the License is distributed on an "AS IS" BASIS,
12 - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 - * See the License for the specific language governing permissions and
14 - * limitations under the License.
15 - */
16 -package org.onosproject.net.resource.link;
17 -
18 -/**
19 - * Representation of allocated link resources.
20 - *
21 - * @deprecated 1.4.0 Emu Release
22 - */
23 -@Deprecated
24 -public interface LinkResourceAllocations {
25 -}
1 -/*
2 - * Copyright 2015 Open Networking Laboratory
3 - *
4 - * Licensed under the Apache License, Version 2.0 (the "License");
5 - * you may not use this file except in compliance with the License.
6 - * You may obtain a copy of the License at
7 - *
8 - * http://www.apache.org/licenses/LICENSE-2.0
9 - *
10 - * Unless required by applicable law or agreed to in writing, software
11 - * distributed under the License is distributed on an "AS IS" BASIS,
12 - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 - * See the License for the specific language governing permissions and
14 - * limitations under the License.
15 - */
16 -
17 -/**
18 - * Services for reserving links and their capacity as network resources,
19 - * e.g.&nbsp;bandwidth, lambdas.
20 - * <p>
21 - * Note: Classes under the package will be remove.
22 - * Developers should not use the classes.
23 - * This package is marked as deprecated in Emu Release.
24 - * </p>
25 - */
26 -@Deprecated
27 -package org.onosproject.net.resource.link;
...@@ -84,7 +84,7 @@ public class FakeIntentManager implements TestableIntentService { ...@@ -84,7 +84,7 @@ public class FakeIntentManager implements TestableIntentService {
84 try { 84 try {
85 // For the fake, we compile using a single level pass 85 // For the fake, we compile using a single level pass
86 List<Intent> installable = new ArrayList<>(); 86 List<Intent> installable = new ArrayList<>();
87 - for (Intent compiled : getCompiler(intent).compile(intent, null, null)) { 87 + for (Intent compiled : getCompiler(intent).compile(intent, null)) {
88 installable.add(compiled); 88 installable.add(compiled);
89 } 89 }
90 executeInstallingPhase(intent, installable); 90 executeInstallingPhase(intent, installable);
......
...@@ -19,14 +19,12 @@ import org.junit.After; ...@@ -19,14 +19,12 @@ import org.junit.After;
19 import org.junit.Before; 19 import org.junit.Before;
20 import org.junit.Test; 20 import org.junit.Test;
21 import org.onosproject.core.IdGenerator; 21 import org.onosproject.core.IdGenerator;
22 -import org.onosproject.net.resource.link.LinkResourceAllocations;
23 22
24 import java.util.ArrayList; 23 import java.util.ArrayList;
25 import java.util.Arrays; 24 import java.util.Arrays;
26 import java.util.Collections; 25 import java.util.Collections;
27 import java.util.Iterator; 26 import java.util.Iterator;
28 import java.util.List; 27 import java.util.List;
29 -import java.util.Set;
30 28
31 import static org.junit.Assert.*; 29 import static org.junit.Assert.*;
32 import static org.onosproject.net.intent.IntentEvent.Type.*; 30 import static org.onosproject.net.intent.IntentEvent.Type.*;
...@@ -220,8 +218,7 @@ public class IntentServiceTest { ...@@ -220,8 +218,7 @@ public class IntentServiceTest {
220 } 218 }
221 219
222 @Override 220 @Override
223 - public List<Intent> compile(TestIntent intent, List<Intent> installable, 221 + public List<Intent> compile(TestIntent intent, List<Intent> installable) {
224 - Set<LinkResourceAllocations> resources) {
225 if (fail) { 222 if (fail) {
226 throw new IntentException("compile failed by design"); 223 throw new IntentException("compile failed by design");
227 } 224 }
......
...@@ -79,7 +79,7 @@ class CompilerRegistry { ...@@ -79,7 +79,7 @@ class CompilerRegistry {
79 registerSubclassCompilerIfNeeded(intent); 79 registerSubclassCompilerIfNeeded(intent);
80 // FIXME: get previous resources 80 // FIXME: get previous resources
81 List<Intent> installable = new ArrayList<>(); 81 List<Intent> installable = new ArrayList<>();
82 - for (Intent compiled : getCompiler(intent).compile(intent, previousInstallables, null)) { 82 + for (Intent compiled : getCompiler(intent).compile(intent, previousInstallables)) {
83 installable.addAll(compile(compiled, previousInstallables)); 83 installable.addAll(compile(compiled, previousInstallables));
84 } 84 }
85 return installable; 85 return installable;
......
...@@ -31,12 +31,10 @@ import org.onosproject.net.intent.HostToHostIntent; ...@@ -31,12 +31,10 @@ import org.onosproject.net.intent.HostToHostIntent;
31 import org.onosproject.net.intent.Intent; 31 import org.onosproject.net.intent.Intent;
32 import org.onosproject.net.intent.PathIntent; 32 import org.onosproject.net.intent.PathIntent;
33 import org.onosproject.net.intent.constraint.AsymmetricPathConstraint; 33 import org.onosproject.net.intent.constraint.AsymmetricPathConstraint;
34 -import org.onosproject.net.resource.link.LinkResourceAllocations;
35 34
36 import java.util.ArrayList; 35 import java.util.ArrayList;
37 import java.util.Arrays; 36 import java.util.Arrays;
38 import java.util.List; 37 import java.util.List;
39 -import java.util.Set;
40 38
41 import static org.onosproject.net.flow.DefaultTrafficSelector.builder; 39 import static org.onosproject.net.flow.DefaultTrafficSelector.builder;
42 40
...@@ -61,8 +59,7 @@ public class HostToHostIntentCompiler ...@@ -61,8 +59,7 @@ public class HostToHostIntentCompiler
61 } 59 }
62 60
63 @Override 61 @Override
64 - public List<Intent> compile(HostToHostIntent intent, List<Intent> installable, 62 + public List<Intent> compile(HostToHostIntent intent, List<Intent> installable) {
65 - Set<LinkResourceAllocations> resources) {
66 boolean isAsymmetric = intent.constraints().contains(new AsymmetricPathConstraint()); 63 boolean isAsymmetric = intent.constraints().contains(new AsymmetricPathConstraint());
67 Path pathOne = getPath(intent, intent.one(), intent.two()); 64 Path pathOne = getPath(intent, intent.one(), intent.two());
68 Path pathTwo = isAsymmetric ? 65 Path pathTwo = isAsymmetric ?
......
...@@ -38,7 +38,6 @@ import org.onosproject.net.intent.FlowRuleIntent; ...@@ -38,7 +38,6 @@ import org.onosproject.net.intent.FlowRuleIntent;
38 import org.onosproject.net.intent.Intent; 38 import org.onosproject.net.intent.Intent;
39 import org.onosproject.net.intent.IntentCompiler; 39 import org.onosproject.net.intent.IntentCompiler;
40 import org.onosproject.net.intent.LinkCollectionIntent; 40 import org.onosproject.net.intent.LinkCollectionIntent;
41 -import org.onosproject.net.resource.link.LinkResourceAllocations;
42 41
43 import java.util.ArrayList; 42 import java.util.ArrayList;
44 import java.util.Collections; 43 import java.util.Collections;
...@@ -69,8 +68,7 @@ public class LinkCollectionIntentCompiler implements IntentCompiler<LinkCollecti ...@@ -69,8 +68,7 @@ public class LinkCollectionIntentCompiler implements IntentCompiler<LinkCollecti
69 } 68 }
70 69
71 @Override 70 @Override
72 - public List<Intent> compile(LinkCollectionIntent intent, List<Intent> installable, 71 + public List<Intent> compile(LinkCollectionIntent intent, List<Intent> installable) {
73 - Set<LinkResourceAllocations> resources) {
74 SetMultimap<DeviceId, PortNumber> inputPorts = HashMultimap.create(); 72 SetMultimap<DeviceId, PortNumber> inputPorts = HashMultimap.create();
75 SetMultimap<DeviceId, PortNumber> outputPorts = HashMultimap.create(); 73 SetMultimap<DeviceId, PortNumber> outputPorts = HashMultimap.create();
76 74
......
...@@ -39,7 +39,6 @@ import org.onosproject.net.intent.FlowObjectiveIntent; ...@@ -39,7 +39,6 @@ import org.onosproject.net.intent.FlowObjectiveIntent;
39 import org.onosproject.net.intent.Intent; 39 import org.onosproject.net.intent.Intent;
40 import org.onosproject.net.intent.IntentCompiler; 40 import org.onosproject.net.intent.IntentCompiler;
41 import org.onosproject.net.intent.LinkCollectionIntent; 41 import org.onosproject.net.intent.LinkCollectionIntent;
42 -import org.onosproject.net.resource.link.LinkResourceAllocations;
43 42
44 import java.util.ArrayList; 43 import java.util.ArrayList;
45 import java.util.Collections; 44 import java.util.Collections;
...@@ -73,8 +72,7 @@ public class LinkCollectionIntentFlowObjectivesCompiler implements IntentCompile ...@@ -73,8 +72,7 @@ public class LinkCollectionIntentFlowObjectivesCompiler implements IntentCompile
73 } 72 }
74 73
75 @Override 74 @Override
76 - public List<Intent> compile(LinkCollectionIntent intent, List<Intent> installable, 75 + public List<Intent> compile(LinkCollectionIntent intent, List<Intent> installable) {
77 - Set<LinkResourceAllocations> resources) {
78 SetMultimap<DeviceId, PortNumber> inputPorts = HashMultimap.create(); 76 SetMultimap<DeviceId, PortNumber> inputPorts = HashMultimap.create();
79 SetMultimap<DeviceId, PortNumber> outputPorts = HashMultimap.create(); 77 SetMultimap<DeviceId, PortNumber> outputPorts = HashMultimap.create();
80 78
......
...@@ -20,7 +20,6 @@ import static org.onosproject.net.DefaultEdgeLink.createEdgeLink; ...@@ -20,7 +20,6 @@ import static org.onosproject.net.DefaultEdgeLink.createEdgeLink;
20 20
21 import java.util.ArrayList; 21 import java.util.ArrayList;
22 import java.util.List; 22 import java.util.List;
23 -import java.util.Set;
24 23
25 24
26 import org.apache.felix.scr.annotations.Activate; 25 import org.apache.felix.scr.annotations.Activate;
...@@ -34,7 +33,6 @@ import org.onosproject.net.intent.Intent; ...@@ -34,7 +33,6 @@ import org.onosproject.net.intent.Intent;
34 import org.onosproject.net.intent.MplsIntent; 33 import org.onosproject.net.intent.MplsIntent;
35 import org.onosproject.net.intent.MplsPathIntent; 34 import org.onosproject.net.intent.MplsPathIntent;
36 import org.onosproject.net.provider.ProviderId; 35 import org.onosproject.net.provider.ProviderId;
37 -import org.onosproject.net.resource.link.LinkResourceAllocations;
38 36
39 /** 37 /**
40 * @deprecated in Goldeneye Release, in favour of encapsulation 38 * @deprecated in Goldeneye Release, in favour of encapsulation
...@@ -62,8 +60,7 @@ public class MplsIntentCompiler extends ConnectivityIntentCompiler<MplsIntent> ...@@ -62,8 +60,7 @@ public class MplsIntentCompiler extends ConnectivityIntentCompiler<MplsIntent>
62 } 60 }
63 61
64 @Override 62 @Override
65 - public List<Intent> compile(MplsIntent intent, List<Intent> installable, 63 + public List<Intent> compile(MplsIntent intent, List<Intent> installable) {
66 - Set<LinkResourceAllocations> resources) {
67 ConnectPoint ingressPoint = intent.ingressPoint(); 64 ConnectPoint ingressPoint = intent.ingressPoint();
68 ConnectPoint egressPoint = intent.egressPoint(); 65 ConnectPoint egressPoint = intent.egressPoint();
69 66
......
...@@ -51,7 +51,6 @@ import org.onosproject.net.intent.MplsPathIntent; ...@@ -51,7 +51,6 @@ import org.onosproject.net.intent.MplsPathIntent;
51 import org.onosproject.net.newresource.Resource; 51 import org.onosproject.net.newresource.Resource;
52 import org.onosproject.net.newresource.ResourceService; 52 import org.onosproject.net.newresource.ResourceService;
53 import org.onosproject.net.newresource.Resources; 53 import org.onosproject.net.newresource.Resources;
54 -import org.onosproject.net.resource.link.LinkResourceAllocations;
55 import org.slf4j.Logger; 54 import org.slf4j.Logger;
56 55
57 import java.util.Collections; 56 import java.util.Collections;
...@@ -90,8 +89,7 @@ public class MplsPathIntentCompiler implements IntentCompiler<MplsPathIntent> { ...@@ -90,8 +89,7 @@ public class MplsPathIntentCompiler implements IntentCompiler<MplsPathIntent> {
90 protected ApplicationId appId; 89 protected ApplicationId appId;
91 90
92 @Override 91 @Override
93 - public List<Intent> compile(MplsPathIntent intent, List<Intent> installable, 92 + public List<Intent> compile(MplsPathIntent intent, List<Intent> installable) {
94 - Set<LinkResourceAllocations> resources) {
95 Map<LinkKey, MplsLabel> labels = assignMplsLabel(intent); 93 Map<LinkKey, MplsLabel> labels = assignMplsLabel(intent);
96 List<FlowRule> rules = generateRules(intent, labels); 94 List<FlowRule> rules = generateRules(intent, labels);
97 95
......
...@@ -34,7 +34,6 @@ import org.onosproject.net.intent.IntentExtensionService; ...@@ -34,7 +34,6 @@ import org.onosproject.net.intent.IntentExtensionService;
34 import org.onosproject.net.intent.LinkCollectionIntent; 34 import org.onosproject.net.intent.LinkCollectionIntent;
35 import org.onosproject.net.intent.MultiPointToSinglePointIntent; 35 import org.onosproject.net.intent.MultiPointToSinglePointIntent;
36 import org.onosproject.net.intent.PointToPointIntent; 36 import org.onosproject.net.intent.PointToPointIntent;
37 -import org.onosproject.net.resource.link.LinkResourceAllocations;
38 import org.onosproject.net.topology.PathService; 37 import org.onosproject.net.topology.PathService;
39 38
40 import java.util.Collections; 39 import java.util.Collections;
...@@ -74,8 +73,7 @@ public class MultiPointToSinglePointIntentCompiler ...@@ -74,8 +73,7 @@ public class MultiPointToSinglePointIntentCompiler
74 } 73 }
75 74
76 @Override 75 @Override
77 - public List<Intent> compile(MultiPointToSinglePointIntent intent, List<Intent> installable, 76 + public List<Intent> compile(MultiPointToSinglePointIntent intent, List<Intent> installable) {
78 - Set<LinkResourceAllocations> resources) {
79 Map<DeviceId, Link> links = new HashMap<>(); 77 Map<DeviceId, Link> links = new HashMap<>();
80 ConnectPoint egressPoint = intent.egressPoint(); 78 ConnectPoint egressPoint = intent.egressPoint();
81 79
......
...@@ -64,7 +64,6 @@ import org.onosproject.net.newresource.Resource; ...@@ -64,7 +64,6 @@ import org.onosproject.net.newresource.Resource;
64 import org.onosproject.net.newresource.ResourceService; 64 import org.onosproject.net.newresource.ResourceService;
65 import org.onosproject.net.newresource.Resources; 65 import org.onosproject.net.newresource.Resources;
66 import org.onosproject.net.intent.IntentSetMultimap; 66 import org.onosproject.net.intent.IntentSetMultimap;
67 -import org.onosproject.net.resource.link.LinkResourceAllocations;
68 import org.osgi.service.component.ComponentContext; 67 import org.osgi.service.component.ComponentContext;
69 import org.slf4j.Logger; 68 import org.slf4j.Logger;
70 import org.slf4j.LoggerFactory; 69 import org.slf4j.LoggerFactory;
...@@ -169,8 +168,7 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu ...@@ -169,8 +168,7 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu
169 } 168 }
170 169
171 @Override 170 @Override
172 - public List<Intent> compile(OpticalCircuitIntent intent, List<Intent> installable, 171 + public List<Intent> compile(OpticalCircuitIntent intent, List<Intent> installable) {
173 - Set<LinkResourceAllocations> resources) {
174 // Check if ports are OduClt ports 172 // Check if ports are OduClt ports
175 ConnectPoint src = intent.getSrc(); 173 ConnectPoint src = intent.getSrc();
176 ConnectPoint dst = intent.getDst(); 174 ConnectPoint dst = intent.getDst();
......
...@@ -47,7 +47,6 @@ import org.onosproject.net.newresource.ResourceAllocation; ...@@ -47,7 +47,6 @@ import org.onosproject.net.newresource.ResourceAllocation;
47 import org.onosproject.net.newresource.Resource; 47 import org.onosproject.net.newresource.Resource;
48 import org.onosproject.net.newresource.ResourceService; 48 import org.onosproject.net.newresource.ResourceService;
49 import org.onosproject.net.newresource.Resources; 49 import org.onosproject.net.newresource.Resources;
50 -import org.onosproject.net.resource.link.LinkResourceAllocations;
51 import org.onosproject.net.topology.LinkWeight; 50 import org.onosproject.net.topology.LinkWeight;
52 import org.onosproject.net.topology.Topology; 51 import org.onosproject.net.topology.Topology;
53 import org.onosproject.net.topology.TopologyService; 52 import org.onosproject.net.topology.TopologyService;
...@@ -99,8 +98,7 @@ public class OpticalConnectivityIntentCompiler implements IntentCompiler<Optical ...@@ -99,8 +98,7 @@ public class OpticalConnectivityIntentCompiler implements IntentCompiler<Optical
99 98
100 @Override 99 @Override
101 public List<Intent> compile(OpticalConnectivityIntent intent, 100 public List<Intent> compile(OpticalConnectivityIntent intent,
102 - List<Intent> installable, 101 + List<Intent> installable) {
103 - Set<LinkResourceAllocations> linkResources) {
104 // Check if source and destination are optical OCh ports 102 // Check if source and destination are optical OCh ports
105 ConnectPoint src = intent.getSrc(); 103 ConnectPoint src = intent.getSrc();
106 ConnectPoint dst = intent.getDst(); 104 ConnectPoint dst = intent.getDst();
......
...@@ -38,14 +38,12 @@ import org.onosproject.net.intent.Intent; ...@@ -38,14 +38,12 @@ import org.onosproject.net.intent.Intent;
38 import org.onosproject.net.intent.IntentCompiler; 38 import org.onosproject.net.intent.IntentCompiler;
39 import org.onosproject.net.intent.IntentExtensionService; 39 import org.onosproject.net.intent.IntentExtensionService;
40 import org.onosproject.net.intent.OpticalPathIntent; 40 import org.onosproject.net.intent.OpticalPathIntent;
41 -import org.onosproject.net.resource.link.LinkResourceAllocations;
42 import org.slf4j.Logger; 41 import org.slf4j.Logger;
43 import org.slf4j.LoggerFactory; 42 import org.slf4j.LoggerFactory;
44 43
45 import java.util.Collections; 44 import java.util.Collections;
46 import java.util.LinkedList; 45 import java.util.LinkedList;
47 import java.util.List; 46 import java.util.List;
48 -import java.util.Set;
49 47
50 @Component(immediate = true) 48 @Component(immediate = true)
51 public class OpticalPathIntentCompiler implements IntentCompiler<OpticalPathIntent> { 49 public class OpticalPathIntentCompiler implements IntentCompiler<OpticalPathIntent> {
...@@ -72,8 +70,7 @@ public class OpticalPathIntentCompiler implements IntentCompiler<OpticalPathInte ...@@ -72,8 +70,7 @@ public class OpticalPathIntentCompiler implements IntentCompiler<OpticalPathInte
72 } 70 }
73 71
74 @Override 72 @Override
75 - public List<Intent> compile(OpticalPathIntent intent, List<Intent> installable, 73 + public List<Intent> compile(OpticalPathIntent intent, List<Intent> installable) {
76 - Set<LinkResourceAllocations> resources) {
77 log.debug("Compiling optical path intent between {} and {}", intent.src(), intent.dst()); 74 log.debug("Compiling optical path intent between {} and {}", intent.src(), intent.dst());
78 75
79 // Create rules for forward and reverse path 76 // Create rules for forward and reverse path
......
...@@ -36,12 +36,10 @@ import org.onosproject.net.intent.Intent; ...@@ -36,12 +36,10 @@ import org.onosproject.net.intent.Intent;
36 import org.onosproject.net.intent.IntentCompiler; 36 import org.onosproject.net.intent.IntentCompiler;
37 import org.onosproject.net.intent.PathIntent; 37 import org.onosproject.net.intent.PathIntent;
38 import org.onosproject.net.newresource.ResourceService; 38 import org.onosproject.net.newresource.ResourceService;
39 -import org.onosproject.net.resource.link.LinkResourceAllocations;
40 import org.slf4j.Logger; 39 import org.slf4j.Logger;
41 40
42 import java.util.LinkedList; 41 import java.util.LinkedList;
43 import java.util.List; 42 import java.util.List;
44 -import java.util.Set;
45 43
46 import static org.slf4j.LoggerFactory.getLogger; 44 import static org.slf4j.LoggerFactory.getLogger;
47 45
...@@ -77,8 +75,7 @@ public class PathIntentCompiler ...@@ -77,8 +75,7 @@ public class PathIntentCompiler
77 } 75 }
78 76
79 @Override 77 @Override
80 - public List<Intent> compile(PathIntent intent, List<Intent> installable, 78 + public List<Intent> compile(PathIntent intent, List<Intent> installable) {
81 - Set<LinkResourceAllocations> resources) {
82 79
83 List<FlowRule> rules = new LinkedList<>(); 80 List<FlowRule> rules = new LinkedList<>();
84 List<DeviceId> devices = new LinkedList<>(); 81 List<DeviceId> devices = new LinkedList<>();
......
...@@ -17,7 +17,6 @@ package org.onosproject.net.intent.impl.compiler; ...@@ -17,7 +17,6 @@ package org.onosproject.net.intent.impl.compiler;
17 17
18 import java.util.LinkedList; 18 import java.util.LinkedList;
19 import java.util.List; 19 import java.util.List;
20 -import java.util.Set;
21 20
22 import org.apache.felix.scr.annotations.Activate; 21 import org.apache.felix.scr.annotations.Activate;
23 import org.apache.felix.scr.annotations.Component; 22 import org.apache.felix.scr.annotations.Component;
...@@ -40,7 +39,6 @@ import org.onosproject.net.intent.Intent; ...@@ -40,7 +39,6 @@ import org.onosproject.net.intent.Intent;
40 import org.onosproject.net.intent.IntentCompiler; 39 import org.onosproject.net.intent.IntentCompiler;
41 import org.onosproject.net.intent.PathIntent; 40 import org.onosproject.net.intent.PathIntent;
42 import org.onosproject.net.newresource.ResourceService; 41 import org.onosproject.net.newresource.ResourceService;
43 -import org.onosproject.net.resource.link.LinkResourceAllocations;
44 import org.slf4j.Logger; 42 import org.slf4j.Logger;
45 43
46 import com.google.common.collect.ImmutableList; 44 import com.google.common.collect.ImmutableList;
...@@ -78,8 +76,7 @@ public class PathIntentFlowObjectiveCompiler ...@@ -78,8 +76,7 @@ public class PathIntentFlowObjectiveCompiler
78 } 76 }
79 77
80 @Override 78 @Override
81 - public List<Intent> compile(PathIntent intent, List<Intent> installable, 79 + public List<Intent> compile(PathIntent intent, List<Intent> installable) {
82 - Set<LinkResourceAllocations> resources) {
83 80
84 List<Objective> objectives = new LinkedList<>(); 81 List<Objective> objectives = new LinkedList<>();
85 List<DeviceId> devices = new LinkedList<>(); 82 List<DeviceId> devices = new LinkedList<>();
......
...@@ -26,11 +26,9 @@ import org.onosproject.net.intent.Intent; ...@@ -26,11 +26,9 @@ import org.onosproject.net.intent.Intent;
26 import org.onosproject.net.intent.PathIntent; 26 import org.onosproject.net.intent.PathIntent;
27 import org.onosproject.net.intent.PointToPointIntent; 27 import org.onosproject.net.intent.PointToPointIntent;
28 import org.onosproject.net.provider.ProviderId; 28 import org.onosproject.net.provider.ProviderId;
29 -import org.onosproject.net.resource.link.LinkResourceAllocations;
30 29
31 import java.util.ArrayList; 30 import java.util.ArrayList;
32 import java.util.List; 31 import java.util.List;
33 -import java.util.Set;
34 32
35 import static java.util.Arrays.asList; 33 import static java.util.Arrays.asList;
36 import static org.onosproject.net.DefaultEdgeLink.createEdgeLink; 34 import static org.onosproject.net.DefaultEdgeLink.createEdgeLink;
...@@ -59,8 +57,7 @@ public class PointToPointIntentCompiler ...@@ -59,8 +57,7 @@ public class PointToPointIntentCompiler
59 } 57 }
60 58
61 @Override 59 @Override
62 - public List<Intent> compile(PointToPointIntent intent, List<Intent> installable, 60 + public List<Intent> compile(PointToPointIntent intent, List<Intent> installable) {
63 - Set<LinkResourceAllocations> resources) {
64 61
65 ConnectPoint ingressPoint = intent.ingressPoint(); 62 ConnectPoint ingressPoint = intent.ingressPoint();
66 ConnectPoint egressPoint = intent.egressPoint(); 63 ConnectPoint egressPoint = intent.egressPoint();
......
...@@ -26,7 +26,6 @@ import org.onosproject.net.intent.Intent; ...@@ -26,7 +26,6 @@ import org.onosproject.net.intent.Intent;
26 import org.onosproject.net.intent.LinkCollectionIntent; 26 import org.onosproject.net.intent.LinkCollectionIntent;
27 import org.onosproject.net.intent.SinglePointToMultiPointIntent; 27 import org.onosproject.net.intent.SinglePointToMultiPointIntent;
28 import org.onosproject.net.provider.ProviderId; 28 import org.onosproject.net.provider.ProviderId;
29 -import org.onosproject.net.resource.link.LinkResourceAllocations;
30 29
31 import java.util.Collections; 30 import java.util.Collections;
32 import java.util.HashSet; 31 import java.util.HashSet;
...@@ -55,8 +54,7 @@ public class SinglePointToMultiPointIntentCompiler ...@@ -55,8 +54,7 @@ public class SinglePointToMultiPointIntentCompiler
55 54
56 @Override 55 @Override
57 public List<Intent> compile(SinglePointToMultiPointIntent intent, 56 public List<Intent> compile(SinglePointToMultiPointIntent intent,
58 - List<Intent> installable, 57 + List<Intent> installable) {
59 - Set<LinkResourceAllocations> resources) {
60 Set<Link> links = new HashSet<>(); 58 Set<Link> links = new HashSet<>();
61 59
62 for (ConnectPoint egressPoint : intent.egressPoints()) { 60 for (ConnectPoint egressPoint : intent.egressPoints()) {
......
...@@ -22,10 +22,8 @@ import org.apache.felix.scr.annotations.Deactivate; ...@@ -22,10 +22,8 @@ import org.apache.felix.scr.annotations.Deactivate;
22 import org.onosproject.net.intent.Intent; 22 import org.onosproject.net.intent.Intent;
23 import org.onosproject.net.intent.PointToPointIntent; 23 import org.onosproject.net.intent.PointToPointIntent;
24 import org.onosproject.net.intent.TwoWayP2PIntent; 24 import org.onosproject.net.intent.TwoWayP2PIntent;
25 -import org.onosproject.net.resource.link.LinkResourceAllocations;
26 25
27 import java.util.List; 26 import java.util.List;
28 -import java.util.Set;
29 27
30 /** 28 /**
31 * A intent compiler for {@link org.onosproject.net.intent.TwoWayP2PIntent}. 29 * A intent compiler for {@link org.onosproject.net.intent.TwoWayP2PIntent}.
...@@ -45,8 +43,7 @@ public class TwoWayP2PIntentCompiler ...@@ -45,8 +43,7 @@ public class TwoWayP2PIntentCompiler
45 } 43 }
46 44
47 @Override 45 @Override
48 - public List<Intent> compile(TwoWayP2PIntent intent, List<Intent> installable, 46 + public List<Intent> compile(TwoWayP2PIntent intent, List<Intent> installable) {
49 - Set<LinkResourceAllocations> resources) {
50 return Lists.newArrayList( 47 return Lists.newArrayList(
51 PointToPointIntent.builder() 48 PointToPointIntent.builder()
52 .appId(intent.appId()) 49 .appId(intent.appId())
......
...@@ -45,7 +45,6 @@ import org.onosproject.net.intent.IntentListener; ...@@ -45,7 +45,6 @@ import org.onosproject.net.intent.IntentListener;
45 import org.onosproject.net.intent.IntentService; 45 import org.onosproject.net.intent.IntentService;
46 import org.onosproject.net.intent.IntentState; 46 import org.onosproject.net.intent.IntentState;
47 import org.onosproject.net.intent.Key; 47 import org.onosproject.net.intent.Key;
48 -import org.onosproject.net.resource.link.LinkResourceAllocations;
49 import org.onosproject.store.trivial.SimpleIntentStore; 48 import org.onosproject.store.trivial.SimpleIntentStore;
50 49
51 import java.util.Collection; 50 import java.util.Collection;
...@@ -165,16 +164,14 @@ public class IntentManagerTest { ...@@ -165,16 +164,14 @@ public class IntentManagerTest {
165 164
166 private static class TestIntentCompiler implements IntentCompiler<MockIntent> { 165 private static class TestIntentCompiler implements IntentCompiler<MockIntent> {
167 @Override 166 @Override
168 - public List<Intent> compile(MockIntent intent, List<Intent> installable, 167 + public List<Intent> compile(MockIntent intent, List<Intent> installable) {
169 - Set<LinkResourceAllocations> resources) {
170 return Lists.newArrayList(new MockInstallableIntent()); 168 return Lists.newArrayList(new MockInstallableIntent());
171 } 169 }
172 } 170 }
173 171
174 private static class TestIntentCompilerMultipleFlows implements IntentCompiler<MockIntent> { 172 private static class TestIntentCompilerMultipleFlows implements IntentCompiler<MockIntent> {
175 @Override 173 @Override
176 - public List<Intent> compile(MockIntent intent, List<Intent> installable, 174 + public List<Intent> compile(MockIntent intent, List<Intent> installable) {
177 - Set<LinkResourceAllocations> resources) {
178 175
179 return IntStream.rangeClosed(1, 5) 176 return IntStream.rangeClosed(1, 5)
180 .mapToObj(mock -> (new MockInstallableIntent())) 177 .mapToObj(mock -> (new MockInstallableIntent()))
...@@ -185,8 +182,7 @@ public class IntentManagerTest { ...@@ -185,8 +182,7 @@ public class IntentManagerTest {
185 182
186 private static class TestIntentCompilerError implements IntentCompiler<MockIntent> { 183 private static class TestIntentCompilerError implements IntentCompiler<MockIntent> {
187 @Override 184 @Override
188 - public List<Intent> compile(MockIntent intent, List<Intent> installable, 185 + public List<Intent> compile(MockIntent intent, List<Intent> installable) {
189 - Set<LinkResourceAllocations> resources) {
190 throw new IntentCompilationException("Compilation always fails"); 186 throw new IntentCompilationException("Compilation always fails");
191 } 187 }
192 } 188 }
......
...@@ -129,7 +129,7 @@ public class HostToHostIntentCompilerTest extends AbstractIntentTest { ...@@ -129,7 +129,7 @@ public class HostToHostIntentCompilerTest extends AbstractIntentTest {
129 HostToHostIntentCompiler compiler = makeCompiler(hops); 129 HostToHostIntentCompiler compiler = makeCompiler(hops);
130 assertThat(compiler, is(notNullValue())); 130 assertThat(compiler, is(notNullValue()));
131 131
132 - List<Intent> result = compiler.compile(intent, null, null); 132 + List<Intent> result = compiler.compile(intent, null);
133 assertThat(result, is(Matchers.notNullValue())); 133 assertThat(result, is(Matchers.notNullValue()));
134 assertThat(result, hasSize(2)); 134 assertThat(result, hasSize(2));
135 Intent forwardResultIntent = result.get(0); 135 Intent forwardResultIntent = result.get(0);
......
...@@ -123,7 +123,7 @@ public class LinkCollectionIntentCompilerTest { ...@@ -123,7 +123,7 @@ public class LinkCollectionIntentCompilerTest {
123 public void testCompile() { 123 public void testCompile() {
124 sut.activate(); 124 sut.activate();
125 125
126 - List<Intent> compiled = sut.compile(intent, Collections.emptyList(), Collections.emptySet()); 126 + List<Intent> compiled = sut.compile(intent, Collections.emptyList());
127 assertThat(compiled, hasSize(1)); 127 assertThat(compiled, hasSize(1));
128 128
129 Collection<FlowRule> rules = ((FlowRuleIntent) compiled.get(0)).flowRules(); 129 Collection<FlowRule> rules = ((FlowRuleIntent) compiled.get(0)).flowRules();
......
...@@ -108,7 +108,7 @@ public class MplsIntentCompilerTest extends AbstractIntentTest { ...@@ -108,7 +108,7 @@ public class MplsIntentCompilerTest extends AbstractIntentTest {
108 MplsIntentCompiler compiler = makeCompiler(hops); 108 MplsIntentCompiler compiler = makeCompiler(hops);
109 assertThat(compiler, is(notNullValue())); 109 assertThat(compiler, is(notNullValue()));
110 110
111 - List<Intent> result = compiler.compile(intent, null, null); 111 + List<Intent> result = compiler.compile(intent, null);
112 assertThat(result, is(Matchers.notNullValue())); 112 assertThat(result, is(Matchers.notNullValue()));
113 assertThat(result, hasSize(1)); 113 assertThat(result, hasSize(1));
114 Intent forwardResultIntent = result.get(0); 114 Intent forwardResultIntent = result.get(0);
...@@ -146,7 +146,7 @@ public class MplsIntentCompilerTest extends AbstractIntentTest { ...@@ -146,7 +146,7 @@ public class MplsIntentCompilerTest extends AbstractIntentTest {
146 MplsIntentCompiler compiler = makeCompiler(hops); 146 MplsIntentCompiler compiler = makeCompiler(hops);
147 assertThat(compiler, is(notNullValue())); 147 assertThat(compiler, is(notNullValue()));
148 148
149 - List<Intent> result = compiler.compile(intent, null, null); 149 + List<Intent> result = compiler.compile(intent, null);
150 assertThat(result, is(Matchers.notNullValue())); 150 assertThat(result, is(Matchers.notNullValue()));
151 assertThat(result, hasSize(1)); 151 assertThat(result, hasSize(1));
152 Intent reverseResultIntent = result.get(0); 152 Intent reverseResultIntent = result.get(0);
...@@ -188,7 +188,7 @@ public class MplsIntentCompilerTest extends AbstractIntentTest { ...@@ -188,7 +188,7 @@ public class MplsIntentCompilerTest extends AbstractIntentTest {
188 String[] hops = {"1"}; 188 String[] hops = {"1"};
189 MplsIntentCompiler sut = makeCompiler(hops); 189 MplsIntentCompiler sut = makeCompiler(hops);
190 190
191 - List<Intent> compiled = sut.compile(intent, null, null); 191 + List<Intent> compiled = sut.compile(intent, null);
192 192
193 assertThat(compiled, hasSize(1)); 193 assertThat(compiled, hasSize(1));
194 assertThat(compiled.get(0), is(instanceOf(MplsPathIntent.class))); 194 assertThat(compiled.get(0), is(instanceOf(MplsPathIntent.class)));
......
...@@ -126,7 +126,7 @@ public class MplsPathIntentCompilerTest { ...@@ -126,7 +126,7 @@ public class MplsPathIntentCompilerTest {
126 public void testCompile() { 126 public void testCompile() {
127 sut.activate(); 127 sut.activate();
128 128
129 - List<Intent> compiled = sut.compile(intent, Collections.emptyList(), Collections.emptySet()); 129 + List<Intent> compiled = sut.compile(intent, Collections.emptyList());
130 assertThat(compiled, hasSize(1)); 130 assertThat(compiled, hasSize(1));
131 131
132 Collection<FlowRule> rules = ((FlowRuleIntent) compiled.get(0)).flowRules(); 132 Collection<FlowRule> rules = ((FlowRuleIntent) compiled.get(0)).flowRules();
......
...@@ -153,7 +153,7 @@ public class MultiPointToSinglePointIntentCompilerTest extends AbstractIntentTes ...@@ -153,7 +153,7 @@ public class MultiPointToSinglePointIntentCompilerTest extends AbstractIntentTes
153 MultiPointToSinglePointIntentCompiler compiler = makeCompiler(hops); 153 MultiPointToSinglePointIntentCompiler compiler = makeCompiler(hops);
154 assertThat(compiler, is(notNullValue())); 154 assertThat(compiler, is(notNullValue()));
155 155
156 - List<Intent> result = compiler.compile(intent, null, null); 156 + List<Intent> result = compiler.compile(intent, null);
157 assertThat(result, is(Matchers.notNullValue())); 157 assertThat(result, is(Matchers.notNullValue()));
158 assertThat(result, hasSize(1)); 158 assertThat(result, hasSize(1));
159 Intent resultIntent = result.get(0); 159 Intent resultIntent = result.get(0);
...@@ -188,7 +188,7 @@ public class MultiPointToSinglePointIntentCompilerTest extends AbstractIntentTes ...@@ -188,7 +188,7 @@ public class MultiPointToSinglePointIntentCompilerTest extends AbstractIntentTes
188 MultiPointToSinglePointIntentCompiler compiler = makeCompiler(hops); 188 MultiPointToSinglePointIntentCompiler compiler = makeCompiler(hops);
189 assertThat(compiler, is(notNullValue())); 189 assertThat(compiler, is(notNullValue()));
190 190
191 - List<Intent> result = compiler.compile(intent, null, null); 191 + List<Intent> result = compiler.compile(intent, null);
192 assertThat(result, is(notNullValue())); 192 assertThat(result, is(notNullValue()));
193 assertThat(result, hasSize(1)); 193 assertThat(result, hasSize(1));
194 Intent resultIntent = result.get(0); 194 Intent resultIntent = result.get(0);
...@@ -221,7 +221,7 @@ public class MultiPointToSinglePointIntentCompilerTest extends AbstractIntentTes ...@@ -221,7 +221,7 @@ public class MultiPointToSinglePointIntentCompilerTest extends AbstractIntentTes
221 MultiPointToSinglePointIntentCompiler compiler = makeCompiler(hops); 221 MultiPointToSinglePointIntentCompiler compiler = makeCompiler(hops);
222 assertThat(compiler, is(notNullValue())); 222 assertThat(compiler, is(notNullValue()));
223 223
224 - List<Intent> result = compiler.compile(intent, null, null); 224 + List<Intent> result = compiler.compile(intent, null);
225 assertThat(result, is(notNullValue())); 225 assertThat(result, is(notNullValue()));
226 assertThat(result, hasSize(1)); 226 assertThat(result, hasSize(1));
227 Intent resultIntent = result.get(0); 227 Intent resultIntent = result.get(0);
...@@ -254,7 +254,7 @@ public class MultiPointToSinglePointIntentCompilerTest extends AbstractIntentTes ...@@ -254,7 +254,7 @@ public class MultiPointToSinglePointIntentCompilerTest extends AbstractIntentTes
254 MultiPointToSinglePointIntentCompiler compiler = makeCompiler(hops); 254 MultiPointToSinglePointIntentCompiler compiler = makeCompiler(hops);
255 assertThat(compiler, is(notNullValue())); 255 assertThat(compiler, is(notNullValue()));
256 256
257 - List<Intent> result = compiler.compile(intent, null, null); 257 + List<Intent> result = compiler.compile(intent, null);
258 assertThat(result, is(notNullValue())); 258 assertThat(result, is(notNullValue()));
259 assertThat(result, hasSize(1)); 259 assertThat(result, hasSize(1));
260 Intent resultIntent = result.get(0); 260 Intent resultIntent = result.get(0);
......
...@@ -410,7 +410,7 @@ public class OpticalCircuitIntentCompilerTest { ...@@ -410,7 +410,7 @@ public class OpticalCircuitIntentCompilerTest {
410 410
411 sut.activate(null); 411 sut.activate(null);
412 412
413 - List<Intent> compiled = sut.compile(intent, Collections.emptyList(), Collections.emptySet()); 413 + List<Intent> compiled = sut.compile(intent, Collections.emptyList());
414 assertThat(compiled, hasSize(1)); 414 assertThat(compiled, hasSize(1));
415 415
416 Collection<FlowRule> rules = ((FlowRuleIntent) compiled.get(0)).flowRules(); 416 Collection<FlowRule> rules = ((FlowRuleIntent) compiled.get(0)).flowRules();
...@@ -483,7 +483,7 @@ public class OpticalCircuitIntentCompilerTest { ...@@ -483,7 +483,7 @@ public class OpticalCircuitIntentCompilerTest {
483 483
484 sut.activate(null); 484 sut.activate(null);
485 485
486 - List<Intent> compiled = sut.compile(intent, Collections.emptyList(), Collections.emptySet()); 486 + List<Intent> compiled = sut.compile(intent, Collections.emptyList());
487 assertThat(compiled, hasSize(1)); 487 assertThat(compiled, hasSize(1));
488 488
489 Collection<FlowRule> rules = ((FlowRuleIntent) compiled.get(0)).flowRules(); 489 Collection<FlowRule> rules = ((FlowRuleIntent) compiled.get(0)).flowRules();
...@@ -551,7 +551,7 @@ public class OpticalCircuitIntentCompilerTest { ...@@ -551,7 +551,7 @@ public class OpticalCircuitIntentCompilerTest {
551 551
552 sut.activate(null); 552 sut.activate(null);
553 553
554 - List<Intent> compiled = sut.compile(intent, Collections.emptyList(), Collections.emptySet()); 554 + List<Intent> compiled = sut.compile(intent, Collections.emptyList());
555 assertThat(compiled, hasSize(1)); 555 assertThat(compiled, hasSize(1));
556 556
557 Collection<FlowRule> rules = ((FlowRuleIntent) compiled.get(0)).flowRules(); 557 Collection<FlowRule> rules = ((FlowRuleIntent) compiled.get(0)).flowRules();
......
...@@ -105,7 +105,7 @@ public class OpticalPathIntentCompilerTest { ...@@ -105,7 +105,7 @@ public class OpticalPathIntentCompilerTest {
105 public void testCompiler() { 105 public void testCompiler() {
106 sut.activate(); 106 sut.activate();
107 107
108 - List<Intent> compiled = sut.compile(intent, Collections.emptyList(), Collections.emptySet()); 108 + List<Intent> compiled = sut.compile(intent, Collections.emptyList());
109 assertThat(compiled, hasSize(1)); 109 assertThat(compiled, hasSize(1));
110 110
111 Collection<FlowRule> rules = ((FlowRuleIntent) compiled.get(0)).flowRules(); 111 Collection<FlowRule> rules = ((FlowRuleIntent) compiled.get(0)).flowRules();
......
...@@ -189,7 +189,7 @@ public class PathIntentCompilerTest { ...@@ -189,7 +189,7 @@ public class PathIntentCompilerTest {
189 public void testCompile() { 189 public void testCompile() {
190 sut.activate(); 190 sut.activate();
191 191
192 - List<Intent> compiled = sut.compile(intent, Collections.emptyList(), Collections.emptySet()); 192 + List<Intent> compiled = sut.compile(intent, Collections.emptyList());
193 assertThat(compiled, hasSize(1)); 193 assertThat(compiled, hasSize(1));
194 194
195 Collection<FlowRule> rules = ((FlowRuleIntent) compiled.get(0)).flowRules(); 195 Collection<FlowRule> rules = ((FlowRuleIntent) compiled.get(0)).flowRules();
...@@ -236,7 +236,7 @@ public class PathIntentCompilerTest { ...@@ -236,7 +236,7 @@ public class PathIntentCompilerTest {
236 public void testVlanEncapCompile() { 236 public void testVlanEncapCompile() {
237 sut.activate(); 237 sut.activate();
238 238
239 - List<Intent> compiled = sut.compile(constraintVlanIntent, Collections.emptyList(), Collections.emptySet()); 239 + List<Intent> compiled = sut.compile(constraintVlanIntent, Collections.emptyList());
240 assertThat(compiled, hasSize(1)); 240 assertThat(compiled, hasSize(1));
241 241
242 Collection<FlowRule> rules = ((FlowRuleIntent) compiled.get(0)).flowRules(); 242 Collection<FlowRule> rules = ((FlowRuleIntent) compiled.get(0)).flowRules();
...@@ -280,7 +280,7 @@ public class PathIntentCompilerTest { ...@@ -280,7 +280,7 @@ public class PathIntentCompilerTest {
280 sut.activate(); 280 sut.activate();
281 281
282 List<Intent> compiled = sut.compile(constrainIngressEgressVlanIntent, 282 List<Intent> compiled = sut.compile(constrainIngressEgressVlanIntent,
283 - Collections.emptyList(), Collections.emptySet()); 283 + Collections.emptyList());
284 assertThat(compiled, hasSize(1)); 284 assertThat(compiled, hasSize(1));
285 285
286 Collection<FlowRule> rules = ((FlowRuleIntent) compiled.get(0)).flowRules(); 286 Collection<FlowRule> rules = ((FlowRuleIntent) compiled.get(0)).flowRules();
...@@ -373,7 +373,7 @@ public class PathIntentCompilerTest { ...@@ -373,7 +373,7 @@ public class PathIntentCompilerTest {
373 public void testMplsEncapCompile() { 373 public void testMplsEncapCompile() {
374 sut.activate(); 374 sut.activate();
375 375
376 - List<Intent> compiled = sut.compile(constraintMplsIntent, Collections.emptyList(), Collections.emptySet()); 376 + List<Intent> compiled = sut.compile(constraintMplsIntent, Collections.emptyList());
377 assertThat(compiled, hasSize(1)); 377 assertThat(compiled, hasSize(1));
378 378
379 Collection<FlowRule> rules = ((FlowRuleIntent) compiled.get(0)).flowRules(); 379 Collection<FlowRule> rules = ((FlowRuleIntent) compiled.get(0)).flowRules();
......
...@@ -136,7 +136,7 @@ public class PointToPointIntentCompilerTest extends AbstractIntentTest { ...@@ -136,7 +136,7 @@ public class PointToPointIntentCompilerTest extends AbstractIntentTest {
136 String[] hops = {"d1", "d2", "d3", "d4", "d5", "d6", "d7", "d8"}; 136 String[] hops = {"d1", "d2", "d3", "d4", "d5", "d6", "d7", "d8"};
137 PointToPointIntentCompiler compiler = makeCompiler(hops); 137 PointToPointIntentCompiler compiler = makeCompiler(hops);
138 138
139 - List<Intent> result = compiler.compile(intent, null, null); 139 + List<Intent> result = compiler.compile(intent, null);
140 assertThat(result, is(Matchers.notNullValue())); 140 assertThat(result, is(Matchers.notNullValue()));
141 assertThat(result, hasSize(1)); 141 assertThat(result, hasSize(1));
142 Intent forwardResultIntent = result.get(0); 142 Intent forwardResultIntent = result.get(0);
...@@ -167,7 +167,7 @@ public class PointToPointIntentCompilerTest extends AbstractIntentTest { ...@@ -167,7 +167,7 @@ public class PointToPointIntentCompilerTest extends AbstractIntentTest {
167 String[] hops = {"d1", "d2", "d3", "d4", "d5", "d6", "d7", "d8"}; 167 String[] hops = {"d1", "d2", "d3", "d4", "d5", "d6", "d7", "d8"};
168 PointToPointIntentCompiler compiler = makeCompiler(hops); 168 PointToPointIntentCompiler compiler = makeCompiler(hops);
169 169
170 - List<Intent> result = compiler.compile(intent, null, null); 170 + List<Intent> result = compiler.compile(intent, null);
171 assertThat(result, is(Matchers.notNullValue())); 171 assertThat(result, is(Matchers.notNullValue()));
172 assertThat(result, hasSize(1)); 172 assertThat(result, hasSize(1));
173 Intent reverseResultIntent = result.get(0); 173 Intent reverseResultIntent = result.get(0);
...@@ -204,7 +204,7 @@ public class PointToPointIntentCompilerTest extends AbstractIntentTest { ...@@ -204,7 +204,7 @@ public class PointToPointIntentCompilerTest extends AbstractIntentTest {
204 String[] hops = {"1"}; 204 String[] hops = {"1"};
205 PointToPointIntentCompiler sut = makeCompiler(hops); 205 PointToPointIntentCompiler sut = makeCompiler(hops);
206 206
207 - List<Intent> compiled = sut.compile(intent, null, null); 207 + List<Intent> compiled = sut.compile(intent, null);
208 208
209 assertThat(compiled, hasSize(1)); 209 assertThat(compiled, hasSize(1));
210 assertThat(compiled.get(0), is(instanceOf(PathIntent.class))); 210 assertThat(compiled.get(0), is(instanceOf(PathIntent.class)));
...@@ -233,7 +233,7 @@ public class PointToPointIntentCompilerTest extends AbstractIntentTest { ...@@ -233,7 +233,7 @@ public class PointToPointIntentCompilerTest extends AbstractIntentTest {
233 String[] hops = {"s1", "s2", "s3"}; 233 String[] hops = {"s1", "s2", "s3"};
234 final PointToPointIntentCompiler compiler = makeCompiler(hops, resourceService); 234 final PointToPointIntentCompiler compiler = makeCompiler(hops, resourceService);
235 235
236 - final List<Intent> compiledIntents = compiler.compile(intent, null, null); 236 + final List<Intent> compiledIntents = compiler.compile(intent, null);
237 237
238 assertThat(compiledIntents, Matchers.notNullValue()); 238 assertThat(compiledIntents, Matchers.notNullValue());
239 assertThat(compiledIntents, hasSize(1)); 239 assertThat(compiledIntents, hasSize(1));
...@@ -256,7 +256,7 @@ public class PointToPointIntentCompilerTest extends AbstractIntentTest { ...@@ -256,7 +256,7 @@ public class PointToPointIntentCompilerTest extends AbstractIntentTest {
256 String[] hops = {"s1", "s2", "s3"}; 256 String[] hops = {"s1", "s2", "s3"};
257 final PointToPointIntentCompiler compiler = makeCompiler(hops, resourceService); 257 final PointToPointIntentCompiler compiler = makeCompiler(hops, resourceService);
258 258
259 - compiler.compile(intent, null, null); 259 + compiler.compile(intent, null);
260 260
261 fail("Point to Point compilation with insufficient bandwidth does " 261 fail("Point to Point compilation with insufficient bandwidth does "
262 + "not throw exception."); 262 + "not throw exception.");
......