We now have a human-readable OXM deserializer! Still need to add in all the NXM extensions and the OF1.5 0x8001 register class.

Clarified some log messages for negotiating OpenFlow versions. More importantly, included a patch to ignore all PORT_STATUS messages during the WaitFeaturesReplyState. OVS will periodically send such a message if it's connecting to the controller and being created (e.g. by mininet) at the same time. We will explicitly query the port status/configuration later, so ignoring this message now is fine.

First go at implementing OpenFlow version bitmaps. Also, made it a lot easier to change your default OpenFlow versions via floodlightdefault.properties's net.floodlightcontroller.OFSwitchManager.supportedOpenFlowVersions variable. The variable searches any string for 1.0, 1.1, 1.2, 1.3, and 1.4 and saves those versions as possible OpenFlow versions to use during a handshake and used in our controller's version bitmap. We don't presently account for future versions that might be e.g. 1.10 (which 1.1 would match). We need to use regexs to make the string parsing more robust. What I also noticed in working on this commit was that there are no utilies for parsing OpenFlow versions from wire (at least that are exposed by Loxi). TODO Create an OFVersion.ofWireValue(int wireVal) function in Loxi that efficiently tries to locate an OpenFlow version from the wire value. Right now, there are getters for each defined version, but not a utility to go the other way. Also, it might be useful to include an OFVersion.ofString(String laypersonString) that takes e.g. '1.1' and tries to get the OFVersion enum value. Last thing: NEED TO FIX CONNECT, DISCONNECT, and RECONNECT BUG that only occurs when OVS connects to Floodlight after Floodlight has been running first. I think it has to do with how OVS starts up and ***might*** be an OVS issue and not a Floodlight issue. Furthermore, need to allow OVS to send a PORT_STATUS message before we query for the PORT_CONFIG in the handshake. It's okay, we'll just get the port info again when we query for it shortly. This causes us to disconnect OVS even though the handshake is okay.

Patch channel handler to allow Brocade's 2nd hello. We now allow sw_hello, ctrl_hello, sw_hello assuming the second sw_hello's protocol version matches what we calculated. If it doesn't, then it might not be the brocade but instead an unsupported switch trying to reconnect (although this should resultin a new socket being established and a new channel handler being instantiated).

Working LearningSwitch.java

writePacketOutForPacketIn now calls OFMessageUtils.writePacketOutForPacketIn

Added required imports and static declaration.

Modified visibility of method to public

Added private void writePacketOutForPacketIn(IOFSwitch sw, OFPacketIn packetInMessage, OFPort egressPort) from net.floodlightcontroller.learningswitch.LearningSwitch

Patched ARP class to use MacAddress, IPv4Address, and ArpOpcode, as it should. This makes it safer and avoids primitive data types.

messages

Fixed what was likely one of the dependency issues in the unit tests. There were two @Before annotations on functions in the handshake handler tests. setUp() depends on setUpFeaturesReply(); but if they are both @Before, there's no guarantee the first @Before (features reply) will be executed before the second @Before (setup). Removed @Before annotation from setUpFeaturesReply() and manually invoke that function from within setUp() so that the featuresReply class variable is set when it's needed in setUp().

Comma-delimited now. There will be an issue if a key is invalid, but this is a good start. If a key is invalid, we might output a double-comma where the key would have normally been inbetween.

Fix action list serialization to JSON format. We can have more than one of each action in the list, so when the JSON parser at the client end displays the string, it will only show the last key of each duplicate key (which is not good).

Support masked flow mods inserted into the SFP via an OFFlowAdd. This is different from MatchUtils, since we have to put into the map with the SFP's column keys.

SEND_FLOW_REM in flow mod

delete useless code.