java_gen: add OFBooleanValue type
Also change the bsn_global_vrf_allowed OXM to use it.
diff --git a/java_gen/java_model.py b/java_gen/java_model.py
index f07d206..85a6c0d 100644
--- a/java_gen/java_model.py
+++ b/java_gen/java_model.py
@@ -145,8 +145,8 @@
"OFOxmBsnLagIdMasked": OxmMapEntry("LagId", "BSN_LAG_ID", True),
"OFOxmBsnVrf": OxmMapEntry("VRF", "BSN_VRF", False),
"OFOxmBsnVrfMasked": OxmMapEntry("VRF", "BSN_VRF", True),
- "OFOxmBsnGlobalVrfAllowed": OxmMapEntry("U8", "BSN_GLOBAL_VRF_ALLOWED", False),
- "OFOxmBsnGlobalVrfAllowedMasked": OxmMapEntry("U8", "BSN_GLOBAL_VRF_ALLOWED", True),
+ "OFOxmBsnGlobalVrfAllowed": OxmMapEntry("OFBooleanValue", "BSN_GLOBAL_VRF_ALLOWED", False),
+ "OFOxmBsnGlobalVrfAllowedMasked": OxmMapEntry("OFBooleanValue", "BSN_GLOBAL_VRF_ALLOWED", True),
"OFOxmBsnL3InterfaceClassId": OxmMapEntry("ClassId", "BSN_L3_INTERFACE_CLASS_ID", False),
"OFOxmBsnL3InterfaceClassIdMasked": OxmMapEntry("ClassId", "BSN_L3_INTERFACE_CLASS_ID", True),
"OFOxmBsnL3SrcClassId": OxmMapEntry("ClassId", "BSN_L3_SRC_CLASS_ID", False),
diff --git a/java_gen/java_type.py b/java_gen/java_type.py
index 65f1cf2..2772a86 100644
--- a/java_gen/java_type.py
+++ b/java_gen/java_type.py
@@ -468,6 +468,8 @@
.op(version=ANY, read="VRF.read4Bytes(bb)", write="$name.write4Bytes(bb)", default="VRF.ZERO")
class_id = JType("ClassId") \
.op(version=ANY, read="ClassId.read4Bytes(bb)", write="$name.write4Bytes(bb)", default="ClassId.NONE")
+boolean_value = JType('OFBooleanValue', 'OFBooleanValue') \
+ .op(read='OFBooleanValue.of(bb.readByte() != 0)', write='bb.writeByte($name.getInt())', default="OFBooleanValue.FALSE")
generic_t = JType("T")
@@ -564,8 +566,8 @@
'of_oxm_bsn_vrf' : { 'value' : vrf },
'of_oxm_bsn_vrf_masked' : { 'value' : vrf, 'value_mask' : vrf },
- 'of_oxm_bsn_global_vrf_allowed' : { 'value' : u8obj },
- 'of_oxm_bsn_global_vrf_allowed_masked' : { 'value' : u8obj, 'value_mask' : u8obj },
+ 'of_oxm_bsn_global_vrf_allowed' : { 'value' : boolean_value },
+ 'of_oxm_bsn_global_vrf_allowed_masked' : { 'value' : boolean_value, 'value_mask' : boolean_value },
'of_oxm_bsn_l3_interface_class_id' : { 'value' : class_id },
'of_oxm_bsn_l3_interface_class_id_masked' : { 'value' : class_id, 'value_mask' : class_id },
diff --git a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchField.java b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchField.java
index ecced06..1831626 100644
--- a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchField.java
+++ b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchField.java
@@ -14,6 +14,7 @@
import org.projectfloodlight.openflow.types.LagId;
import org.projectfloodlight.openflow.types.MacAddress;
import org.projectfloodlight.openflow.types.OFBitMask128;
+import org.projectfloodlight.openflow.types.OFBooleanValue;
import org.projectfloodlight.openflow.types.OFMetadata;
import org.projectfloodlight.openflow.types.OFPort;
import org.projectfloodlight.openflow.types.OFValueType;
@@ -183,8 +184,8 @@
public final static MatchField<VRF> BSN_VRF =
new MatchField<VRF>("bsn_vrf", MatchFields.BSN_VRF);
- public final static MatchField<U8> BSN_GLOBAL_VRF_ALLOWED =
- new MatchField<U8>("bsn_global_vrf_allowed", MatchFields.BSN_GLOBAL_VRF_ALLOWED);
+ public final static MatchField<OFBooleanValue> BSN_GLOBAL_VRF_ALLOWED =
+ new MatchField<OFBooleanValue>("bsn_global_vrf_allowed", MatchFields.BSN_GLOBAL_VRF_ALLOWED);
public final static MatchField<ClassId> BSN_L3_INTERFACE_CLASS_ID =
new MatchField<ClassId>("bsn_l3_interface_class_id", MatchFields.BSN_L3_INTERFACE_CLASS_ID);
diff --git a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/OFBooleanValue.java b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/OFBooleanValue.java
new file mode 100644
index 0000000..b386e54
--- /dev/null
+++ b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/OFBooleanValue.java
@@ -0,0 +1,107 @@
+/**
+ * Copyright (c) 2008 The Board of Trustees of The Leland Stanford Junior
+ * University
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ **/
+
+package org.projectfloodlight.openflow.types;
+
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.projectfloodlight.openflow.exceptions.OFParseError;
+import org.projectfloodlight.openflow.protocol.OFMessageReader;
+import org.projectfloodlight.openflow.protocol.Writeable;
+
+import com.google.common.hash.PrimitiveSink;
+
+public class OFBooleanValue implements Writeable, OFValueType<OFBooleanValue> {
+ public final static OFBooleanValue TRUE = new OFBooleanValue(true);
+ public final static OFBooleanValue FALSE = new OFBooleanValue(false);
+
+ private final boolean value;
+
+ private OFBooleanValue(boolean value) {
+ this.value = value;
+ }
+
+ public static OFBooleanValue of(boolean value) {
+ return value ? TRUE : FALSE;
+ }
+
+ public boolean getValue() {
+ return value;
+ }
+
+ public int getInt() {
+ return value ? 1 : 0;
+ }
+
+ @Override
+ public String toString() {
+ return "" + value;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + getInt();
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ OFBooleanValue other = (OFBooleanValue) obj;
+ if (value != other.value)
+ return false;
+ return true;
+ }
+
+ @Override
+ public void writeTo(ChannelBuffer bb) {
+ bb.writeByte(getInt());
+ }
+
+ private static class Reader implements OFMessageReader<OFBooleanValue> {
+ @Override
+ public OFBooleanValue readFrom(ChannelBuffer bb) throws OFParseError {
+ return of(bb.readByte() != 0);
+ }
+ }
+
+ @Override
+ public int getLength() {
+ return 1;
+ }
+
+ @Override
+ public OFBooleanValue applyMask(OFBooleanValue mask) {
+ return of(value && mask.value);
+ }
+
+ @Override
+ public int compareTo(OFBooleanValue o) {
+ return getInt() - o.getInt();
+ }
+
+ @Override
+ public void putTo(PrimitiveSink sink) {
+ sink.putByte((byte)getInt());
+ }
+}