Added cubby-holes for new projects.
diff --git a/of-save/lib/gen-src/main/java/org/projectfloodlight/openflow/protocol/ver11/OFFlowStatsRequestVer11.java b/of-save/lib/gen-src/main/java/org/projectfloodlight/openflow/protocol/ver11/OFFlowStatsRequestVer11.java
new file mode 100644
index 0000000..4653e50
--- /dev/null
+++ b/of-save/lib/gen-src/main/java/org/projectfloodlight/openflow/protocol/ver11/OFFlowStatsRequestVer11.java
@@ -0,0 +1,685 @@
+// Copyright (c) 2008 The Board of Trustees of The Leland Stanford Junior University
+// Copyright (c) 2011, 2012 Open Networking Foundation
+// Copyright (c) 2012, 2013 Big Switch Networks, Inc.
+// This library was generated by the LoxiGen Compiler.
+// See the file LICENSE.txt which should have been included in the source distribution
+
+// Automatically generated by LOXI from template of_class.java
+// Do not modify
+
+package org.projectfloodlight.openflow.protocol.ver11;
+
+import org.projectfloodlight.openflow.protocol.*;
+import org.projectfloodlight.openflow.protocol.action.*;
+import org.projectfloodlight.openflow.protocol.actionid.*;
+import org.projectfloodlight.openflow.protocol.bsntlv.*;
+import org.projectfloodlight.openflow.protocol.errormsg.*;
+import org.projectfloodlight.openflow.protocol.meterband.*;
+import org.projectfloodlight.openflow.protocol.instruction.*;
+import org.projectfloodlight.openflow.protocol.instructionid.*;
+import org.projectfloodlight.openflow.protocol.match.*;
+import org.projectfloodlight.openflow.protocol.oxm.*;
+import org.projectfloodlight.openflow.protocol.queueprop.*;
+import org.projectfloodlight.openflow.types.*;
+import org.projectfloodlight.openflow.util.*;
+import org.projectfloodlight.openflow.exceptions.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import java.util.Set;
+import com.google.common.collect.ImmutableSet;
+import org.jboss.netty.buffer.ChannelBuffer;
+import com.google.common.hash.PrimitiveSink;
+import com.google.common.hash.Funnel;
+
+class OFFlowStatsRequestVer11 implements OFFlowStatsRequest {
+ private static final Logger logger = LoggerFactory.getLogger(OFFlowStatsRequestVer11.class);
+ // version: 1.1
+ final static byte WIRE_VERSION = 2;
+ final static int LENGTH = 136;
+
+ private final static long DEFAULT_XID = 0x0L;
+ private final static Set<OFStatsRequestFlags> DEFAULT_FLAGS = ImmutableSet.<OFStatsRequestFlags>of();
+ private final static TableId DEFAULT_TABLE_ID = TableId.ALL;
+ private final static OFPort DEFAULT_OUT_PORT = OFPort.ANY;
+ private final static OFGroup DEFAULT_OUT_GROUP = OFGroup.ANY;
+ private final static U64 DEFAULT_COOKIE = U64.ZERO;
+ private final static U64 DEFAULT_COOKIE_MASK = U64.ZERO;
+ private final static Match DEFAULT_MATCH = OFFactoryVer11.MATCH_WILDCARD_ALL;
+
+ // OF message fields
+ private final long xid;
+ private final Set<OFStatsRequestFlags> flags;
+ private final TableId tableId;
+ private final OFPort outPort;
+ private final OFGroup outGroup;
+ private final U64 cookie;
+ private final U64 cookieMask;
+ private final Match match;
+//
+ // Immutable default instance
+ final static OFFlowStatsRequestVer11 DEFAULT = new OFFlowStatsRequestVer11(
+ DEFAULT_XID, DEFAULT_FLAGS, DEFAULT_TABLE_ID, DEFAULT_OUT_PORT, DEFAULT_OUT_GROUP, DEFAULT_COOKIE, DEFAULT_COOKIE_MASK, DEFAULT_MATCH
+ );
+
+ // package private constructor - used by readers, builders, and factory
+ OFFlowStatsRequestVer11(long xid, Set<OFStatsRequestFlags> flags, TableId tableId, OFPort outPort, OFGroup outGroup, U64 cookie, U64 cookieMask, Match match) {
+ this.xid = xid;
+ this.flags = flags;
+ this.tableId = tableId;
+ this.outPort = outPort;
+ this.outGroup = outGroup;
+ this.cookie = cookie;
+ this.cookieMask = cookieMask;
+ this.match = match;
+ }
+
+ // Accessors for OF message fields
+ @Override
+ public OFVersion getVersion() {
+ return OFVersion.OF_11;
+ }
+
+ @Override
+ public OFType getType() {
+ return OFType.STATS_REQUEST;
+ }
+
+ @Override
+ public long getXid() {
+ return xid;
+ }
+
+ @Override
+ public OFStatsType getStatsType() {
+ return OFStatsType.FLOW;
+ }
+
+ @Override
+ public Set<OFStatsRequestFlags> getFlags() {
+ return flags;
+ }
+
+ @Override
+ public TableId getTableId() {
+ return tableId;
+ }
+
+ @Override
+ public OFPort getOutPort() {
+ return outPort;
+ }
+
+ @Override
+ public OFGroup getOutGroup() {
+ return outGroup;
+ }
+
+ @Override
+ public U64 getCookie() {
+ return cookie;
+ }
+
+ @Override
+ public U64 getCookieMask() {
+ return cookieMask;
+ }
+
+ @Override
+ public Match getMatch() {
+ return match;
+ }
+
+
+
+ public OFFlowStatsRequest.Builder createBuilder() {
+ return new BuilderWithParent(this);
+ }
+
+ static class BuilderWithParent implements OFFlowStatsRequest.Builder {
+ final OFFlowStatsRequestVer11 parentMessage;
+
+ // OF message fields
+ private boolean xidSet;
+ private long xid;
+ private boolean flagsSet;
+ private Set<OFStatsRequestFlags> flags;
+ private boolean tableIdSet;
+ private TableId tableId;
+ private boolean outPortSet;
+ private OFPort outPort;
+ private boolean outGroupSet;
+ private OFGroup outGroup;
+ private boolean cookieSet;
+ private U64 cookie;
+ private boolean cookieMaskSet;
+ private U64 cookieMask;
+ private boolean matchSet;
+ private Match match;
+
+ BuilderWithParent(OFFlowStatsRequestVer11 parentMessage) {
+ this.parentMessage = parentMessage;
+ }
+
+ @Override
+ public OFVersion getVersion() {
+ return OFVersion.OF_11;
+ }
+
+ @Override
+ public OFType getType() {
+ return OFType.STATS_REQUEST;
+ }
+
+ @Override
+ public long getXid() {
+ return xid;
+ }
+
+ @Override
+ public OFFlowStatsRequest.Builder setXid(long xid) {
+ this.xid = xid;
+ this.xidSet = true;
+ return this;
+ }
+ @Override
+ public OFStatsType getStatsType() {
+ return OFStatsType.FLOW;
+ }
+
+ @Override
+ public Set<OFStatsRequestFlags> getFlags() {
+ return flags;
+ }
+
+ @Override
+ public OFFlowStatsRequest.Builder setFlags(Set<OFStatsRequestFlags> flags) {
+ this.flags = flags;
+ this.flagsSet = true;
+ return this;
+ }
+ @Override
+ public TableId getTableId() {
+ return tableId;
+ }
+
+ @Override
+ public OFFlowStatsRequest.Builder setTableId(TableId tableId) {
+ this.tableId = tableId;
+ this.tableIdSet = true;
+ return this;
+ }
+ @Override
+ public OFPort getOutPort() {
+ return outPort;
+ }
+
+ @Override
+ public OFFlowStatsRequest.Builder setOutPort(OFPort outPort) {
+ this.outPort = outPort;
+ this.outPortSet = true;
+ return this;
+ }
+ @Override
+ public OFGroup getOutGroup() {
+ return outGroup;
+ }
+
+ @Override
+ public OFFlowStatsRequest.Builder setOutGroup(OFGroup outGroup) {
+ this.outGroup = outGroup;
+ this.outGroupSet = true;
+ return this;
+ }
+ @Override
+ public U64 getCookie() {
+ return cookie;
+ }
+
+ @Override
+ public OFFlowStatsRequest.Builder setCookie(U64 cookie) {
+ this.cookie = cookie;
+ this.cookieSet = true;
+ return this;
+ }
+ @Override
+ public U64 getCookieMask() {
+ return cookieMask;
+ }
+
+ @Override
+ public OFFlowStatsRequest.Builder setCookieMask(U64 cookieMask) {
+ this.cookieMask = cookieMask;
+ this.cookieMaskSet = true;
+ return this;
+ }
+ @Override
+ public Match getMatch() {
+ return match;
+ }
+
+ @Override
+ public OFFlowStatsRequest.Builder setMatch(Match match) {
+ this.match = match;
+ this.matchSet = true;
+ return this;
+ }
+
+
+ @Override
+ public OFFlowStatsRequest build() {
+ long xid = this.xidSet ? this.xid : parentMessage.xid;
+ Set<OFStatsRequestFlags> flags = this.flagsSet ? this.flags : parentMessage.flags;
+ if(flags == null)
+ throw new NullPointerException("Property flags must not be null");
+ TableId tableId = this.tableIdSet ? this.tableId : parentMessage.tableId;
+ if(tableId == null)
+ throw new NullPointerException("Property tableId must not be null");
+ OFPort outPort = this.outPortSet ? this.outPort : parentMessage.outPort;
+ if(outPort == null)
+ throw new NullPointerException("Property outPort must not be null");
+ OFGroup outGroup = this.outGroupSet ? this.outGroup : parentMessage.outGroup;
+ if(outGroup == null)
+ throw new NullPointerException("Property outGroup must not be null");
+ U64 cookie = this.cookieSet ? this.cookie : parentMessage.cookie;
+ if(cookie == null)
+ throw new NullPointerException("Property cookie must not be null");
+ U64 cookieMask = this.cookieMaskSet ? this.cookieMask : parentMessage.cookieMask;
+ if(cookieMask == null)
+ throw new NullPointerException("Property cookieMask must not be null");
+ Match match = this.matchSet ? this.match : parentMessage.match;
+ if(match == null)
+ throw new NullPointerException("Property match must not be null");
+
+ //
+ return new OFFlowStatsRequestVer11(
+ xid,
+ flags,
+ tableId,
+ outPort,
+ outGroup,
+ cookie,
+ cookieMask,
+ match
+ );
+ }
+
+ }
+
+ static class Builder implements OFFlowStatsRequest.Builder {
+ // OF message fields
+ private boolean xidSet;
+ private long xid;
+ private boolean flagsSet;
+ private Set<OFStatsRequestFlags> flags;
+ private boolean tableIdSet;
+ private TableId tableId;
+ private boolean outPortSet;
+ private OFPort outPort;
+ private boolean outGroupSet;
+ private OFGroup outGroup;
+ private boolean cookieSet;
+ private U64 cookie;
+ private boolean cookieMaskSet;
+ private U64 cookieMask;
+ private boolean matchSet;
+ private Match match;
+
+ @Override
+ public OFVersion getVersion() {
+ return OFVersion.OF_11;
+ }
+
+ @Override
+ public OFType getType() {
+ return OFType.STATS_REQUEST;
+ }
+
+ @Override
+ public long getXid() {
+ return xid;
+ }
+
+ @Override
+ public OFFlowStatsRequest.Builder setXid(long xid) {
+ this.xid = xid;
+ this.xidSet = true;
+ return this;
+ }
+ @Override
+ public OFStatsType getStatsType() {
+ return OFStatsType.FLOW;
+ }
+
+ @Override
+ public Set<OFStatsRequestFlags> getFlags() {
+ return flags;
+ }
+
+ @Override
+ public OFFlowStatsRequest.Builder setFlags(Set<OFStatsRequestFlags> flags) {
+ this.flags = flags;
+ this.flagsSet = true;
+ return this;
+ }
+ @Override
+ public TableId getTableId() {
+ return tableId;
+ }
+
+ @Override
+ public OFFlowStatsRequest.Builder setTableId(TableId tableId) {
+ this.tableId = tableId;
+ this.tableIdSet = true;
+ return this;
+ }
+ @Override
+ public OFPort getOutPort() {
+ return outPort;
+ }
+
+ @Override
+ public OFFlowStatsRequest.Builder setOutPort(OFPort outPort) {
+ this.outPort = outPort;
+ this.outPortSet = true;
+ return this;
+ }
+ @Override
+ public OFGroup getOutGroup() {
+ return outGroup;
+ }
+
+ @Override
+ public OFFlowStatsRequest.Builder setOutGroup(OFGroup outGroup) {
+ this.outGroup = outGroup;
+ this.outGroupSet = true;
+ return this;
+ }
+ @Override
+ public U64 getCookie() {
+ return cookie;
+ }
+
+ @Override
+ public OFFlowStatsRequest.Builder setCookie(U64 cookie) {
+ this.cookie = cookie;
+ this.cookieSet = true;
+ return this;
+ }
+ @Override
+ public U64 getCookieMask() {
+ return cookieMask;
+ }
+
+ @Override
+ public OFFlowStatsRequest.Builder setCookieMask(U64 cookieMask) {
+ this.cookieMask = cookieMask;
+ this.cookieMaskSet = true;
+ return this;
+ }
+ @Override
+ public Match getMatch() {
+ return match;
+ }
+
+ @Override
+ public OFFlowStatsRequest.Builder setMatch(Match match) {
+ this.match = match;
+ this.matchSet = true;
+ return this;
+ }
+//
+ @Override
+ public OFFlowStatsRequest build() {
+ long xid = this.xidSet ? this.xid : DEFAULT_XID;
+ Set<OFStatsRequestFlags> flags = this.flagsSet ? this.flags : DEFAULT_FLAGS;
+ if(flags == null)
+ throw new NullPointerException("Property flags must not be null");
+ TableId tableId = this.tableIdSet ? this.tableId : DEFAULT_TABLE_ID;
+ if(tableId == null)
+ throw new NullPointerException("Property tableId must not be null");
+ OFPort outPort = this.outPortSet ? this.outPort : DEFAULT_OUT_PORT;
+ if(outPort == null)
+ throw new NullPointerException("Property outPort must not be null");
+ OFGroup outGroup = this.outGroupSet ? this.outGroup : DEFAULT_OUT_GROUP;
+ if(outGroup == null)
+ throw new NullPointerException("Property outGroup must not be null");
+ U64 cookie = this.cookieSet ? this.cookie : DEFAULT_COOKIE;
+ if(cookie == null)
+ throw new NullPointerException("Property cookie must not be null");
+ U64 cookieMask = this.cookieMaskSet ? this.cookieMask : DEFAULT_COOKIE_MASK;
+ if(cookieMask == null)
+ throw new NullPointerException("Property cookieMask must not be null");
+ Match match = this.matchSet ? this.match : DEFAULT_MATCH;
+ if(match == null)
+ throw new NullPointerException("Property match must not be null");
+
+
+ return new OFFlowStatsRequestVer11(
+ xid,
+ flags,
+ tableId,
+ outPort,
+ outGroup,
+ cookie,
+ cookieMask,
+ match
+ );
+ }
+
+ }
+
+
+ final static Reader READER = new Reader();
+ static class Reader implements OFMessageReader<OFFlowStatsRequest> {
+ @Override
+ public OFFlowStatsRequest readFrom(ChannelBuffer bb) throws OFParseError {
+ int start = bb.readerIndex();
+ // fixed value property version == 2
+ byte version = bb.readByte();
+ if(version != (byte) 0x2)
+ throw new OFParseError("Wrong version: Expected=OFVersion.OF_11(2), got="+version);
+ // fixed value property type == 18
+ byte type = bb.readByte();
+ if(type != (byte) 0x12)
+ throw new OFParseError("Wrong type: Expected=OFType.STATS_REQUEST(18), got="+type);
+ int length = U16.f(bb.readShort());
+ if(length != 136)
+ throw new OFParseError("Wrong length: Expected=136(136), got="+length);
+ if(bb.readableBytes() + (bb.readerIndex() - start) < length) {
+ // Buffer does not have all data yet
+ bb.readerIndex(start);
+ return null;
+ }
+ if(logger.isTraceEnabled())
+ logger.trace("readFrom - length={}", length);
+ long xid = U32.f(bb.readInt());
+ // fixed value property statsType == 1
+ short statsType = bb.readShort();
+ if(statsType != (short) 0x1)
+ throw new OFParseError("Wrong statsType: Expected=OFStatsType.FLOW(1), got="+statsType);
+ Set<OFStatsRequestFlags> flags = OFStatsRequestFlagsSerializerVer11.readFrom(bb);
+ // pad: 4 bytes
+ bb.skipBytes(4);
+ TableId tableId = TableId.readByte(bb);
+ // pad: 3 bytes
+ bb.skipBytes(3);
+ OFPort outPort = OFPort.read4Bytes(bb);
+ OFGroup outGroup = OFGroup.read4Bytes(bb);
+ // pad: 4 bytes
+ bb.skipBytes(4);
+ U64 cookie = U64.ofRaw(bb.readLong());
+ U64 cookieMask = U64.ofRaw(bb.readLong());
+ Match match = ChannelUtilsVer11.readOFMatch(bb);
+
+ OFFlowStatsRequestVer11 flowStatsRequestVer11 = new OFFlowStatsRequestVer11(
+ xid,
+ flags,
+ tableId,
+ outPort,
+ outGroup,
+ cookie,
+ cookieMask,
+ match
+ );
+ if(logger.isTraceEnabled())
+ logger.trace("readFrom - read={}", flowStatsRequestVer11);
+ return flowStatsRequestVer11;
+ }
+ }
+
+ public void putTo(PrimitiveSink sink) {
+ FUNNEL.funnel(this, sink);
+ }
+
+ final static OFFlowStatsRequestVer11Funnel FUNNEL = new OFFlowStatsRequestVer11Funnel();
+ static class OFFlowStatsRequestVer11Funnel implements Funnel<OFFlowStatsRequestVer11> {
+ private static final long serialVersionUID = 1L;
+ @Override
+ public void funnel(OFFlowStatsRequestVer11 message, PrimitiveSink sink) {
+ // fixed value property version = 2
+ sink.putByte((byte) 0x2);
+ // fixed value property type = 18
+ sink.putByte((byte) 0x12);
+ // fixed value property length = 136
+ sink.putShort((short) 0x88);
+ sink.putLong(message.xid);
+ // fixed value property statsType = 1
+ sink.putShort((short) 0x1);
+ OFStatsRequestFlagsSerializerVer11.putTo(message.flags, sink);
+ // skip pad (4 bytes)
+ message.tableId.putTo(sink);
+ // skip pad (3 bytes)
+ message.outPort.putTo(sink);
+ message.outGroup.putTo(sink);
+ // skip pad (4 bytes)
+ message.cookie.putTo(sink);
+ message.cookieMask.putTo(sink);
+ message.match.putTo(sink);
+ }
+ }
+
+
+ public void writeTo(ChannelBuffer bb) {
+ WRITER.write(bb, this);
+ }
+
+ final static Writer WRITER = new Writer();
+ static class Writer implements OFMessageWriter<OFFlowStatsRequestVer11> {
+ @Override
+ public void write(ChannelBuffer bb, OFFlowStatsRequestVer11 message) {
+ // fixed value property version = 2
+ bb.writeByte((byte) 0x2);
+ // fixed value property type = 18
+ bb.writeByte((byte) 0x12);
+ // fixed value property length = 136
+ bb.writeShort((short) 0x88);
+ bb.writeInt(U32.t(message.xid));
+ // fixed value property statsType = 1
+ bb.writeShort((short) 0x1);
+ OFStatsRequestFlagsSerializerVer11.writeTo(bb, message.flags);
+ // pad: 4 bytes
+ bb.writeZero(4);
+ message.tableId.writeByte(bb);
+ // pad: 3 bytes
+ bb.writeZero(3);
+ message.outPort.write4Bytes(bb);
+ message.outGroup.write4Bytes(bb);
+ // pad: 4 bytes
+ bb.writeZero(4);
+ bb.writeLong(message.cookie.getValue());
+ bb.writeLong(message.cookieMask.getValue());
+ message.match.writeTo(bb);
+
+
+ }
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder b = new StringBuilder("OFFlowStatsRequestVer11(");
+ b.append("xid=").append(xid);
+ b.append(", ");
+ b.append("flags=").append(flags);
+ b.append(", ");
+ b.append("tableId=").append(tableId);
+ b.append(", ");
+ b.append("outPort=").append(outPort);
+ b.append(", ");
+ b.append("outGroup=").append(outGroup);
+ b.append(", ");
+ b.append("cookie=").append(cookie);
+ b.append(", ");
+ b.append("cookieMask=").append(cookieMask);
+ b.append(", ");
+ b.append("match=").append(match);
+ b.append(")");
+ return b.toString();
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ OFFlowStatsRequestVer11 other = (OFFlowStatsRequestVer11) obj;
+
+ if( xid != other.xid)
+ return false;
+ if (flags == null) {
+ if (other.flags != null)
+ return false;
+ } else if (!flags.equals(other.flags))
+ return false;
+ if (tableId == null) {
+ if (other.tableId != null)
+ return false;
+ } else if (!tableId.equals(other.tableId))
+ return false;
+ if (outPort == null) {
+ if (other.outPort != null)
+ return false;
+ } else if (!outPort.equals(other.outPort))
+ return false;
+ if (outGroup == null) {
+ if (other.outGroup != null)
+ return false;
+ } else if (!outGroup.equals(other.outGroup))
+ return false;
+ if (cookie == null) {
+ if (other.cookie != null)
+ return false;
+ } else if (!cookie.equals(other.cookie))
+ return false;
+ if (cookieMask == null) {
+ if (other.cookieMask != null)
+ return false;
+ } else if (!cookieMask.equals(other.cookieMask))
+ return false;
+ if (match == null) {
+ if (other.match != null)
+ return false;
+ } else if (!match.equals(other.match))
+ return false;
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+
+ result = prime * (int) (xid ^ (xid >>> 32));
+ result = prime * result + ((flags == null) ? 0 : flags.hashCode());
+ result = prime * result + ((tableId == null) ? 0 : tableId.hashCode());
+ result = prime * result + ((outPort == null) ? 0 : outPort.hashCode());
+ result = prime * result + ((outGroup == null) ? 0 : outGroup.hashCode());
+ result = prime * result + ((cookie == null) ? 0 : cookie.hashCode());
+ result = prime * result + ((cookieMask == null) ? 0 : cookieMask.hashCode());
+ result = prime * result + ((match == null) ? 0 : match.hashCode());
+ return result;
+ }
+
+}