mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-18 19:01:06 +02:00
Code Issues Projects Releases Wiki Activity

[ONOS-3485] Create arp_op selector and add operation to provifer of

Browse Source 
openflow to onos

Change-Id: I4dd0a9d7eb66092d7633e288a1fc94ad66eb4810
This commit is contained in:
BitOhenry 2015-11-30 12:41:18 +08:00 committed by Gerrit Code Review
parent 15653fde24
commit b40129ae7c
4 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficSelector.java
View File

@ -373,6 +373,11 @@ public final class DefaultTrafficSelector implements TrafficSelector {
return add(Criteria.matchArpSha(addr)); return add(Criteria.matchArpSha(addr));
} }
@Override
public Builder matchArpOp(int arpOp) {
return add(Criteria.matchArpOp(arpOp));
}
@Override @Override
public TrafficSelector build() { public TrafficSelector build() {
return new DefaultTrafficSelector(ImmutableSet.copyOf(selector.values())); return new DefaultTrafficSelector(ImmutableSet.copyOf(selector.values()));

8
core/api/src/main/java/org/onosproject/net/flow/TrafficSelector.java
View File

@ -418,6 +418,14 @@ public interface TrafficSelector {
*/ */
Builder matchArpSha(MacAddress addr); Builder matchArpSha(MacAddress addr);
/**
* Matches a arp operation type.
*
* @param arpOp a arp operation type
* @return a selection builder
*/
Builder matchArpOp(int arpOp);
/** /**
* Builds an immutable traffic selector. * Builds an immutable traffic selector.
* *

5
providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java
View File

@ -708,6 +708,10 @@ public class FlowEntryBuilder {
long tunnelId = match.get(MatchField.TUNNEL_ID).getValue(); long tunnelId = match.get(MatchField.TUNNEL_ID).getValue();
builder.matchTunnelId(tunnelId); builder.matchTunnelId(tunnelId);
break; break;
case ARP_OP:
int arpOp = match.get(MatchField.ARP_OP).getOpcode();
builder.matchArpOp(arpOp);
break;
case ARP_SHA: case ARP_SHA:
mac = MacAddress.valueOf(match.get(MatchField.ARP_SHA).getLong()); mac = MacAddress.valueOf(match.get(MatchField.ARP_SHA).getLong());
builder.matchArpSha(mac); builder.matchArpSha(mac);
@ -724,7 +728,6 @@ public class FlowEntryBuilder {
ip = Ip4Address.valueOf(match.get(MatchField.ARP_TPA).getInt()); ip = Ip4Address.valueOf(match.get(MatchField.ARP_TPA).getInt());
builder.matchArpTpa(ip); builder.matchArpTpa(ip);
break; break;
case ARP_OP:
case MPLS_TC: case MPLS_TC:
default: default:
log.warn("Match type {} not yet implemented.", field.id); log.warn("Match type {} not yet implemented.", field.id);

8
providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilder.java
View File

@ -25,6 +25,7 @@ import org.onosproject.net.driver.DriverService;
import org.onosproject.net.flow.FlowRule; import org.onosproject.net.flow.FlowRule;
import org.onosproject.net.flow.TrafficSelector; import org.onosproject.net.flow.TrafficSelector;
import org.onosproject.net.flow.criteria.ArpHaCriterion; import org.onosproject.net.flow.criteria.ArpHaCriterion;
import org.onosproject.net.flow.criteria.ArpOpCriterion;
import org.onosproject.net.flow.criteria.ArpPaCriterion; import org.onosproject.net.flow.criteria.ArpPaCriterion;
import org.onosproject.net.flow.criteria.Criterion; import org.onosproject.net.flow.criteria.Criterion;
import org.onosproject.net.flow.criteria.EthCriterion; import org.onosproject.net.flow.criteria.EthCriterion;
@ -59,6 +60,7 @@ import org.projectfloodlight.openflow.protocol.OFFlowDelete;
import org.projectfloodlight.openflow.protocol.OFFlowMod; import org.projectfloodlight.openflow.protocol.OFFlowMod;
import org.projectfloodlight.openflow.protocol.match.Match; import org.projectfloodlight.openflow.protocol.match.Match;
import org.projectfloodlight.openflow.protocol.match.MatchField; import org.projectfloodlight.openflow.protocol.match.MatchField;
import org.projectfloodlight.openflow.types.ArpOpcode;
import org.projectfloodlight.openflow.types.CircuitSignalID; import org.projectfloodlight.openflow.types.CircuitSignalID;
import org.projectfloodlight.openflow.types.EthType; import org.projectfloodlight.openflow.types.EthType;
import org.projectfloodlight.openflow.types.ICMPv4Code; import org.projectfloodlight.openflow.types.ICMPv4Code;
@ -419,6 +421,11 @@ public abstract class FlowModBuilder {
mplsBos.mplsBos() ? OFBooleanValue.TRUE mplsBos.mplsBos() ? OFBooleanValue.TRUE
: OFBooleanValue.FALSE); : OFBooleanValue.FALSE);
break; break;
case ARP_OP:
ArpOpCriterion arpOp = (ArpOpCriterion) c;
mBuilder.setExact(MatchField.ARP_OP,
ArpOpcode.of(arpOp.arpOp()));
break;
case ARP_SHA: case ARP_SHA:
arpHaCriterion = (ArpHaCriterion) c; arpHaCriterion = (ArpHaCriterion) c;
mBuilder.setExact(MatchField.ARP_SHA, mBuilder.setExact(MatchField.ARP_SHA,
@ -439,7 +446,6 @@ public abstract class FlowModBuilder {
mBuilder.setExact(MatchField.ARP_TPA, mBuilder.setExact(MatchField.ARP_TPA,
IPv4Address.of(arpPaCriterion.ip().toInt())); IPv4Address.of(arpPaCriterion.ip().toInt()));
break; break;
case ARP_OP:
case MPLS_TC: case MPLS_TC:
case PBB_ISID: case PBB_ISID:
default: default: