홍길동 / 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 {
this(deviceId, selector, treatment, priority, appId, new DefaultGroupId(0), timeout, permanent);
}
@Deprecated
public DefaultFlowRule(DeviceId deviceId, TrafficSelector selector,
TrafficTreatment treatment, int priority, ApplicationId appId,
short groupId, int timeout, boolean permanent) {
this(deviceId, selector, treatment, priority, appId, new DefaultGroupId(groupId), timeout, permanent);
}
public DefaultFlowRule(DeviceId deviceId, TrafficSelector selector,
TrafficTreatment treatment, int priority, ApplicationId appId,
GroupId groupId, int timeout, boolean permanent) {
......
......@@ -29,6 +29,7 @@ import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
import org.onosproject.core.DefaultGroupId;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId;
import org.onosproject.net.Link;
......@@ -168,7 +169,7 @@ public class LinkCollectionIntentInstaller
FlowRule rule = new DefaultFlowRule(deviceId,
selector, treatment, 123,
appId, (short) (intent.id().fingerprint() & 0xffff), 0, true);
appId, new DefaultGroupId((short) (intent.id().fingerprint() & 0xffff)), 0, true);
return new FlowRuleBatchEntry(operation, rule);
}
......
......@@ -25,6 +25,7 @@ import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
import org.onosproject.core.DefaultGroupId;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.Link;
import org.onosproject.net.flow.DefaultFlowRule;
......@@ -100,7 +101,7 @@ public class PathIntentInstaller implements IntentInstaller<PathIntent> {
FlowRule rule = new DefaultFlowRule(link.src().deviceId(),
builder.build(), treatment, 123, //FIXME 123
appId, (short) (intent.id().fingerprint() & 0xffff), 0, true);
appId, new DefaultGroupId((short) (intent.id().fingerprint() & 0xffff)), 0, true);
rules.add(new FlowRuleBatchEntry(FlowRuleOperation.ADD, rule,
intent.id().fingerprint()));
prev = link.dst();
......@@ -128,7 +129,7 @@ public class PathIntentInstaller implements IntentInstaller<PathIntent> {
.setOutput(link.src().port()).build();
FlowRule rule = new DefaultFlowRule(link.src().deviceId(),
builder.build(), treatment,
123, appId, (short) (intent.id().fingerprint() & 0xffff), 0, true);
123, appId, new DefaultGroupId((short) (intent.id().fingerprint() & 0xffff)), 0, true);
rules.add(new FlowRuleBatchEntry(FlowRuleOperation.REMOVE, rule,
intent.id().fingerprint()));
prev = link.dst();
......