홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Yuta HIGUCHI
467ccf7f 1 parent 59df0b2d

DefaultFlowRule: remove deprecated constructor 

Change-Id: Iac8dbc0f8fc2386f3f3b6435965503a2050e4b38
Inline Side-by-side
Showing 3 changed files with 5 additions and 10 deletions
...@@ -63,13 +63,6 @@ public class DefaultFlowRule implements FlowRule { ...@@ -63,13 +63,6 @@ public class DefaultFlowRule implements FlowRule {
63 this(deviceId, selector, treatment, priority, appId, new DefaultGroupId(0), timeout, permanent); 63 this(deviceId, selector, treatment, priority, appId, new DefaultGroupId(0), timeout, permanent);
64 } 64 }
65 65
66 - @Deprecated
67 - public DefaultFlowRule(DeviceId deviceId, TrafficSelector selector,
68 - TrafficTreatment treatment, int priority, ApplicationId appId,
69 - short groupId, int timeout, boolean permanent) {
70 - this(deviceId, selector, treatment, priority, appId, new DefaultGroupId(groupId), timeout, permanent);
71 - }
72 -
73 public DefaultFlowRule(DeviceId deviceId, TrafficSelector selector, 66 public DefaultFlowRule(DeviceId deviceId, TrafficSelector selector,
74 TrafficTreatment treatment, int priority, ApplicationId appId, 67 TrafficTreatment treatment, int priority, ApplicationId appId,
75 GroupId groupId, int timeout, boolean permanent) { 68 GroupId groupId, int timeout, boolean permanent) {
......
...@@ -29,6 +29,7 @@ import org.apache.felix.scr.annotations.Reference; ...@@ -29,6 +29,7 @@ import org.apache.felix.scr.annotations.Reference;
29 import org.apache.felix.scr.annotations.ReferenceCardinality; 29 import org.apache.felix.scr.annotations.ReferenceCardinality;
30 import org.onosproject.core.ApplicationId; 30 import org.onosproject.core.ApplicationId;
31 import org.onosproject.core.CoreService; 31 import org.onosproject.core.CoreService;
32 +import org.onosproject.core.DefaultGroupId;
32 import org.onosproject.net.ConnectPoint; 33 import org.onosproject.net.ConnectPoint;
33 import org.onosproject.net.DeviceId; 34 import org.onosproject.net.DeviceId;
34 import org.onosproject.net.Link; 35 import org.onosproject.net.Link;
...@@ -168,7 +169,7 @@ public class LinkCollectionIntentInstaller ...@@ -168,7 +169,7 @@ public class LinkCollectionIntentInstaller
168 169
169 FlowRule rule = new DefaultFlowRule(deviceId, 170 FlowRule rule = new DefaultFlowRule(deviceId,
170 selector, treatment, 123, 171 selector, treatment, 123,
171 - appId, (short) (intent.id().fingerprint() & 0xffff), 0, true); 172 + appId, new DefaultGroupId((short) (intent.id().fingerprint() & 0xffff)), 0, true);
172 173
173 return new FlowRuleBatchEntry(operation, rule); 174 return new FlowRuleBatchEntry(operation, rule);
174 } 175 }
......
...@@ -25,6 +25,7 @@ import org.apache.felix.scr.annotations.Reference; ...@@ -25,6 +25,7 @@ import org.apache.felix.scr.annotations.Reference;
25 import org.apache.felix.scr.annotations.ReferenceCardinality; 25 import org.apache.felix.scr.annotations.ReferenceCardinality;
26 import org.onosproject.core.ApplicationId; 26 import org.onosproject.core.ApplicationId;
27 import org.onosproject.core.CoreService; 27 import org.onosproject.core.CoreService;
28 +import org.onosproject.core.DefaultGroupId;
28 import org.onosproject.net.ConnectPoint; 29 import org.onosproject.net.ConnectPoint;
29 import org.onosproject.net.Link; 30 import org.onosproject.net.Link;
30 import org.onosproject.net.flow.DefaultFlowRule; 31 import org.onosproject.net.flow.DefaultFlowRule;
...@@ -100,7 +101,7 @@ public class PathIntentInstaller implements IntentInstaller<PathIntent> { ...@@ -100,7 +101,7 @@ public class PathIntentInstaller implements IntentInstaller<PathIntent> {
100 101
101 FlowRule rule = new DefaultFlowRule(link.src().deviceId(), 102 FlowRule rule = new DefaultFlowRule(link.src().deviceId(),
102 builder.build(), treatment, 123, //FIXME 123 103 builder.build(), treatment, 123, //FIXME 123
103 - appId, (short) (intent.id().fingerprint() & 0xffff), 0, true); 104 + appId, new DefaultGroupId((short) (intent.id().fingerprint() & 0xffff)), 0, true);
104 rules.add(new FlowRuleBatchEntry(FlowRuleOperation.ADD, rule, 105 rules.add(new FlowRuleBatchEntry(FlowRuleOperation.ADD, rule,
105 intent.id().fingerprint())); 106 intent.id().fingerprint()));
106 prev = link.dst(); 107 prev = link.dst();
...@@ -128,7 +129,7 @@ public class PathIntentInstaller implements IntentInstaller<PathIntent> { ...@@ -128,7 +129,7 @@ public class PathIntentInstaller implements IntentInstaller<PathIntent> {
128 .setOutput(link.src().port()).build(); 129 .setOutput(link.src().port()).build();
129 FlowRule rule = new DefaultFlowRule(link.src().deviceId(), 130 FlowRule rule = new DefaultFlowRule(link.src().deviceId(),
130 builder.build(), treatment, 131 builder.build(), treatment,
131 - 123, appId, (short) (intent.id().fingerprint() & 0xffff), 0, true); 132 + 123, appId, new DefaultGroupId((short) (intent.id().fingerprint() & 0xffff)), 0, true);
132 rules.add(new FlowRuleBatchEntry(FlowRuleOperation.REMOVE, rule, 133 rules.add(new FlowRuleBatchEntry(FlowRuleOperation.REMOVE, rule,
133 intent.id().fingerprint())); 134 intent.id().fingerprint()));
134 prev = link.dst(); 135 prev = link.dst();
......