Conflicts:
	src/main/java/net/floodlightcontroller/forwarding/Forwarding.java

Merged

Moving this to my own branch (I am forking it)

small fixes

fix bug in ACL. UDP is decimal 17, not 11 (is 0x11)

This deletes/add flows from the switch out of forwarding when the firewall rule changes.

Convert any format DPID to hex string DPID for static entry pusher's 'switch' key

convert integer DPIDs specified to the SEP to DatapathId to prevent duplicate DPID flow sets listed just because the DPID was entered in a different format. hexstring is what will be used

OpenFlow 1.5

(1) Fix bug in forwarding where OF1.0 doesn't support tables, so don't set a table ID. (2) Tidy up stats REST API. (3) Remove LLDP info log that should have been debug.

Fixed my delete test case by making sure the message written was correct. (This will be expanded upon in the future).

Added test cases for Forwarding if there is a decision packet.

Updated Firewall.java so that addRule and deleteRule and enableFirewall announce that a rule is being changed in the firewall. Then the IRoutingDecisionChangedListener shall alert Forwarding to update the flowtable accordingly.  None of this is tested and the TopologyManager needs to be fixed.  I might even want to move the change out of TopologyManager altogether since RoutingDecisionChange doesn't concern it.

Add in old URIs for static entry pusher for backwards compatibility. Note this only addresses URI compatibility *not* JSON key:value compatibility. Clean up warnings in LoadBalancer unit test

Finally! :-) OFMessageDamper works. Required creating a custom hashCode() (hashCodeIgnoreXid()) function for all OFMessages we would like to dampen.

Update Forwarding to support specifying a default table ID for flow insertion. It's flow table 0 by default, but it can be overridden using the net.floodlightcontroller.forwarding.Forwarding.table-id=X config parameter in floodlightdefault.properties. Set X to any table b/t 0 and the max.

Introduce ParseUtils as a cleaner way to parse hex or decimal strings to their primitive types. This is done instead of e.g. Integer.decode() in order to eliminiate the need to instantiate a new object wrapped around the primitive type if we're just going to use the primivitive type in the first place. Cleaned up all *Utils classes to use the new ParseUtils fuctions, which reduced a lot of duplicate code.

Update MatchUtils, ActionUtils, and GroupUtils to support converting OFGroup and OFPort types to/from strings more easily. This includes human-readable strings for special values, such as OFPort.CONTROLLER, etc., and OFGroup.ALL, etc.

Fix bug in statistics module REST API to correctly retrieve requested statistics for given DPID and port.

Loxi master is up-to-date now with FL codebase. With this commit, both ant and mvn should work to build. We will transition to mvn though to reduce the branch size (w/history purge) for upcoming v2.0.

Changes were made to the FirewallTest.java unit test in order to test if the correct descriptor was added to the RoutingDecisions.

Refactor OpenFlow server socket config to OFSwitchManager and expose more configuration options via floodlightdefault.properties

Update statistics REST API with OF1.5 statistics. This includes an update to Loxi to better support statistics/multipart messages. Loxi master will need to have this update incorporated before Travis CI will build successfully.

Getting there w/OF1.5 support. Just need a switch that supports it (well) to do some more thorough testing.

Merge floodlight/floodlight master with openflow15 dev branch. This is just to address a couple bug fixes and perform a necessary manual merge

Bug fix and improvements

Pull in new floodlight/floodlight-webui code