Fixed more unit tests. Found another place in TopologyInstance.java where I accidentally used shallow compares instead of deep when checking to see if two links are symmetrical.

Fixed some more unit tests. Have some device manager issues maybe. Many of the remaining unit tests to fix seem to tie back to the device manager.

Fixed some more unit tests. In the process, discovered some errors in more overridden equals(). Also, discovered I had inadvertently commented out an important few lines the routing module uses to set the ingress port of flows used in the route. Those lines are now ported and use MatchUtils to copy the Match properly.

switchDisconnected() already called when the main connection is closed (so it wasn't a bug after all).

Undo weaving of IDebugCounterService into the OFSwitch class for previous SwitchCounters implementation.

Changed methodology after realizing the counters are already defined in OFConnectionCounters, which makes more sense since switches can have multiple connections now. OFConnectionCounters now refactored to remove counters when a switch disconnects.

Added SwitchCounters.java. Similar to SwitchManagerCounters.java, the SwitchCounters class contained within contains and maintains all the counters for a switch instance. When the switch disconnects, either accidentally or forcefully with disconnect(), the SwitchCounters will be removed from the IDebugCounterService, since they will no longer be valid or meaningful if the switch never reconnects.

Changed DebugCounterServiceImpl's registerCounter(). It turns out we do need to always return a reference to an IDebugCounter. If the counter we're trying to add is already there, return the existing IDebugCounter, else if the counter is not there, add it, and return it instead.

Add 'json' to the DeviceManager's REST API to be consistent with the rest. Ending the path in a / is bad REST practice.

Added option to remove debug counters from the hierarchy if it's been added; useful for keeping track of switch or device counters, which might not stick around forever. Fixed bug in CounterNode where non-null was returned regardless of whether a counter was already present or was a new counter. DebugCounterServiceImpl prints a debug message if non-null is returned, mistakenly indicating you're adding a counter that you already had registerd (generated TONS of annoying debug messages at startup). Next bug, I accidentally initialized counters twice in the OFSwitchManager; now only done once.

Load balancer quick fix due to prior IPv4 packet changes. Uses LOXI IpProtocol now to reference certain protocol numbers, not IPv4 anymore.

Working on unit tests. Found bugs in TCP and UDP. ByteBuffer returns a (signed) short for ports, but they are valid 0-65535, not -32768-32767. Convert possibly negative ports from BB to positive ints using a bitmask.

Incorporate Hung-Wei's and my stats reply and other REST API changes. A couple of bug fixes from Hung-Wei too.

Openflow 1.3#4

Conflicts:
	src/main/java/net/floodlightcontroller/core/web/SwitchStatisticsResource.java

Openflow 1.3#3

2. Use the custom serializer for IOFSwitch.

2. Use the serializer for some object.
3. Fix the bug in the buildRoute method on the ToplogInstance

Openlow 1.3#serializer

method retrieve on SwitchStatisticsResource.java
2. Adding a custom serializer to serilize the StatsReply.
3. It only supports statistic_flow type and OF1.3 format now.

Fixed lots of compile errors in unit tests; mostly involved replacing longs with DatapathIds, byte[]s with MacAddresses and Ipv4Addresses, and shorts with OFPorts and VlanVids; some refactoring of flow mod contruction was also done to align with loxi's builders. The static flow puser now supports IP TOS for OF1.0 and for OF1.1+ it supports match/rewrite to either ECN or DSCP bits.

Static Flow Pusher supports all OF1.3 matches and most OF1.3 actions (with the exception of masks). LoadBalancer corrected; OFFlowAdd used instead of OFFlowModify and OFPort.ZERO correct to OFPort.ANY. ActionUtils, MatchUtils, and InstructionUtils added to support static flow pusher. Strings defining flow fields *standardized* for Floodlight in the new utils classes. This means the REST API for the SFP will expect a sligthly different syntax than the current REST API (for master and 0.90). We can change the field names easily though in the utils files. These names are also referenced for the keys the SFP uses to store flow match fields and actions, just to be consistent.

Fixed LLDP handling, DPID and OFPort serializers, accounted for default cluster ID = 0, modify circuitpusher.py for new REST API format.

2. Use the string to present the vlan value instead of hexidecimal.
3. Fix the id in Cluster.
4. Fix the serialize method of OFPort.