홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Sho SHIMIZU
260439de 1 parent 4558268c

Replace deprecated APIs with the alternatives 

Change-Id: I2959554573e0561543ab5fd0b2bcc871b8a74f3d
Inline Side-by-side
Showing 3 changed files with 19 additions and 12 deletions
...@@ -28,6 +28,7 @@ import org.onosproject.core.ApplicationId; ...@@ -28,6 +28,7 @@ import org.onosproject.core.ApplicationId;
28 import org.onosproject.core.CoreService; 28 import org.onosproject.core.CoreService;
29 import org.onosproject.net.Device; 29 import org.onosproject.net.Device;
30 import org.onosproject.net.DeviceId; 30 import org.onosproject.net.DeviceId;
31 +import org.onosproject.net.IndexedLambda;
31 import org.onosproject.net.PortNumber; 32 import org.onosproject.net.PortNumber;
32 import org.onosproject.net.device.DeviceEvent; 33 import org.onosproject.net.device.DeviceEvent;
33 import org.onosproject.net.device.DeviceListener; 34 import org.onosproject.net.device.DeviceListener;
...@@ -39,6 +40,7 @@ import org.onosproject.net.flow.FlowRule; ...@@ -39,6 +40,7 @@ import org.onosproject.net.flow.FlowRule;
39 import org.onosproject.net.flow.FlowRuleService; 40 import org.onosproject.net.flow.FlowRuleService;
40 import org.onosproject.net.flow.TrafficSelector; 41 import org.onosproject.net.flow.TrafficSelector;
41 import org.onosproject.net.flow.TrafficTreatment; 42 import org.onosproject.net.flow.TrafficTreatment;
43 +import org.onosproject.net.flow.criteria.Criteria;
42 import org.slf4j.Logger; 44 import org.slf4j.Logger;
43 45
44 /** 46 /**
...@@ -113,14 +115,14 @@ public class LambdaForwarding { ...@@ -113,14 +115,14 @@ public class LambdaForwarding {
113 case 2: 115 case 2:
114 inport = 21; 116 inport = 21;
115 outport = 11; 117 outport = 11;
116 - sbuilder.matchLambda(lambda). 118 + sbuilder.add(Criteria.matchLambda(new IndexedLambda(lambda))).
117 matchInPort(PortNumber.portNumber(inport)); // match sigtype 119 matchInPort(PortNumber.portNumber(inport)); // match sigtype
118 tbuilder.setOutput(PortNumber.portNumber(outport)); 120 tbuilder.setOutput(PortNumber.portNumber(outport));
119 break; 121 break;
120 case 3: 122 case 3:
121 inport = 30; 123 inport = 30;
122 outport = 31; 124 outport = 31;
123 - sbuilder.matchLambda(lambda). 125 + sbuilder.add(Criteria.matchLambda(new IndexedLambda(lambda))).
124 matchInPort(PortNumber.portNumber(inport)); 126 matchInPort(PortNumber.portNumber(inport));
125 tbuilder.setOutput(PortNumber.portNumber(outport)).setLambda(lambda); 127 tbuilder.setOutput(PortNumber.portNumber(outport)).setLambda(lambda);
126 break; 128 break;
......
...@@ -22,6 +22,7 @@ import org.onlab.packet.IpPrefix; ...@@ -22,6 +22,7 @@ import org.onlab.packet.IpPrefix;
22 import org.onlab.packet.MacAddress; 22 import org.onlab.packet.MacAddress;
23 import org.onlab.packet.MplsLabel; 23 import org.onlab.packet.MplsLabel;
24 import org.onlab.packet.VlanId; 24 import org.onlab.packet.VlanId;
25 +import org.onosproject.net.IndexedLambda;
25 import org.onosproject.net.PortNumber; 26 import org.onosproject.net.PortNumber;
26 import org.onosproject.net.flow.criteria.Criteria; 27 import org.onosproject.net.flow.criteria.Criteria;
27 import org.onosproject.net.flow.criteria.Criterion; 28 import org.onosproject.net.flow.criteria.Criterion;
...@@ -300,7 +301,7 @@ public final class DefaultTrafficSelector implements TrafficSelector { ...@@ -300,7 +301,7 @@ public final class DefaultTrafficSelector implements TrafficSelector {
300 @Deprecated 301 @Deprecated
301 @Override 302 @Override
302 public Builder matchLambda(short lambda) { 303 public Builder matchLambda(short lambda) {
303 - return add(Criteria.matchLambda(lambda)); 304 + return add(Criteria.matchLambda(new IndexedLambda(lambda)));
304 } 305 }
305 306
306 @Deprecated 307 @Deprecated
......
...@@ -22,6 +22,7 @@ import org.hamcrest.Factory; ...@@ -22,6 +22,7 @@ import org.hamcrest.Factory;
22 import org.hamcrest.Matcher; 22 import org.hamcrest.Matcher;
23 import org.hamcrest.TypeSafeMatcher; 23 import org.hamcrest.TypeSafeMatcher;
24 import org.junit.Test; 24 import org.junit.Test;
25 +import org.onosproject.net.IndexedLambda;
25 import org.onosproject.net.PortNumber; 26 import org.onosproject.net.PortNumber;
26 import org.onosproject.net.flow.criteria.Criteria; 27 import org.onosproject.net.flow.criteria.Criteria;
27 import org.onosproject.net.flow.criteria.Criterion; 28 import org.onosproject.net.flow.criteria.Criterion;
...@@ -60,12 +61,15 @@ public class DefaultTrafficSelectorTest { ...@@ -60,12 +61,15 @@ public class DefaultTrafficSelectorTest {
60 final short one = 1; 61 final short one = 1;
61 final short two = 2; 62 final short two = 2;
62 63
63 - final TrafficSelector selector1 = 64 + final TrafficSelector selector1 = DefaultTrafficSelector.builder()
64 - DefaultTrafficSelector.builder().matchLambda(one).build(); 65 + .add(Criteria.matchLambda(new IndexedLambda(one)))
65 - final TrafficSelector sameAsSelector1 = 66 + .build();
66 - DefaultTrafficSelector.builder().matchLambda(one).build(); 67 + final TrafficSelector sameAsSelector1 = DefaultTrafficSelector.builder()
67 - final TrafficSelector selector2 = 68 + .add(Criteria.matchLambda(new IndexedLambda(one)))
68 - DefaultTrafficSelector.builder().matchLambda(two).build(); 69 + .build();
70 + final TrafficSelector selector2 = DefaultTrafficSelector.builder()
71 + .add(Criteria.matchLambda(new IndexedLambda(two)))
72 + .build();
69 73
70 new EqualsTester() 74 new EqualsTester()
71 .addEqualityGroup(selector1, sameAsSelector1) 75 .addEqualityGroup(selector1, sameAsSelector1)
...@@ -260,11 +264,11 @@ public class DefaultTrafficSelectorTest { ...@@ -260,11 +264,11 @@ public class DefaultTrafficSelectorTest {
260 assertThat(selector, hasCriterionWithType(Type.IPV6_EXTHDR)); 264 assertThat(selector, hasCriterionWithType(Type.IPV6_EXTHDR));
261 265
262 selector = DefaultTrafficSelector.builder() 266 selector = DefaultTrafficSelector.builder()
263 - .matchLambda(shortValue).build(); 267 + .add(Criteria.matchLambda(new IndexedLambda(shortValue))).build();
264 assertThat(selector, hasCriterionWithType(Type.OCH_SIGID)); 268 assertThat(selector, hasCriterionWithType(Type.OCH_SIGID));
265 269
266 selector = DefaultTrafficSelector.builder() 270 selector = DefaultTrafficSelector.builder()
267 - .matchOpticalSignalType(shortValue).build(); 271 + .add(Criteria.matchOpticalSignalType(shortValue)).build();
268 assertThat(selector, hasCriterionWithType(Type.OCH_SIGTYPE)); 272 assertThat(selector, hasCriterionWithType(Type.OCH_SIGTYPE));
269 } 273 }
270 274
...@@ -277,7 +281,7 @@ public class DefaultTrafficSelectorTest { ...@@ -277,7 +281,7 @@ public class DefaultTrafficSelectorTest {
277 final short shortValue = 33; 281 final short shortValue = 33;
278 282
279 final TrafficSelector baseSelector = DefaultTrafficSelector.builder() 283 final TrafficSelector baseSelector = DefaultTrafficSelector.builder()
280 - .matchLambda(shortValue).build(); 284 + .add(Criteria.matchLambda(new IndexedLambda(shortValue))).build();
281 selector = DefaultTrafficSelector.builder(baseSelector) 285 selector = DefaultTrafficSelector.builder(baseSelector)
282 .build(); 286 .build();
283 assertThat(selector, hasCriterionWithType(Type.OCH_SIGID)); 287 assertThat(selector, hasCriterionWithType(Type.OCH_SIGID));
......