Changes required to adopt new loxi APIs into legacy OFMatch:
1. Added value getters to new value types
2. Changed Match, MatchBuilder interfaces according to new desing
diff --git a/java_gen/pre-written/src/main/java/org/openflow/types/ArpOpcode.java b/java_gen/pre-written/src/main/java/org/openflow/types/ArpOpcode.java
index 852aa20..6ebf447 100644
--- a/java_gen/pre-written/src/main/java/org/openflow/types/ArpOpcode.java
+++ b/java_gen/pre-written/src/main/java/org/openflow/types/ArpOpcode.java
@@ -2,7 +2,7 @@
import org.jboss.netty.buffer.ChannelBuffer;
-public class ArpOpcode implements OFValueType {
+public class ArpOpcode implements OFValueType<ArpOpcode> {
final static int LENGTH = 2;
@@ -142,4 +142,14 @@
public static ArpOpcode read2Bytes(ChannelBuffer c) {
return ArpOpcode.of(c.readUnsignedShort());
}
+
+ @Override
+ public ArpOpcode applyMask(ArpOpcode mask) {
+ return ArpOpcode.of(this.opcode & mask.opcode);
+ }
+
+ public int getOpCode() {
+ return opcode;
+ }
+
}
\ No newline at end of file
diff --git a/java_gen/pre-written/src/main/java/org/openflow/types/EthType.java b/java_gen/pre-written/src/main/java/org/openflow/types/EthType.java
index f0f0a2c..ea16e67 100644
--- a/java_gen/pre-written/src/main/java/org/openflow/types/EthType.java
+++ b/java_gen/pre-written/src/main/java/org/openflow/types/EthType.java
@@ -8,7 +8,7 @@
*
* @author Yotam Harchol (yotam.harchol@bigswitch.com)
*/
-public class EthType implements OFValueType {
+public class EthType implements OFValueType<EthType> {
static final int LENGTH = 2;
private final int rawValue;
@@ -235,4 +235,14 @@
return EthType.of(c.readUnsignedShort());
}
+ @Override
+ public EthType applyMask(EthType mask) {
+ return EthType.of(this.rawValue & mask.rawValue);
+ }
+
+ public int getValue() {
+ return rawValue;
+ }
+
+
}
diff --git a/java_gen/pre-written/src/main/java/org/openflow/types/ICMPv4Code.java b/java_gen/pre-written/src/main/java/org/openflow/types/ICMPv4Code.java
index 147b5f7..42cc5be 100644
--- a/java_gen/pre-written/src/main/java/org/openflow/types/ICMPv4Code.java
+++ b/java_gen/pre-written/src/main/java/org/openflow/types/ICMPv4Code.java
@@ -7,7 +7,7 @@
* @author Yotam Harchol (yotam.harchol@bigswitch.com)
*
*/
-public class ICMPv4Code implements OFValueType {
+public class ICMPv4Code implements OFValueType<ICMPv4Code> {
final static int LENGTH = 1;
final static short MAX_CODE = 0xFF;
@@ -41,4 +41,10 @@
return ICMPv4Code.of(c.readUnsignedByte());
}
+ @Override
+ public ICMPv4Code applyMask(ICMPv4Code mask) {
+ return ICMPv4Code.of((short)(this.code & mask.code));
+ }
+
+
}
diff --git a/java_gen/pre-written/src/main/java/org/openflow/types/ICMPv4Type.java b/java_gen/pre-written/src/main/java/org/openflow/types/ICMPv4Type.java
index 01d6e8f..b1bbdc0 100644
--- a/java_gen/pre-written/src/main/java/org/openflow/types/ICMPv4Type.java
+++ b/java_gen/pre-written/src/main/java/org/openflow/types/ICMPv4Type.java
@@ -2,7 +2,7 @@
import org.jboss.netty.buffer.ChannelBuffer;
-public class ICMPv4Type implements OFValueType {
+public class ICMPv4Type implements OFValueType<ICMPv4Type> {
final static int LENGTH = 1;
@@ -155,4 +155,10 @@
return ICMPv4Type.of(c.readUnsignedByte());
}
+ @Override
+ public ICMPv4Type applyMask(ICMPv4Type mask) {
+ return ICMPv4Type.of((short)(this.type & mask.type));
+ }
+
+
}
diff --git a/java_gen/pre-written/src/main/java/org/openflow/types/IPv4.java b/java_gen/pre-written/src/main/java/org/openflow/types/IPv4.java
index 78b8dd2..f89f683 100644
--- a/java_gen/pre-written/src/main/java/org/openflow/types/IPv4.java
+++ b/java_gen/pre-written/src/main/java/org/openflow/types/IPv4.java
@@ -9,7 +9,7 @@
*
* @author Andreas Wundsam <andreas.wundsam@bigswitch.com>
*/
-public class IPv4 implements OFValueType {
+public class IPv4 implements OFValueType<IPv4> {
static final int LENGTH = 4;
private final int rawValue;
@@ -122,5 +122,11 @@
public static IPv4 read4Bytes(ChannelBuffer c) {
return IPv4.of(c.readInt());
}
+
+ @Override
+ public IPv4 applyMask(IPv4 mask) {
+ return IPv4.of(this.rawValue & mask.rawValue);
+ }
+
}
diff --git a/java_gen/pre-written/src/main/java/org/openflow/types/IPv4WithMask.java b/java_gen/pre-written/src/main/java/org/openflow/types/IPv4WithMask.java
index afb89ed..c24c4fd 100644
--- a/java_gen/pre-written/src/main/java/org/openflow/types/IPv4WithMask.java
+++ b/java_gen/pre-written/src/main/java/org/openflow/types/IPv4WithMask.java
@@ -36,7 +36,7 @@
return res.toString();
}
- public static OFValueType ofPossiblyMasked(final String string) {
+ public static OFValueType<?> ofPossiblyMasked(final String string) {
int slashPos;
String ip = string;
int maskBits = 0;
diff --git a/java_gen/pre-written/src/main/java/org/openflow/types/IPv6.java b/java_gen/pre-written/src/main/java/org/openflow/types/IPv6.java
index e3166fd..200a33d 100644
--- a/java_gen/pre-written/src/main/java/org/openflow/types/IPv6.java
+++ b/java_gen/pre-written/src/main/java/org/openflow/types/IPv6.java
@@ -11,7 +11,7 @@
*
* @author Andreas Wundsam <andreas.wundsam@teleteach.de>
*/
-public class IPv6 implements OFValueType {
+public class IPv6 implements OFValueType<IPv6> {
static final int LENGTH = 16;
private final long raw1;
private final long raw2;
@@ -278,4 +278,9 @@
public static IPv6 read16Bytes(ChannelBuffer c) throws OFParseError {
return IPv6.of(c.readLong(), c.readLong());
}
+
+ @Override
+ public IPv6 applyMask(IPv6 mask) {
+ return IPv6.of(this.raw1 & mask.raw1, this.raw2 & mask.raw2);
+ }
}
diff --git a/java_gen/pre-written/src/main/java/org/openflow/types/IPv6FlowLabel.java b/java_gen/pre-written/src/main/java/org/openflow/types/IPv6FlowLabel.java
index 6d9bfb5..d49e4e2 100644
--- a/java_gen/pre-written/src/main/java/org/openflow/types/IPv6FlowLabel.java
+++ b/java_gen/pre-written/src/main/java/org/openflow/types/IPv6FlowLabel.java
@@ -3,7 +3,7 @@
import org.jboss.netty.buffer.ChannelBuffer;
import org.openflow.exceptions.OFParseError;
-public class IPv6FlowLabel implements OFValueType {
+public class IPv6FlowLabel implements OFValueType<IPv6FlowLabel> {
static final int LENGTH = 4;
@@ -53,4 +53,12 @@
return IPv6FlowLabel.of((int)(c.readUnsignedInt() & 0xFFFFFFFF));
}
+ @Override
+ public IPv6FlowLabel applyMask(IPv6FlowLabel mask) {
+ return IPv6FlowLabel.of(this.label & mask.label);
+ }
+
+ public int getIPv6FlowLabelValue() {
+ return label;
+ }
}
diff --git a/java_gen/pre-written/src/main/java/org/openflow/types/IPv6WithMask.java b/java_gen/pre-written/src/main/java/org/openflow/types/IPv6WithMask.java
index f809d67..72319e3 100644
--- a/java_gen/pre-written/src/main/java/org/openflow/types/IPv6WithMask.java
+++ b/java_gen/pre-written/src/main/java/org/openflow/types/IPv6WithMask.java
@@ -31,7 +31,7 @@
return res.toString();
}
- public static OFValueType ofPossiblyMasked(final String string) {
+ public static OFValueType<?> ofPossiblyMasked(final String string) {
int slashPos;
String ip = string;
int maskBits = 0;
diff --git a/java_gen/pre-written/src/main/java/org/openflow/types/IpDscp.java b/java_gen/pre-written/src/main/java/org/openflow/types/IpDscp.java
index 033e574..44e6296 100644
--- a/java_gen/pre-written/src/main/java/org/openflow/types/IpDscp.java
+++ b/java_gen/pre-written/src/main/java/org/openflow/types/IpDscp.java
@@ -3,7 +3,7 @@
import org.jboss.netty.buffer.ChannelBuffer;
import org.openflow.exceptions.OFParseError;
-public enum IpDscp implements OFValueType {
+public enum IpDscp implements OFValueType<IpDscp> {
DSCP_0((byte)0),
DSCP_1((byte)1),
DSCP_2((byte)2),
@@ -230,4 +230,12 @@
return IpDscp.of((byte)(c.readUnsignedByte()));
}
+ @Override
+ public IpDscp applyMask(IpDscp mask) {
+ return IpDscp.of((byte)(this.dscp & mask.dscp));
+ }
+
+ public byte getDscpValue() {
+ return dscp;
+ }
}
diff --git a/java_gen/pre-written/src/main/java/org/openflow/types/IpEcn.java b/java_gen/pre-written/src/main/java/org/openflow/types/IpEcn.java
index b261d41..90600df 100644
--- a/java_gen/pre-written/src/main/java/org/openflow/types/IpEcn.java
+++ b/java_gen/pre-written/src/main/java/org/openflow/types/IpEcn.java
@@ -3,7 +3,7 @@
import org.jboss.netty.buffer.ChannelBuffer;
import org.openflow.exceptions.OFParseError;
-public enum IpEcn implements OFValueType {
+public enum IpEcn implements OFValueType<IpEcn> {
ECN_00((byte)0),
ECN_01((byte)1),
ECN_10((byte)2),
@@ -50,4 +50,12 @@
return IpEcn.of((byte)(c.readUnsignedByte()));
}
+ @Override
+ public IpEcn applyMask(IpEcn mask) {
+ return IpEcn.of((byte)(this.ecn & mask.ecn));
+ }
+
+ public byte getEcnValue() {
+ return ecn;
+ }
}
diff --git a/java_gen/pre-written/src/main/java/org/openflow/types/IpProtocol.java b/java_gen/pre-written/src/main/java/org/openflow/types/IpProtocol.java
index 436db1d..f40eded 100644
--- a/java_gen/pre-written/src/main/java/org/openflow/types/IpProtocol.java
+++ b/java_gen/pre-written/src/main/java/org/openflow/types/IpProtocol.java
@@ -7,7 +7,7 @@
*
* @author Yotam Harchol (yotam.harchol@bigswitch.com)
*/
-public class IpProtocol implements OFValueType {
+public class IpProtocol implements OFValueType<IpProtocol> {
static final short MAX_PROTO = 0xFF;
static final int LENGTH = 1;
@@ -632,4 +632,14 @@
public static IpProtocol readByte(ChannelBuffer c) {
return IpProtocol.of(c.readUnsignedByte());
}
+
+ @Override
+ public IpProtocol applyMask(IpProtocol mask) {
+ return IpProtocol.of((short)(this.proto & mask.proto));
+ }
+
+ public short getIpProtocolNumber() {
+ return proto;
+ }
+
}
diff --git a/java_gen/pre-written/src/main/java/org/openflow/types/MacAddress.java b/java_gen/pre-written/src/main/java/org/openflow/types/MacAddress.java
index a18dff3..cb8ce84 100644
--- a/java_gen/pre-written/src/main/java/org/openflow/types/MacAddress.java
+++ b/java_gen/pre-written/src/main/java/org/openflow/types/MacAddress.java
@@ -10,7 +10,7 @@
* @author Andreas Wundsam <andreas.wundsam@bigswitch.com>
*/
-public class MacAddress implements OFValueType {
+public class MacAddress implements OFValueType<MacAddress> {
static final int MacAddrLen = 6;
private final long rawValue;
@@ -116,6 +116,11 @@
long raw = c.readUnsignedInt() << 16 | c.readUnsignedShort();
return MacAddress.of(raw);
}
+
+ @Override
+ public MacAddress applyMask(MacAddress mask) {
+ return MacAddress.of(this.rawValue & mask.rawValue);
+ }
diff --git a/java_gen/pre-written/src/main/java/org/openflow/types/Masked.java b/java_gen/pre-written/src/main/java/org/openflow/types/Masked.java
index 011bae8..043c00a 100644
--- a/java_gen/pre-written/src/main/java/org/openflow/types/Masked.java
+++ b/java_gen/pre-written/src/main/java/org/openflow/types/Masked.java
@@ -2,12 +2,12 @@
-public class Masked<T extends OFValueType> implements OFValueType {
+public class Masked<T extends OFValueType<T>> implements OFValueType<Masked<T>> {
protected T value;
protected T mask;
protected Masked(T value, T mask) {
- this.value = value;
+ this.value = value.applyMask(mask);
this.mask = mask;
}
@@ -48,5 +48,10 @@
sb.append(value.toString()).append('/').append(mask.toString());
return sb.toString();
}
+
+ @Override
+ public Masked<T> applyMask(Masked<T> mask) {
+ return this;
+ }
}
diff --git a/java_gen/pre-written/src/main/java/org/openflow/types/OFPhysicalPort.java b/java_gen/pre-written/src/main/java/org/openflow/types/OFPhysicalPort.java
index d8f71a3..7755a4a 100644
--- a/java_gen/pre-written/src/main/java/org/openflow/types/OFPhysicalPort.java
+++ b/java_gen/pre-written/src/main/java/org/openflow/types/OFPhysicalPort.java
@@ -10,7 +10,7 @@
* @author capveg
*/
-public class OFPhysicalPort implements OFValueType {
+public class OFPhysicalPort implements OFValueType<OFPhysicalPort> {
static final int LENGTH = 4;
@@ -60,4 +60,12 @@
return OFPhysicalPort.of((int)(c.readUnsignedInt() & 0xFFFFFFFF));
}
+ @Override
+ public OFPhysicalPort applyMask(OFPhysicalPort mask) {
+ return OFPhysicalPort.of(this.port & mask.port);
+ }
+
+ public int getPortNumber() {
+ return port;
+ }
}
diff --git a/java_gen/pre-written/src/main/java/org/openflow/types/OFPort.java b/java_gen/pre-written/src/main/java/org/openflow/types/OFPort.java
index 3272660..9dc197f 100644
--- a/java_gen/pre-written/src/main/java/org/openflow/types/OFPort.java
+++ b/java_gen/pre-written/src/main/java/org/openflow/types/OFPort.java
@@ -15,7 +15,7 @@
* @author Andreas Wundsam <andreas.wundsam@bigswitch.com>
*/
@Immutable
-public class OFPort implements OFValueType {
+public class OFPort implements OFValueType<OFPort> {
static final int LENGTH = 4;
// private int constants (OF1.1+) to avoid duplication in the code
@@ -530,4 +530,9 @@
public static OFPort read4Bytes(ChannelBuffer c) throws OFParseError {
return OFPort.of((int)(c.readUnsignedInt() & 0xFFFFFFFF));
}
+
+ @Override
+ public OFPort applyMask(OFPort mask) {
+ return OFPort.of(this.portNumber & mask.portNumber);
+ }
}
diff --git a/java_gen/pre-written/src/main/java/org/openflow/types/OFValueType.java b/java_gen/pre-written/src/main/java/org/openflow/types/OFValueType.java
index 51c8b36..8e2f9ed 100644
--- a/java_gen/pre-written/src/main/java/org/openflow/types/OFValueType.java
+++ b/java_gen/pre-written/src/main/java/org/openflow/types/OFValueType.java
@@ -3,8 +3,10 @@
-public interface OFValueType {
+public interface OFValueType<T extends OFValueType<T>> {
public int getLength();
+
+ public T applyMask(T mask);
}
diff --git a/java_gen/pre-written/src/main/java/org/openflow/types/TransportPort.java b/java_gen/pre-written/src/main/java/org/openflow/types/TransportPort.java
index cecb349..82dab41 100644
--- a/java_gen/pre-written/src/main/java/org/openflow/types/TransportPort.java
+++ b/java_gen/pre-written/src/main/java/org/openflow/types/TransportPort.java
@@ -8,7 +8,7 @@
*
* @author Yotam Harchol (yotam.harchol@bigswitch.com)
*/
-public class TransportPort implements OFValueType {
+public class TransportPort implements OFValueType<TransportPort> {
static final int LENGTH = 2;
static final int MAX_PORT = 0xFFFF;
@@ -31,6 +31,10 @@
public int getLength() {
return LENGTH;
}
+
+ public int getPort() {
+ return port;
+ }
@Override
public boolean equals(Object obj) {
@@ -63,4 +67,9 @@
return TransportPort.of((c.readUnsignedShort() & 0x0FFFF));
}
+ @Override
+ public TransportPort applyMask(TransportPort mask) {
+ return TransportPort.of(this.port & mask.port);
+ }
+
}
diff --git a/java_gen/pre-written/src/main/java/org/openflow/types/VlanPcp.java b/java_gen/pre-written/src/main/java/org/openflow/types/VlanPcp.java
index 2f406c8..531f878 100644
--- a/java_gen/pre-written/src/main/java/org/openflow/types/VlanPcp.java
+++ b/java_gen/pre-written/src/main/java/org/openflow/types/VlanPcp.java
@@ -3,7 +3,7 @@
import org.jboss.netty.buffer.ChannelBuffer;
import org.openflow.exceptions.OFParseError;
-public class VlanPcp implements OFValueType {
+public class VlanPcp implements OFValueType<VlanPcp> {
private static final byte VALIDATION_MASK = 0x07;
static final int LENGTH = 1;
@@ -57,5 +57,10 @@
public static VlanPcp readByte(ChannelBuffer c) throws OFParseError {
return VlanPcp.of((byte)(c.readUnsignedByte() & 0xFF));
}
+
+ @Override
+ public VlanPcp applyMask(VlanPcp mask) {
+ return VlanPcp.of((byte)(this.pcp & mask.pcp));
+ }
}
diff --git a/java_gen/pre-written/src/main/java/org/openflow/types/VlanVid.java b/java_gen/pre-written/src/main/java/org/openflow/types/VlanVid.java
index a2b38b2..ca2c3c2 100644
--- a/java_gen/pre-written/src/main/java/org/openflow/types/VlanVid.java
+++ b/java_gen/pre-written/src/main/java/org/openflow/types/VlanVid.java
@@ -3,7 +3,7 @@
import org.jboss.netty.buffer.ChannelBuffer;
import org.openflow.exceptions.OFParseError;
-public class VlanVid implements OFValueType {
+public class VlanVid implements OFValueType<VlanVid> {
private static final short VALIDATION_MASK = 0x0FFF;
final static int LENGTH = 2;
@@ -73,5 +73,10 @@
public VlanVid read2Bytes(ChannelBuffer c) throws OFParseError {
return VlanVid.of(c.readShort());
}
+
+ @Override
+ public VlanVid applyMask(VlanVid mask) {
+ return VlanVid.of((short)(this.vid & mask.vid));
+ }
}