diff --git a/apps/circuitpusher/circuitpusher.py b/apps/circuitpusher/circuitpusher.py
index 49bbcfaccc..1c8b9f0037 100755
--- a/apps/circuitpusher/circuitpusher.py
+++ b/apps/circuitpusher/circuitpusher.py
@@ -123,7 +123,7 @@
# retrieving route from source to destination
# using Routing rest API
- command = "curl -s http://%s/wm/topology/route/%s/%s/%s/%s/json" % (controllerRestIp, sourceSwitch, sourcePort['shortPortNumber'], destSwitch, destPort['shortPortNumber'])
+ command = "curl -s http://%s/wm/topology/route/%s/%s/%s/%s/json" % (controllerRestIp, sourceSwitch, sourcePort, destSwitch, destPort)
result = os.popen(command).read()
print result+"\n"
print command+"\n"
@@ -143,26 +143,26 @@
# send one flow mod per pair of APs in route
# using StaticFlowPusher rest API
- # IMPORTANT NOTE: current Floodlight StaticflowEntryPusher
+ # IMPORTANT NOTE: current Floodlight StaticflowPusher
# assumes all flow entries to have unique name across all switches
# this will most possibly be relaxed later, but for now we
# encode each flow entry's name with both switch dpid, user
# specified name, and flow type (f: forward, r: reverse, farp/rarp: arp)
- command = "curl -s -d '{\"switch\": \"%s\", \"name\":\"%s\", \"nw_src\":\"%s\", \"nw_dst\":\"%s\", \"dl_type\":\"%s\", \"cookie\":\"0\", \"priority\":\"32768\", \"ingress_port\":\"%s\",\"active\":\"true\", \"actions\":\"output=%s\"}' http://%s/wm/staticflowentrypusher/json" % (ap1Dpid, ap1Dpid+"."+args.circuitName+".f", args.srcAddress, args.dstAddress, "0x800", ap1Port['shortPortNumber'], ap2Port['shortPortNumber'], controllerRestIp)
+ command = "curl -s -d '{\"switch\": \"%s\", \"name\":\"%s\", \"ipv4_src\":\"%s\", \"ipv4_dst\":\"%s\", \"eth_type\":\"%s\", \"cookie\":\"0\", \"priority\":\"32768\", \"in_port\":\"%s\",\"active\":\"true\", \"actions\":\"output=%s\"}' http://%s/wm/staticflowpusher/json" % (ap1Dpid, ap1Dpid+"."+args.circuitName+".f", args.srcAddress, args.dstAddress, "0x800", ap1Port['shortPortNumber'], ap2Port['shortPortNumber'], controllerRestIp)
result = os.popen(command).read()
print command
- command = "curl -s -d '{\"switch\": \"%s\", \"name\":\"%s\", \"arp_spa\":\"%s\", \"arp_dpa\":\"%s\", \"dl_type\":\"%s\", \"cookie\":\"0\", \"priority\":\"32768\", \"ingress_port\":\"%s\",\"active\":\"true\", \"actions\":\"output=%s\"}' http://%s/wm/staticflowentrypusher/json" % (ap1Dpid, ap1Dpid+"."+args.circuitName+".farp", args.srcAddress, args.dstAddress, "0x806", ap1Port['shortPortNumber'], ap2Port['shortPortNumber'], controllerRestIp)
+ command = "curl -s -d '{\"switch\": \"%s\", \"name\":\"%s\", \"arp_spa\":\"%s\", \"arp_tpa\":\"%s\", \"eth_type\":\"%s\", \"cookie\":\"0\", \"priority\":\"32768\", \"in_port\":\"%s\",\"active\":\"true\", \"actions\":\"output=%s\"}' http://%s/wm/staticflowpusher/json" % (ap1Dpid, ap1Dpid+"."+args.circuitName+".farp", args.srcAddress, args.dstAddress, "0x806", ap1Port['shortPortNumber'], ap2Port['shortPortNumber'], controllerRestIp)
result = os.popen(command).read()
print command
- command = "curl -s -d '{\"switch\": \"%s\", \"name\":\"%s\", \"nw_src\":\"%s\", \"nw_dst\":\"%s\", \"dl_type\":\"%s\", \"cookie\":\"0\", \"priority\":\"32768\", \"ingress_port\":\"%s\",\"active\":\"true\", \"actions\":\"output=%s\"}' http://%s/wm/staticflowentrypusher/json" % (ap1Dpid, ap1Dpid+"."+args.circuitName+".r", args.dstAddress, args.srcAddress, "0x800", ap2Port['shortPortNumber'], ap1Port['shortPortNumber'], controllerRestIp)
+ command = "curl -s -d '{\"switch\": \"%s\", \"name\":\"%s\", \"ipv4_src\":\"%s\", \"ipv4_dst\":\"%s\", \"eth_type\":\"%s\", \"cookie\":\"0\", \"priority\":\"32768\", \"in_port\":\"%s\",\"active\":\"true\", \"actions\":\"output=%s\"}' http://%s/wm/staticflowpusher/json" % (ap1Dpid, ap1Dpid+"."+args.circuitName+".r", args.dstAddress, args.srcAddress, "0x800", ap2Port['shortPortNumber'], ap1Port['shortPortNumber'], controllerRestIp)
result = os.popen(command).read()
print command
- command = "curl -s -d '{\"switch\": \"%s\", \"name\":\"%s\", \"arp_spa\":\"%s\", \"arp_dpa\":\"%s\", \"dl_type\":\"%s\", \"cookie\":\"0\", \"priority\":\"32768\", \"ingress_port\":\"%s\",\"active\":\"true\", \"actions\":\"output=%s\"}' http://%s/wm/staticflowentrypusher/json" % (ap1Dpid, ap1Dpid+"."+args.circuitName+".rarp",args.dstAddress, args.srcAddress, "0x806", ap2Port['shortPortNumber'], ap1Port['shortPortNumber'], controllerRestIp)
+ command = "curl -s -d '{\"switch\": \"%s\", \"name\":\"%s\", \"arp_spa\":\"%s\", \"arp_tpa\":\"%s\", \"eth_type\":\"%s\", \"cookie\":\"0\", \"priority\":\"32768\", \"in_port\":\"%s\",\"active\":\"true\", \"actions\":\"output=%s\"}' http://%s/wm/staticflowpusher/json" % (ap1Dpid, ap1Dpid+"."+args.circuitName+".rarp",args.dstAddress, args.srcAddress, "0x806", ap2Port['shortPortNumber'], ap1Port['shortPortNumber'], controllerRestIp)
result = os.popen(command).read()
print command
@@ -198,19 +198,19 @@
sw = data['Dpid']
print data, sw
- command = "curl -X DELETE -d '{\"name\":\"%s\", \"switch\":\"%s\"}' http://%s/wm/staticflowentrypusher/json" % (sw+"."+args.circuitName+".f", sw, controllerRestIp)
+ command = "curl -X DELETE -d '{\"name\":\"%s\", \"switch\":\"%s\"}' http://%s/wm/staticflowpusher/json" % (sw+"."+args.circuitName+".f", sw, controllerRestIp)
result = os.popen(command).read()
print command, result
- command = "curl -X DELETE -d '{\"name\":\"%s\", \"switch\":\"%s\"}' http://%s/wm/staticflowentrypusher/json" % (sw+"."+args.circuitName+".farp", sw, controllerRestIp)
+ command = "curl -X DELETE -d '{\"name\":\"%s\", \"switch\":\"%s\"}' http://%s/wm/staticflowpusher/json" % (sw+"."+args.circuitName+".farp", sw, controllerRestIp)
result = os.popen(command).read()
print command, result
- command = "curl -X DELETE -d '{\"name\":\"%s\", \"switch\":\"%s\"}' http://%s/wm/staticflowentrypusher/json" % (sw+"."+args.circuitName+".r", sw, controllerRestIp)
+ command = "curl -X DELETE -d '{\"name\":\"%s\", \"switch\":\"%s\"}' http://%s/wm/staticflowpusher/json" % (sw+"."+args.circuitName+".r", sw, controllerRestIp)
result = os.popen(command).read()
print command, result
- command = "curl -X DELETE -d '{\"name\":\"%s\", \"switch\":\"%s\"}' http://%s/wm/staticflowentrypusher/json" % (sw+"."+args.circuitName+".rarp", sw, controllerRestIp)
+ command = "curl -X DELETE -d '{\"name\":\"%s\", \"switch\":\"%s\"}' http://%s/wm/staticflowpusher/json" % (sw+"."+args.circuitName+".rarp", sw, controllerRestIp)
result = os.popen(command).read()
print command, result
diff --git a/apps/circuitpusher/circuits.json b/apps/circuitpusher/circuits.json
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/build.xml b/build.xml
index 8db316dbb0..6c80f5411b 100644
--- a/build.xml
+++ b/build.xml
@@ -75,8 +75,8 @@
-
-
+
+
@@ -243,7 +243,7 @@
-
+
diff --git a/commits.log b/commits.log
new file mode 100644
index 0000000000..5e22936c7b
--- /dev/null
+++ b/commits.log
@@ -0,0 +1,2350 @@
+777725d Added in NXMs for source and destination tunnel IPs, included in new Loxigen 0.9.0. Used Loxigen's OFFlowModFlags serializers for different OFVersions to fix compile error in StatsReplySerializer introduced upon Loxigen upgrade. Add new OF1.4 counters to DebugCounters to allow unit tests to compile (this is the first step in OF1.4 support =) ).
+70bbe6d Updated all unit tests with the uncommenting of debugcounter stuff in the previous commit. For the most part, initialized the MockDebugCounterService and provided it to the MemoryStorageSource to allow counters in the AbstractStorageSourceService.
+d1dc043 Fixed some debugcounter @Ryan's. Removed some @Ryans that have already been addressed.
+95d16cf Fixed some issues with the Firewall and string compares. There are probably some more things that need to be fixed there.
+21f6a55 Commented my edits to the NotificationManagerFactory's init() function.
+f7d14cd Removed all deprecated flowcache references and marked all flowcache classes as deprecated. Also TODOed the OFMessageDamper Forwarding module unit test. It will always fail until tthe OFMessageDamper is fixed to ignore the XIDs in OFMessages.
+a422012 OF1.3 handshake unit tests updated. All unit tests can be run together and have zero errors but one failure. The failure is in Forwarding and is expected for the time being until OFMessageDamper/Loxigen is fixed to ignore XIDs in OFMessages. In the previous commit, the unit tests for the flowcache package were completely removed due to the effort required to fix them. I don't know if completely removing the flowcache package though is the best idea. Even if it's not tested and not proven scalable, people might benefit from being able to look at the code. Thus, I've left the package in, at least for the time being.
+26ce679 This is a scattered commit, but it includes more unit test fixes, including Forwarding and the NotificationManager's interdependency issue the unit tests were having when being run together as a group. It also includes some typo repairs. The last major change is a bug fix in the LinkDiscoveryManager that fixes the long-time issue of LINK_ADDED and PORT_STATUS messages being inconsistent when a link is brought up. The issue was a race condition between the PORT_STATUS update timer to process the queues and the propagation of LLDP packets from one switch to another that cause the LINK_ADDED updates.
+3d6a093 Removed old string OFFlowMod-composition code from LoadBalancer.
+b2914d3 Moved a couple annoying debug messaged to trace wrt switch connections. Changed logback.xml to debug and higher-level. Removed unused imports and variables in some places to clean up warnings that have arisen over time/mods. Fixed the LoadBalancer so it works with OF1.0 and OF1.3; it no longer composes OFFlowMods using strings! =)
+dbccc49 Mid-way through Forwarding unit tests. Added a sample equals to compare OFPacketIns when the XID does not matter (in net.floodlightcontroller.util.OFMessageComparisonUtils.java).
+d863f45 Forgot to fix Hub after playing with it initially. Now defaults to FLOOD OFPacketOuts at the controller, which means no flows are inserted. The option still exists to insert flows instead.
+4a46891 Firewall working and unit tests working. Found an fixed a couple bugs in the Firewall during the process.
+e430972 Removed unused imports from DeviceSyncRepresentation.
+7dadba5 Some Firewall unit test fixes. Went through all code and corrected pi.getInPort() to (pi.getVersion().compareTo(OFVersion.OF_12) < 0 ? pi.getInPort() : pi.getMatch().get(MatchField.IN_PORT)). OF1.2 and greater specifies the ingress port as an OXM in the Match.
+b007ece Removed unused import in SFEP.
+1631b49 Fixed StaticFlowEntryPusher unit tests and a bug in the SFEP.
+6df2eb3 Merge branch 'master' of https://github.com/rizard/floodlight Pull in Hung-Wei's WEBUI changes. Then, push Ryan's unit test changes to remote again.
+be3be8d Fixed DeviceManagerImplTest unit tests. TODO: With OpenFlowJ-Loxi, an untagged VLAN can be denoted with VlanVid.ZERO. Presently, it's VlanVid.of(-1), which was the case before integration of the new library. It makes more sense to have it as ZERO I think.
+05b4b94 Merge pull request #5 from hwchiu/openflow-1.3
+5fad7e1 Make the WEBUI shows the flow info
+478b00c complete the serialization of PortDescStats and PortStats, also modfiy the webui to fit the new-format of restapi
+999714b serialize the portStatsReply and modify the webui
+ec6fc33 Try to fix the WEBUI
+2ccdc1b Fixed some DeviceManager unit tests and (not quite a bug but) an issue converting an Entity to a SyncEntity, which requires primitives for serialization. I tried to supply the MacAddress, IPv4Address, etc JSON serializer classes via the @JsonSerialize annotation, but the serializer still didn't do it...
+4f2f969 VirtualNetworkFilter unit tests complete. Found bug in Entity in devicemanger package where null doesn't mean no switch or port anymore; DatapathId.NONE and OFPort.ZERO do instead. An object will always be there (not null), but it's contents will specify whether the Entity has a switch port or not.
+f9e6c23 Fixed LoadBalancer unit tests! TODO: Need to change the LB to not compose flows with strings...yuck. This will make OF1.0/OF1.1+ support integration easier.
+ccc14a3 Commented out all of EventTest.java's format-checking unit test. Why does the format need to be checked to see if it's ISO8601? Java's java.util.Date toString() returns a different format (with spaces), but I don't see what the big deal is at this point.
+00dc75c Fixed OFMessageDamper unit tests and removed context from within OFMessageDamper (not used with a switch write anymore).
+c4c8bfb Fixed LearningSwitch unit tests and a couple bugs found in the code as a result.
+52eecc1 Fix IN_PORT in TopologyManager when a port is removed from an OF1.0 vs OF1.1+ switch.
+ddea5b7 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.
+ece04f2 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.
+5b0933b 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.
+2de7b11 switchDisconnected() already called when the main connection is closed (so it wasn't a bug after all).
+77fea4d Undo weaving of IDebugCounterService into the OFSwitch class for previous SwitchCounters implementation.
+96f2ede 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.
+bf16fa2 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.
+cb7441e 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.
+4b07179 Use /wm/device/all/json for all devices and /*** where *** is a filter by mac, vlan, ip, etc
+5c0d006 Add 'json' to the DeviceManager's REST API to be consistent with the rest. Ending the path in a / is bad REST practice.
+bff2220 Fix DebugCounter related things in core.web. Other misc optimizations in core.web.
+8d5f24c remove unnecessary comments
+ee7508b 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.
+e5cf49e Load balancer quick fix due to prior IPv4 packet changes. Uses LOXI IpProtocol now to reference certain protocol numbers, not IPv4 anymore.
+a755263 Refactor IPv4 and UDP payload's protocol class map the proper way.
+2ab3d47 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.
+fc10fc9 Incorporate Hung-Wei's and my stats reply and other REST API changes. A couple of bug fixes from Hung-Wei too.
+9a09624 Merge branch 'master' of https://github.com/rizard/floodlight
+33a54a0 Merge Hung-Wei's #3 pull request
+34c0ee9 Merge pull request #4 from hwchiu/openflow-1.3#4
+7e99417 OFStatsReply custom serializer. Works for OFFlowStatsReply presently.
+52b58aa Merge branch 'master' of https://github.com/rizard/floodlight
+3e3812f Merge pull request #3 from hwchiu/openflow-1.3#3
+b7f48b6 1. Fix the error for /wm/core/controller/switches/json restapi. 2. Use the custom serializer for IOFSwitch.
+aa76bd5 1. Adding some serializers. 2. Use the serializer for some object. 3. Fix the bug in the buildRoute method on the ToplogInstance
+b7bd6d7 Merge branch 'openflow-1.3', remote-tracking branch 'upstream/master' into openflow-1.3
+d56a7b5 commit before pull
+b48ab13 Merge pull request #2 from hwchiu/openlow-1.3#Serializer
+e211945 replace the tab with 4-space
+b14c22f Merge branch 'openflow-1.3', remote-tracking branch 'upstream/master' into openlow-1.3#Serializer
+21e16d7 1. Create new type StatsReply to encapsulate the return value of the 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.
+04b75d0 Forgot to change floodlightdefault.properties; removed my TestModule and added back Forwarding.
+36810ba 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.
+f71ebe0 Merge remote-tracking branches 'upstream/master' and 'origin/openflow-1.3' into openflow-1.3
+d3cc1e9 Removed jars from prior ant testing.
+56efbe0 Added support for multiple flow tables in Static Flow Pusher.
+4007d05 Merge branch 'master' of https://github.com/rizard/floodlight
+11aa1c2 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.
+559f6dc Merge pull request #1 from hwchiu/openflow-1.3
+306be67 1. Fix the circuitpusher.py to make it works. 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.
+b9b11fb revert the modification of TopologyInstance, it will cause some problem of route, still need to understand
+98e320a Fix the bug for LLDP (send/receive) and add the null condition check for topologyInstance.
+57a83ea remove the old version of openflowj
+56e8d45 Modify the Serializer for DPID (Long -> DatapathId )
+2b161f1 Merge remote-tracking branch 'upstream/master' into openflow-1.3
+3de2b50 Add j3dutils.jar to build.xml
+98b7dfb Fixed build.xml. Fixed/implemented workaround for remaining debug counter compile errors to allow compilation with ant. Static Flow Pusher now matches on all OF1.3 match fields; all OF1.3 actions/set-field are in progress now, but basic out-port action works.
+a229246 Quick fix for OF1.0. Should find a way so that all modules don't have to worry about how to get Match from PI. OF1.0-1.2 use pi.getInPort(); OF1.3 uses pi.getMatch(MatchField.IN_PORT). Workaroud is: (pi.getVersion().compareTo(OFVersion.OF_13) < 0 ? pi.getInPort() : pi.getMatch().get(MatchField.IN_PORT))
+87b907e Quick fix for OF1.0. Should find a way so that all modules don't have to worry about how to get Match from PI. OF1.0-1.2 use pi.getInPort(); OF1.3 uses pi.getMatch(MatchField.IN_PORT). Workaroud is: (pi.getVersion().compareTo(OFVersion.OF_13) < 0 ? pi.getInPort() : pi.getMatch().get(MatchField.IN_PORT))
+c7a55c9 VLAN matches added conditionally to Forwarding flows. Started moving sync code to the OFSwitchManager; not sure if SyncService needs to live there too.
+473add3 Ethernet's untagged VLAN notation updated. Match.Builders created from exising Matches will only remember parent Match's MatchFields if the new builder is not modified (not very useful IMHO). MatchUtils.java added to create a new builder from and existing Match and retain all the MatchFields unless explictly overwritten with the new builder.
+aded7ca Forwarding with port, L2, and, L3 matches. OFPBMC_BAD_VALUE sent back from switch for matching FL's no-VLAN notation; need to update all VLAN's = -1 to NO_VLAN instead.
+c59d2f6 Ethernet fixed; proto = byte, not short. Fixed DeviceManager; toString() of Entity corrected and misc bugs. Fixed Forwarding; forgot to initialize OFSwitchService reference. Basic Forwarding works! Known issue: Forwarding only matches switch port numbers...
+161962d Forgot to update overridden equals() for many classes in devicemanager package. Devices are now compared correctly and are learned and not added repeatedly.
+fb618f5 Working on device manager. Currently devices aren't being saved, or cannot be located after they are stored...I'm searching incorrectly for devices and entities or am not saving them correctly or at all.
+f32442a Fixed more compile errors and further tidied up Firewall, Forwarding, ForwardingBase modules.
+751530c Fixed compile errors and tidied up Firewall, Routing, and some of Forwarding.
+f8b5554 Load balancer and link discovery compile errors fixed
+6612c5c Cleaned up some more. Ported static flow pusher and REST API
+2a1fbbf Removed BSN-specific handshakes, some debug messages, tweaked static flow entry pusher, and hub to work with new OpenFlowJ-Loxi flow mod commands.
+7e62ace Initial OF1.3 handshake and basic Hub module working
+f32ac2f Initial OF1.3 handshake working. Still trouble write()ing to OFSwitch instance after handshake complete. The Connection is reported as down, yet the switch is echoed repeatedly w/o a problem...
+1d7c3d1 More changes. Almost ready to test.
+ace9b4a More updates. Almost ready to test.
+736a2e9 Revert "Changes so far"
+4ae9466 Changes so far
+2d916e8 Merge pull request #448 from hwchiu/issue#447
+15d7a32 formatting
+06b5be1 Make the floodlight dispatch the barrier-reply event
+588a702 Merge remote-tracking branch 'upstream/master'
+64cd19e Merge pull request #445 from Rakurai/patch-1
+82d3aba Merge pull request #443 from akoshibe/fallback-port
+1afc13f Update Cluster.java
+e685c01 added override for port value in FallbackCCProvider
+fbfe13c Merge pull request #442 from subh007/master
+7f80a99 added exception handling for the device curl call.
+408cb51 Hack and slash -- replaced old OpenFlowJ with LoxiGen OpenFlowJ
+b7682aa Merge branch 'master', remote-tracking branch 'upstream/master'
+9e30407 Merge pull request #440 from hwchiu/master
+5790681 Merge pull request #441 from hwchiu/issue#439
+b77ee66 Make Firewall POST method return the ruleid
+cb02183 Add the condition check avoid NullException when user delete a non-exist hosts
+b6cb49a Make the virtualnetwork's GET method return tuple of the port's logical name and host's mac address
+737086c Merge pull request #435 from sieben/redundant_type_cast
+12f7678 Redundant_type_cast
+5b2755e Merge pull request #426 from tamihiro/master
+f6ec13a Restore computeEntryCookie() functionality
+2aadf6b Merge pull request #424 from Sovietaced/master
+d7b7725 Fix packet tracer API
+b0597f1 Merge pull request #417 from CodingCat/master
+132d27e Merge pull request #420 from hsr/rfc2616
+b8ede44 Removing redundant restlet resource StaticFlowEntryStoreResource
+81d5a55 Makes Floodlight's Static Flow Pusher compliant with RFC 2616
+2643676 add match method in OFMatch
+f4f87ff Changed quantum to neutron name due to OpenStack change
+9b361fb Fix floodlightdefault properties to remove the sync torture module. Add a logback-test.xml default logging config for good measure to hide the SyncManager log spam at debug level
+95ba314 Merge pull request #415 from Sovietaced/master
+e66b616 Fixed floodlight default properties file
+2766b98 Merge pull request #411 from Sovietaced/master
+5f73b51 Updating Floodlight subtree
+2270a2e display dpid as HexString in SwitchPort
+0a3e9ad Merge pull request #410 from Sovietaced/master
+c9804a8 Includes: 1) Ability to ask for last N events 2) Events now show up with most-recent-first 3) Including ThreadName as one of the columns 4) Ensuring moduleName and eventNames in URL do not include '/' 5) Removing dead code in Event.java 6) Updating unit tests
+0f9d92e Fixing comments to reflect changes made to the REST API handler (when accomodating the CLI)
+816d133 Issue #406 continued
+7123555 Merge pull request #409 from Sovietaced/master
+8432cc3 Patch for issue #406
+d3f48d2 Merge into master from pull request #3837: BSC-3970 ARP packet parsing exception causes switch disconnect (https://github.com/bigswitch/bigswitchcontroller/pull/3837)
+74f6d4f Merge pull request #408 from Sovietaced/master
+1d6e21e Revert default module loading file to remove apploader
+9aaeffa Unit test fixes
+1598226 Revised PacketParsingException class
+b7f0b0b Pure tab/whitespace fix
+d28f52a change flow reconcile event names to lower case, delemited by "-" change flow mod event names to being delimited by "-"
+3be0a70 Merge into master from pull request #3828: Flush Events Explicitly in DeviceManager outside packet-in pipeline (https://github.com/bigswitch/bigswitchcontroller/pull/3828)
+b2b1c50 Fix packet related tests
+641cd43 BSC-3970 Catch malformed ARP packets
+c87ae73 Mechanical change to use PacketParsingException
+c9cfdee Add PacketParsingException
+ad377b7 flush device manager events outside packet-in pipeline
+4df2e1f increase flow reconcile event buffer size to 500
+7451395 Merge branch 'master' into reconcileEvents
+c9fe228 Merge into master from pull request #3816: Flow Mod Events (https://github.com/bigswitch/bigswitchcontroller/pull/3816)
+3124298 change lldp-eol to on-demand counter
+0319b7b Flow Mod Events
+d4637b6 add error/warning metadata for existing counters that reflect errors/warnings
+59363dd don't print event type as this is already specified in command line
+f3b646a flow reconciliation events
+f79ded9 Merge into master from pull request #3798: debug events cli forces some columns to be left-most columns (https://github.com/bigswitch/bigswitchcontroller/pull/3798)
+ace82c4 Merge into master from pull request #3770: BSC-3926. Set switch's connectedSince when the switch is actually connected. Set to null otherwise. (https://github.com/bigswitch/bigswitchcontroller/pull/3770)
+fc7ffd9 Forces debug-events cli output to always display index, timestamp and thread-id as the left-most columns
+42d64bc Merge into master from pull request #3791: Removing event-history (replaced by debug-events) (https://github.com/bigswitch/bigswitchcontroller/pull/3791)
+ff657f9 topology events update
+4e3b2fc Removing event-history framework (replaced by debug-events)
+ac19cb2 Measure packet in rate over longer intervals to smooth out bursts
+be1fff9 BSC-3926. Set switch's connectedSince when the switch is actually connected. Set to null otherwise.
+869dd7d Merge remote-tracking branch 'bigswitch/master' into xenonsupp
+44d64f1 Merge into master from pull request #3744: Topology Events (https://github.com/bigswitch/bigswitchcontroller/pull/3744)
+9199082 fix indentation error
+35152c0 Includes: 1) new event for BVS Interface(s) assigned 2) new EventFieldTypes for LIST_OBJECT, SREF_OBJECT and SREF_LIST_OBJECT 3) removing LIST_VLAN from EventFieldType as it is superseded by LIST_OBJECT
+ae6b1df added topology events
+b6aa52a Adding an event that describes why a switch is tunnel incapable
+4edcbb1 Merge into master from pull request #3723: add host events - add/delete/moved/update (https://github.com/bigswitch/bigswitchcontroller/pull/3723)
+19a64c1 remove unused import
+c2f2804 Merge into master from pull request #3731: Fix NPE in REST API for SLAVE switch. BSC-3922 (https://github.com/bigswitch/bigswitchcontroller/pull/3731)
+8336810 added custom formatters for LIST_VLAN, LIST_IPV4, LIST_ATTACHMENT_POINT
+dc0486c Fix NPE in REST API for SLAVE switch. BSC-3922
+1997db1 [BVS-420] Add unit tests for checking if device moved notifications are sent or not under certain situations.
+38b8596 The previous fix is not correct. The fix generates a device moved event when the attachment points are not even updated.
+604ba01 implement processOFPortStatus() for WAIT_SWITCH_SUBHANDSHAKE
+6098cbe Merge remote-tracking branch 'bigswitch/master' into xenonsupp
+0dfabb3 Merge remote-tracking branch 'bigswitch/master' into misc
+f699c42 add host events - add/delete/moved/update
+3bd35ed Merge into master from pull request #3699: Do not clear all flow mods on a quick switch disconnect/reconnect (https://github.com/bigswitch/bigswitchcontroller/pull/3699)
+6356b76 BVS-570 handle PortStatus messages in every state during switch handshake.
+709ba22 Use data for controllerTLV that actually changes between hosts
+753f0ee Don't use printStackTrace() on exceptions.
+00aabc8 Merge remote-tracking branch 'bigswitch/master' into xenonsupp
+5db45bd Fix flow wipe behavior based on comments from Gregor
+16b8f29 Add unit test for switch reconnect
+1aefb0d IN-166 Do not wipe flows on a quick switch reconnect
+17a92f2 Add log message when all switch flows are cleared
+0781fe0 Merge into master from pull request #3696: adding an id to debug events show output (https://github.com/bigswitch/bigswitchcontroller/pull/3696)
+49e3a01 Merge into master from pull request #3695: Display controller-node summary in entry form (https://github.com/bigswitch/bigswitchcontroller/pull/3695)
+a448f47 A small hack to add an id in the show output for debug events
+8503b37 display controller-node summary in entry form
+d95df4f resolve conflict
+0d6414e Merge remote-tracking branch 'bigswitch/master'
+a9e2550 removing print out
+7db90b5 Updated show controller-node <> summary to include switches, hosts, tenants & virtual routers
+ea0c101 more test polishing
+e7c4bf7 A debug event queue that automatically registers all WARN and ERROR log messages so the user does not have to check floodlight logs for them.
+1435c5a more unit tests
+93bd193 more unit tests and javadocs
+bfcae24 moved unit test for vendor ext to floodlight tree
+74a9833 Merge remote-tracking branch 'bigswitch/master' into xenonsupp
+acabc4c Add unit test for IVS pktIn suppression
+e9b5dc2 Merge into master from pull request #3677: BVS-530 (https://github.com/bigswitch/bigswitchcontroller/pull/3677)
+b2a199c BVS-530
+1d2a2f4 Fix unit tests
+dde4750 BVS-530
+d0b8db0 Add sub handshake for switch driver and do pktin suppression for IVS/xenon.
+27a5c71 Add OFBsnPktinSuppressionSetRequestVendorData
+93c2242 AppCookie changes.
+8f3d31d Merge remote-tracking branch 'bigswitch/master'
+9b9682f fixing unit test
+49d455c Remove unused methods.
+15712fd [BVS-486] getPortType will default to UPLINK ports for BigSwitchOVS. The autoportfast detection is performed only in BSNOVS and Xenon switches.
+ce387c3 Changes to rest API in debugEvents to prepare for CLI
+2ed1397 Merge into master from pull request #3608: BVS-515 (https://github.com/bigswitch/bigswitchcontroller/pull/3608)
+4a97a0c add debug info
+ca2bcdd BVS-515
+b079d97 Merge into master from pull request #3633: mostly cleanup (https://github.com/bigswitch/bigswitchcontroller/pull/3633)
+f2f22ed Exception handling tuning for OFChannelHandler
+5b008fc Merge remote-tracking branch 'bigswitch/master' into misc
+e25273a Small tweaks
+3aeebcc general cleanup, one bug-fix, better comments and consistent counter names
+681275b Merge into master from pull request #3607: BSC-3818 BSC-3817 Send SNMP traps for switch connect and port changes (https://github.com/bigswitch/bigswitchcontroller/pull/3607)
+057c888 Merge pull request #407 from Sovietaced/master
+b3a64e2 move the trigger to setRole to Master
+6a41c01 merge conflicts
+021e184 merge conflict
+a951e78 Merge remote-tracking branch 'bigswitch/master'
+26f001a Merge branch 'master' of github.com:meiyangbigswitch/bigswitchcontroller
+1e7beb7 bvs-515
+59a0e1e BSC-3818 BSC-3817 Send SNMP traps for switch connect and port changes
+d9f4312 More cli checkins together with related changes to REST API for debugCounters
+50b63fc BVS-515
+95513ad remove commented out code
+07b3a34 add cli for configuring idle/hard timeout for flows globally add fields to forwardingconfig model in bigcon to hold idle/hard timeouts add storage listeners for these 2 columns in bigfloodlight's forwarding
+8cccb54 Merge into master from pull request #3572: Fixes: non IP wildcards (BVS-525), ForwardingTest (https://github.com/bigswitch/bigswitchcontroller/pull/3572)
+c3c5269 Merge into master from pull request #3578: Enable switch read/write throttling by default (https://github.com/bigswitch/bigswitchcontroller/pull/3578)
+835eeeb First checkin for debugCounters cli. Flattened debug counters REST output a little bit.
+1c3d199 Fix input throttle test due to change in default behavior
+787ee1a Set input throttle threshold to 1000 pkt/s per switch, make configurable
+30302ee Change socket write buffer size to 128k
+4e157fa Merge remote-tracking branch 'bigswitch/master'
+c98b4a1 Don't allow matching on invalid fields in OFMatch BVS-525
+c45051b More code cleanup, better exception handling, use of package names as counter namespace, moving counter registration to init() methods, and use of metadata constants
+ec27922 Merge into master from pull request #3545: DebugEvents beta (https://github.com/bigswitch/bigswitchcontroller/pull/3545)
+b3ec886 Merge into master from pull request #3538: Register Vendor Actions on Floodlight startup (https://github.com/bigswitch/bigswitchcontroller/pull/3538)
+e411600 Merge into master from pull request #3511: Don't allow 0 MAC address. More comprehensive DevMgr unit tests. BVS-516 (https://github.com/bigswitch/bigswitchcontroller/pull/3511)
+0ac1876 code cleanup
+6776c38 Forgot about NullDebugEvent changes necessary to make unit tests pass
+9b431bc Few changes to DebugEvents - flushNow is a property of the update instead of the event - event timestamp is displayed in ISO8601 style - event registry returns an event updater object instead of the eventId - event update is done with a user defined object which is accessed via reflection and annotations - metadata is expressed using varargs and metadata string constants - changed unit tests
+1979a2b Register Standard Vendor Actions that we support on floodlight startup
+493a0c3 Throw exception when TCP header length is < 20
+c884235 Merge remote-tracking branch 'bigswitch/master' into zeromacfix
+c8dfacd Don't allow 0 MAC address. More comprehensive DevMgr unit tests. BVS-516
+8d66fd6 Merge remote-tracking branch 'bigswitch/master' into misc
+08aa4f4 Fix NPE. Don't die if switch doesn't support L2 table ext.
+bdbd8a5 Revert "Adding a couple of counters to SwitchBase"
+c2c31e7 BVS-447 Flow Path Visualization
+620c8d6 BVS-447 Flow Path Visualization
+774cd0b BVS-447 Flow Path Visualization
+07c114e Merge remote-tracking branch 'bigswitch/master' into misc
+ba4663b Adding a couple of counters to SwitchBase
+19d1808 fixing typos
+70a41bc BVS-447 Flow Path Visualization
+031288b BVS-447 Flow Path Visualization
+de6873e BVS-447 Flow Path Visualization
+60c32ce small bug fixes in debug counters
+c9119e1 Fix to NullDebugCounter makes unit tests pass
+4623056 Fixing a bunch of API calls in floodlight
+61dfccb Registering counters returns an IDebugCounter instead of a counterID. Fixing the REST API to account for hierarchical counters More unit tests.
+2bafce3 Changing DebugCounter implementation to be more like DebugEvents in terms of performace of updates. Introducing hierarchical counters, counter metatdata and finer-grained handling of counter flush. Added unit tests and changed some of the API calls
+e8b5694 Merge remote-tracking branch 'bigswitch/master' into misc
+fbbc698 Bypass currently missing L2_TABLE_SET_REPLY message
+e751d1e Add support for BSN_L2_TABLE_SET to the state machine.
+ac8c11c Merge into master from pull request #3470: Floodlight: typo in Controller.java (https://github.com/bigswitch/bigswitchcontroller/pull/3470)
+42e8230 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
+e428670 Floodlight: typo in Controller.java
+da9ed3f Merge into master from pull request #3426: Move test modules which were erroneously included in main module resourc... (https://github.com/bigswitch/bigswitchcontroller/pull/3426)
+9f019bf Fix typo in test resources property name
+024e729 Move com.bigswitch.floodlight.vendor into floodlight tree.
+1d910ad Merge into master from pull request #3453: remove duplicate IFloodlightModules that provides debugCounter/debugEvent services (https://github.com/bigswitch/bigswitchcontroller/pull/3453)
+272f9fe fix junit test failure
+dbccd97 Merge remote-tracking branch 'bigswitch/master' into bigsync
+d2b57d0 CLI expects OFPhysicalPorts being serialized. Add all DescriptionStats to REST
+c9c0f55 Fix compile errors. Was to quick with my previous commit.
+1b6e3ed Create OrderedCollection interface.
+b9e16b3 remove duplicate debug event module from resource file
+0dba3d7 fix "feature bigtap" "no feature bvs" failure
+91ebb07 Topolgoy: don't remove ports the collection returned by the switch. Make BVS port names case-insensitive
+058b4df use longer timeout in unit tests to prevent spurious failures.
+45c544f Merge into master from pull request #3428: Fix snmp MIB problem and make two static variables final (https://github.com/bigswitch/bigswitchcontroller/pull/3428)
+25f92e8 Merge into master from pull request #3430: BigTest failure fix (https://github.com/bigswitch/bigswitchcontroller/pull/3430)
+2f1e8c6 Make logger and notifier static variable final in Controller
+5c913cc Merge remote-tracking branch 'bigswitch/master' into bigsync
+e290ab3 Merge branch 'master' of github.com:meiyangbigswitch/bigswitchcontroller
+17840dc fix bigtest failure
+ad7bd7f Add unit tests for PortChange notifications. Fix some issue discovered during testing
+dea8848 Move test modules which were erroneously included in main module resources file
+443ccdf Merge into master from pull request #3402: Update thrift to newer version and regenerate files (https://github.com/bigswitch/bigswitchcontroller/pull/3402)
+e2c98e5 Don't use deprecated Assert
+4632f56 Tweaking table full handling for switches
+7837dab Update thrift to newer version and regenerate files
+c2a9a2e Merge into master from pull request #3389: [BVS-498] Prefixes for port names can be specified in the properties file in order to classify the ports as uplink ports, thus not autoportfast them. (https://github.com/bigswitch/bigswitchcontroller/pull/3389)
+4fa60ea Merge remote-tracking branch 'bigswitch/master' into bigsync
+48a8f12 Merge into master from pull request #3363: BSC-2082 Simple java wrapper for posting notification (https://github.com/bigswitch/bigswitchcontroller/pull/3363)
+2e19be3 [BVS-498] Uplink port prefixes can be specified in bigfloodlight.properties. This prefixes will be used for classifying a port as an uplink port, thus autoportfast will not be used on those ports.
+b298c1d Add flow table full log message and events
+a610b15 Queue PortStatus messages after featuresReply until we get a switch instance
+611077b Merge into master from pull request #3375: cleanup property files (https://github.com/bigswitch/bigswitchcontroller/pull/3375)
+e890662 Merge pull request #405 from vy/patch-5
+6205ef2 deviceKeyCounter is replaced with an AtomicInteger.
+d7b90ad clean up
+8ad81f8 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
+4b93d0e Merge into master from pull request #3359: Remove bigtap tests from cli coverage and ha tests. (https://github.com/bigswitch/bigswitchcontroller/pull/3359)
+6b4d21b BSC-2082 Simple java wrap for posting notification
+1f082f5 Remove source and destination port status from LinkInfo data strucuture. The source/destination port info is also removed in model and CLI.
+3af5287 updating comments
+8cd763e DebugEvent items: 1. making the API more RESTful by replacing dashes with slashes and maintaining URI tree 2. adding REST calls for listing events and resetting events 3. completing the REST API for GET calls
+76007c4 Merge pull request #403 from vy/patch-4
+9f06101 Merge pull request #398 from vy/patch-3
+018098d Merge pull request #401 from iSatoshiKobayashi/solve-junit-test
+67b0a21 Merge remote-tracking branch 'bigswitch/master' into bigsync
+8a95dc4 Port names should be case-insentive
+c4a4a5d Fix unit tests after OFPhysicalPort -> ImmutablePort changes
+6a915a9 New port handling code for IOFSwitch.
+face0d9 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
+3255b72 Add delete node option and make it so you can set domain ID and seeds at the same time
+625dc45 Merge into master from pull request #3329: Some packaging tweaks (https://github.com/bigswitch/bigswitchcontroller/pull/3329)
+ab43676 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
+9e176b8 Some packaging tweaks
+19031be A few things: 1. Moving debug event for switch connect/disconnect to Controller (from LinkDiscovery) to be consistent with Shudong's changes 2. Bug fix in OFChannelHandler that was causing NPE 3. Bug fix in DebugEvents that was ignoring flushNow directive in event registry 4. Updated unit test
+be83809 Making unit test pass
+030bf44 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
+1ec35fa Adding DebugEvent to the module listing for apps
+8ae1898 Move switch connect/disconnect event recording to Controller.java
+ab877c6 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
+77ac6d6 Changes after code review - typos and better error handling
+41c5525 Fix failing unit test.
+234de4c Update ports on OF1.2 switch from synced switch after failover.
+1f0afda Merge remote-tracking branch 'bigswitch/master' into bigsyncfix
+01c2f31 Make Device (more) thread-safe
+fd98cbe Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
+9c1a923 Merge remote-tracking branch 'bigswitch/master' into bigsync
+f6a9e0f minor change to stay consistent
+306f0c9 Merge into master from pull request #3312: Fix warnings (https://github.com/bigswitch/bigswitchcontroller/pull/3312)
+21166e7 Modifying DebugEvent web resources to be consistent with Rob's changes to DebugCounters
+36dd750 First checkin for Debug Events. Includes framework for creating events and managing memory for events via thread local stores and global circular buffers per registered event. Also includes a basic rest api call to retrieve event history. Unit tests have been added
+676fc08 Make Device (more) thread-safe
+8fa0420 Fix warnings
+c268d3d Merge branch 'bigsyncfix' into bigsync
+50ed859 Merge remote-tracking branch 'bigswitch/master' into bigsyncfix
+40f8b08 Various sync bugfixes:
+d124c70 Merge into master from pull request #3307: Fix NPE in deleteLinks() during keysModified() on Slave Node (https://github.com/bigswitch/bigswitchcontroller/pull/3307)
+7ba96eb Fix NPE in deleteLinks() during keysModified() on Slave Node
+1218c2e Use an AtomicLong for deviceKeyCounter.
+21c8c6b Add switch events for overload protection
+f60a247 Move switch event history from LinkDiscovery to Controller
+ea292eb Rename EventHistoryTopologySwitch to EventHistorySwitch
+1db225d Merge into master from pull request #3287: Debug Counters related to SyncStore for BigLinkDiscovery (https://github.com/bigswitch/bigswitchcontroller/pull/3287)
+e33e3e9 removed unused imports moved json property declaration to variable decalartion
+c5c58a4 add setters for Link class and default constructor also remove custom serializers for switch, port variables
+0f3763d Register debug counters sooner
+45569cb Add debug counters for switch overload throttle drops
+c7dbf2c Merge remote-tracking branch 'bigswitch/master' into bigsync
+e33c6e9 Merge into master from pull request #3286: Fix possible sending ofsyncvalue messages without any values (https://github.com/bigswitch/bigswitchcontroller/pull/3286)
+46224b0 Merge into master from pull request #3285: Updates to link discovery based on switch state and notification changes. (https://github.com/bigswitch/bigswitchcontroller/pull/3285)
+da112b9 Changes to switchport notifications to qualify whether a port is up or down or other_updates.
+7f36ca2 Fix intermittent test failure on slow computers
+5b7ed3a Fix possible sending ofsyncvalue messages without any values
+c502b12 Fix floodlightdefault.properties (bad merge)
+f050a4f Updates to link discovery to reflect new switch states and notifications.
+e769b0d Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
+fa4e8b1 Add application-loading capability and create debian packages for bigtap and bvs applications
+b541d29 First stab at an immutable replacement for OFPhysicalPort
+6618306 Add a utility class to convert EnumSets to/from integer bitmaps for OF types
+5a2fe60 Merge remote-tracking branch 'bigswitch/master' into bigsync
+8e93420 Fix NPE when switch doesn't have channel
+789de23 Change topologyChanged() method signature to provide an unmodifiable list of applied updates during the method call.
+71f56cc Merge remote-tracking branch 'bigswitch/master' into bigsync
+aa86ce0 First stab at having useable portChanged notifications
+245ced3 Merge into master from pull request #3271: BVS known devices for sync and small change for SwitchPort (https://github.com/bigswitch/bigswitchcontroller/pull/3271)
+04af368 Merge into master from pull request #3270: flow reconcile engine - cleanup and minor fixes (https://github.com/bigswitch/bigswitchcontroller/pull/3270)
+f759ce5 Merge remote-tracking branch 'bigswitch/master' into bigsync
+11b0cb8 Ensure that SwitchPort is immutable
+b0a8cf6 Merge into master from pull request #3268: Add event to signal when all switches have reconnected after failover. (https://github.com/bigswitch/bigswitchcontroller/pull/3268)
+29ee2ef Added a comment on the usage of default constructor for LinkInfo
+10e7ece Json Serialization fixes for LinkInfo
+dbb8263 Merge into master from pull request #3254: Fix Helium bug in switch state machine. More controller.java unit tests (https://github.com/bigswitch/bigswitchcontroller/pull/3254)
+234817a Merge remote-tracking branch 'maiergre/bigsync' into bigsync
+0d772ac Must be able to accept null FloodlightContext in handleOutgoingMessage.
+91716aa Extend device manager unit tests
+69c1510 Add missing file for.
+06a3a11 minor changes
+eb76ee2 Add event to signal when all switches have reconnected after failover.
+f1da026 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
+cc3de69 Add target to generate floodlight package
+a18e348 Merge branch 'master' of github.com:meiyangbigswitch/bigswitchcontroller
+6dbe2b1 nuke flow cache module loading from floodlightdefault
+2233088 Merge remote-tracking branch 'bigswitch/master' into bigsync
+be29b48 Merge remote-tracking branch 'bigswitch/master'
+c741a07 Respect IPv4 header DONTFRAG flag
+59f98c4 add function in devicemanager to finddevicebymac
+65c727a fix junit test failure
+a83fa82 Some bugfixes
+adf1da8 Move EPERM test to OFChannelHandler
+93c1369 More unit test coverage for Controller.java
+662b335 fix junit test
+3436340 Merge remote-tracking branch 'bigswitch/master'
+9d65a56 flow reconcile engine -- apply review comments
+0efa3d4 Merge into master from pull request #3208: Havana demo (https://github.com/bigswitch/bigswitchcontroller/pull/3208)
+f78ed55 merge conflict
+1925703 Merge into master from pull request #3237: Add AppCookie.registerApp() and block flow mod cookies (https://github.com/bigswitch/bigswitchcontroller/pull/3237)
+4da1815 Merge into master from pull request #3235: Ordering of modules for HA role change. (https://github.com/bigswitch/bigswitchcontroller/pull/3235)
+d09adf8 Make registerApp() thread safe
+888f393 Add app id to overload block flows
+99802fa Add AppCookie.registerApp() to check for unique app ID
+df0f29f resolve conflic
+288c545 Ordering of modules for HA role change.
+6c04a42 Merge remote-tracking branch 'bigswitch/master' into bigsync
+889037a Unit tests for driver manager and driver registry
+6b49dc9 Change if-then-else to switch statement.
+afe9a9e Put in placeholders for reacting to switch added and switch removed events.
+a1671f4 Add debug counter for SyncExceptions in Controller.java
+1a00eab Add debug counters to DeviceManager
+0ce6dc3 Check to make sure all switches on the path are active before establishing a flow-mod. Add a unit test to verify this is the behavior.
+7f1cad6 Add meta-data to switches indicated "debug-level"
+053e118 Merge remote-tracking branch 'bigswitch/master' into bigsync
+811b34c Add counters to controller handle switch removed from store.
+bd3d1bf Merge branch 'master' of github.com:bigswitch/bigswitchcontroller into bigsync
+d2439a5 remove json serialization
+e0f1f9a Merge branch 'master' of github.com:kjiang/bigswitchcontroller
+b80c0bf havana summit demo
+54b3ea7 Switch state sync work
+88831be Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
+66aecac Add reseeding command to bootstrap tool and fix some bugs related to reseeding. Add unit test
+d6805ce Remove portBroadcastDomainLink map from link discovery as it does not affect correctness. Remove unused variable and uncalled method.
+22f44f0 Remove switches from store after master transition that didn't reconnect.
+61a65b5 addressing some minor review comments
+e2ede86 When using fallback config, listen only on localhost
+3cf1e47 1) Add BootstrapTool that allows for configuring the system store to bootstrap a cluster without needing to use SyncClient manually 2) Configure sync service to use authenticated connections by default 3) Set up VM with a default set of authentication credentials which at the moment are simply generated a VM build time. 4) Some improvements to cleanup of netty to avoid leaving around non-daemon timer threads that prevent clean shutdown.
+2352310 Log an error and continue if a store listener throws a runtime exception
+78e80fc Fix unit test.
+1284fa6 Merge remote-tracking branch 'bigswitch/bigsync' into bigsync
+aa083ee Merge remote-tracking branch 'origin/master' into bigsynctmp
+f9fa7f7 Some small fixes.
+a5fe413 Create parent directories if needed
+bc5709a Improve logging of errors and add counters for sync protocol errors
+e4be209 Remove unused imports
+ee87026 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
+389fac5 Make bootstrapping work when using authenticated connections
+98f4026 Prompt for key store password when not given on command line
+4d63e68 Set permissions on created keystores
+8adf003 Finishing Sync of DeviceManager: add consolidate task. BVS-387
+b7c4e1b Change IHAListener. Prevent MASTER->SLAVE transition. BSC-3481
+f26c166 Increase port count for switch added test in LinkDiscoveryManagerTest to account for the fact that the quarantine port processing rate has increased from 5 ports/100 msec to 10 ports/100 msec
+e58db65 update comment on correct URL for debug counters
+d8096d5 Add drop counters that are counted on demand Add quarantine port count for rest call to /controller/status/summary Increase quarantine batch size from 5 to 10
+a7e2532 Don't call other modules from init.
+2438b51 Fix broken unit tests after merge
+44a0cde Merge remote-tracking branch 'bigswitch/master' into bigsync
+f57f20b Syncing devices using bigsync. BVS-387
+fd4db9b Add AuthTool command-line tool to create shared secret for challenge/response authentication
+d3fa485 Attempt to fix unit test when running on build server
+3fa1746 Add support for challenge/response authentication
+acf71ff Merge branch 'master' of github.com:bigswitch/bigswitchcontroller into bigsync
+571a6fb Add support for autobootstrapping a cluster without relying on manul configuration or configuration in cassandra
+6d6e9e4 Move initialization code from startupComponents to init
+257e1ee Do not flood packets on a switch in overload
+19bc7f8 Trivial merge fix for BasicFactory
+8d8b474 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
+765e57b Leftover merge conflicts. BVS-386 BSC-3482
+05042a1 Merge remote-tracking branch 'bigswitch/bigsync' into bigsync
+12cab79 BigSync for switches. Checkpoint. BVS-386 BSC-3482
+82dbaf2 Merge branch 'master' of github.com:meiyangbigswitch/bigswitchcontroller
+3117955 fix junit test
+fda2a62 BigSync updates for link discovery and topology modules.
+ce250cc bigtest fix
+07f53df Merge remote-tracking branch 'bigswitch/master'
+c80d143 Add unit test for packet in throttling
+856f81f Implement packet in throttling
+9f65af7 Flow Reconcile Engine -- Clean up + Junite tests
+d3cfbd1 Update tests
+5a8ee38 Add package qualifiers to store name
+d6debd1 Make unit test more reliable on slow machine
+bc54d86 Fix unit test
+b6647d0 Add parameter to IStoreListener to allow differentiating local vs. remote updates
+de5be34 Additional work on debug counters
+56b16e2 Merge branch 'master' of ../bigswitchcontroller into bigsync
+3bf565b Some tweaks to debug counter web interface: * Move to separate restletroutable out of core * Remove GET handlers that modify internal state * POST handler that can reset, enable, or disable the counters
+1694ff0 Add debug counters
+7e71515 Merge remote-tracking branch 'bigswitch/bigsync' into bigsync
+2af68ac Controller getSwitches() -> getSwitch(long dpid)
+2737df1 Add missing files and fix .gitignore
+c6c0b4d Remove unneeded variable
+c2bc39d Rewrite thrift generation code to handle multiple files correctly
+79ed3ce Move thrift file as well
+4badad2 Move sync service to floodlight
+e649bf5 Revert "Minor findbugs fix for OFSwitchBase"
+3c646df Rename bigsync to remove "big" from the name
+83b09f4 IHAListener.roleChanges() now only takes newRole as argument
+c9715fb Merge remote-tracking branch 'bigswitch/bigsync' into bigsync
+f03e941 Rewrite switch state management and role handling BSC-3482
+615d763 Update restlets to use newer Jackson and update related dependencies
+b41147e Merge branch 'master' of github.com:bigswitch/bigswitchcontroller into bigsync
+06cb326 Minor findbugs fix for OFSwitchBase
+42577fd Merge into master from pull request #3085: BSC-3484: Master not always handling EPERM error (https://github.com/bigswitch/bigswitchcontroller/pull/3085)
+f66683e BSC-3484: Master not always handling EPERM error
+10d6329 Add log message for switch write throttling
+1ec0c00 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller into bigsync
+54c00a0 Make ForwardingBase.blockHost() obey hardTimeout arg
+7ee18f7 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller into bigsync
+5a7d928 Reduce flowmod usage by wildcarding parts of external IP addresses BVS-437
+2eeb429 flow reconcile engine: bug fixing
+1f4a63b Fix indent
+336174e [BSC-3431] Introduce a REST API for directed-links. /wm/topology/directed-links/json will now return unidirectional links.
+f8d76ba To solve #400
+9005ccd Merge branch 'master' of github.com:bigswitch/bigswitchcontroller into bigsync
+acd90c5 Switch to Jackson 2.1, and some preliminary work for bigsync perf
+ffebd13 flow reconcile engine: set all drop flow's hardtimeout to be 5 seconds
+746e5a1 Merge remote-tracking branch 'bigswitch/master'
+1344ec2 resolve merge confilict
+3d0d6d9 Merge remote-tracking branch 'bigswitch/master'
+39b5fd8 cleanup
+a1a8d72 [BSC-3431] Introduce 'direction' as a field in LinkWithType. The REST API will now return links with direction field that will indicate if the link bidirectional or unidirectional.
+30c54e9 flow reconcile engine: handle drop flow mods reconcile
+4cec7b0 Make enableWriteThrottle() protected
+1aafc28 flow reconcile engine: permit/deny action bvs config query
+e717d5d BSC-3414: Implement writeThrottle()
+6ecf082 BSC-3414: Make send buffer size configurable
+72720ae Merge into master from pull request #2991: BSC-3397 Add IOFSwitch.writeThrottled() (https://github.com/bigswitch/bigswitchcontroller/pull/2991)
+2d99f7a Merge pull request #393 from brownsys/ofext-max-rate
+bfed2d4 BSC-3397 Add writeThrottled() for list of messages
+0cda92c Merge pull request #399 from moomindani/master
+ee9062d Remove charactor '\n' in README.md
+831228b Delete trailing whitespaces.
+b3b6e3c Delete trailing whitespaces.
+6a157c4 Delete trailing whitespaces.
+7a6515a Merge remote-tracking branch 'bigswitch/bigsync' into bigsync
+8cd655f flow reconcile engine: clean up
+1722663 BSC-3426 Add log message for port status change
+6d3e72a BSC-3426 Add log message for direct links between switches
+a162ecb Enhance the logging pattern.
+b3e05d0 BSC-3397 fix floodlight unit tests
+62656fe BSC-3397 Add IOFSwitch.writeThrottled() and make OFMessageDamper call it
+3662463 flow reconcile engine: BVS configuration support: match vlan/ipsubnet/tag/mac etc.
+aca7e59 Merge pull request #396 from moomindani/master
+fb24c01 Fix typo.
+5d97f58 flow reconciliation: device move/ link down cases handling
+1140ec7 Merge pull request #394 from kwanggithub/master
+1d37c4c Squashed commit of the following:
+a955edc Fix NPE due to missing dependency declaration of IDebugCounterService in Controller.java
+24d259e Add support for max-rate OF extension as implemented by Indigo1 firmware
+4e01c57 Merge remote-tracking branch 'bigswitch/master' into misc
+c3f7b62 Always use instanceof before casting
+3e41d2f Merge pull request #392 from vy/patch-2
+cbb106c Remove host address configurations from properties file.
+401757d flow reconciliation --host movement handling
+b2fef8b Merge pull request #391 from kwanggithub/master
+8c89937 Fix NPE (https://github.com/floodlight/floodlight/issues/382)
+5e7ef76 Merge pull request #379 from vy/hostparam
+2685794 Merge branch 'master' of github.com:sd2/bigswitchcontroller
+98d5f86 trivial change in comment
+68fa613 completing the REST-API for debug counters and fixing a bug
+4e83fac Implementing the REST-API for debug counters
+fb62471 Implementing the rest of the debugCounters API
+ba0fa0a Merge remote-tracking branch 'upstream/master' into hostparam
+cf234ee Make all channel writes go through a single function, allow override
+eaec86d Make BasicFactory a singleton
+9fdb348 fixing white space in NoOp.java
+d557724 Merge branch 'master' of github.com:sd2/bigswitchcontroller
+4533bb9 Implementing the REST-API for debug counters
+93da834 Implementing the rest of the debugCounters API
+6c1e333 Merge pull request #390 from kwanggithub/master
+6c182a2 Squashed commit of the following:
+8339011 new flow reconciliation design --new files
+2986358 first commit for new flow reconciliation design
+3a09697 Merge pull request #389 from iSatoshiKobayashi/make-log-more-detailed
+3fd825f Make log more detailed
+e7bd453 Implementing the rest of the debugCounters API
+c7164ba trival change to method access
+0d0a9e8 Merge into master from pull request #2921: Fix eclipse warnings and nits (https://github.com/bigswitch/bigswitchcontroller/pull/2921)
+89a4f90 removing unnecessary call
+e1d83db Fix warning in ControllerTest
+411ad8b Merge pull request #388 from kwanggithub/master
+acc16ef change README.txt to README.md
+dbc1505 Remove bad log message that also caused unit test failure
+4cde4de Merge pull request #387 from kwanggithub/master
+098291e update README
+e34a7a6 Merge pull request #386 from kwanggithub/master
+c5eb729 Merge branch 'master' of https://github.com/floodlight/floodlight
+7721432 update README.
+a5bc2e4 Merge pull request #385 from kwanggithub/master
+c05c2f0 update README.
+0db7b9f First check-in for debug counters
+b696642 Merge pull request #384 from kwanggithub/master
+8ba02bc update README with new project site
+45eadb1 Merge into master from pull request #2910: Handle code review from Gregor (https://github.com/bigswitch/bigswitchcontroller/pull/2910)
+c4e2dfc Define constants for IPv4 flags and offset
+6b2ddb1 Fix race condition in ControllerTest.testErrorEPERM
+d2dc727 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller into bigsync
+34e09a2 fixing tabs
+2b937a5 change to the unit test for device move
+078dccd Some changes to counter store removed dead code fixed bug on handling display of ethtypes with MSB set replaced counterkey string processing on every packet-in with tuple keys removed collection of traffic type per switch-port
+9f24d71 fix for failing tests regarding host moved
+bb3daa3 Merge pull request #383 from kwanggithub/master
+d3c8f77 Squashed commit of the following:
+41fc314 Add unit test for IPv4 fragment deserialization
+d230e50 Downgrade packet parsing error message to trace
+e7c7e97 Merge pull request #381 from moomindani/master
+0f77b28 Handle IP fragments and packet parsing errors
+68cd133 replace 0xffffffff with OFPacketOut.BUFFER_ID_NONE
+62539a4 Bootstrapping and upgrade now working with sync service
+be1b231 APPCookie change to accomodate REWRITE FLAGS
+8e2aba2 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller into bigsync
+6cac66b Initial work at bootstrapping and configuration
+a968cbb [BSC-3362] If the flowModRemoved message from a switch has a reason that's beyond the limit, round it back to the maximum valid value. This change will avoid creating a MessageParseException for invalid flowmod removal reasons.
+a73afa7 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
+7c0252c BT-168 - process all flow-mod failure cases and cleanup the policy that has this flow that failed to be pushed. BT-169 - set xid in default flow-mods in the bigtap flow cache. BSC-3361 - suppress spurious warning syslog when switch sends barrier-reply, as it is unhandled. - changes to src/main/java/net/floodlightcontroller/core/internal/Controller.java
+c2ad817 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller into bigsync
+bb9d64d Merge into master from pull request #2847: Generate launch targets with ant eclipse (https://github.com/bigswitch/bigswitchcontroller/pull/2847)
+5082175 When running 'make/ant eclipse' automatically generate Eclipse launch targets.
+a612f15 Make ControllerTest.testErrorEPERM() more robust
+5a1f3d2 Merge pull request #380 from kwanggithub/master
+0a0206b Add @Delete handling in NoOp.java
+e1b16a7 Cosmetic changes - trying to get near 80 chars
+224aeca Added support for enabling Tunnel End-points as next-hop for reaching end-points in an OF Cluster from a L3 NOF domain. o VRS detects traffic destined to TEP's MAC and !TEP IP and applies the virtual routing logic to the device corresponding to dstIp. It marks the orig dst device in the floodlight context o Forwarding checks for the orig dst device in floodlight ctxt being a TunnelEndPoint. If so, it ensures that the packet is received on the designated port for the TEP device and computes the route to the destination device as follows: o Intra Cluster SourceSwitch --> DestSwitch o Prepend {Source Switch,Port} o Append {Dest Switch,Port} o Reconcile changes in VRS and Forwarding to handle such flows. o Junit tests
+8e376f3 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller into bigsync
+f36f727 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
+1beded8 Make path cache to be a LoadingCache, to make it multi-thread safe.
+01d27fa BT-143 and BT-144 tab cleanup
+36e3601 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
+3a80fd1 changes to comments removing unused imports in ControllerTest
+fa5de47 Change buildRoute() to use only RouteId as the only parameter as srcId and dstId are included in it.
+7d3fe25 BSC-3132 Adjust the date time format
+ee7e37e Initial check-in of VRS traceroute support [BVS-356]
+8936db0 Add unit test for HA role recovery
+69bc484 Fix HA recovery code (error type/code swapped)
+870a249 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller into bigsync
+8531836 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
+b9c596a Merge remote-tracking branch 'bigswitch/master' into misc
+45b18ea Add trace log message when storage listeneres are notified.
+345b3b8 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
+4b98845 minor comment changes
+d186123 BT-143 and BT-144 : Fixed a corner case bug in qualifying a policy for duplication-free-path, even if the policy has only one delivery port, if criteria for using duplication-free path is satisfied, then compute a duplication-free path [BT-143]. Introduced a barrier between clean-all-flows and subsequent flow-mod install messages to ensure reliable clean up of flow-table [BT-144].
+d2da6cc BSC-2984 - - When computing uptimes and start times use the information provided by the JVM.
+50712e4 Add an API to set a hard timeout in routing decision
+edb9fe3 updating unit tests
+f543076 Bug fix to attachment point logic - do not treat an attachment point going from null to non-null as device moved
+98e804d code cleanup and small bug fix in devicemanager
+82e13f0 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
+8e77c71 code cleanup
+90e3a47 BSC-3132
+34f7bb3 Small bug fixes in link discovery
+9ab82ad more code cleanup and thread safety
+1237637 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
+cc80997 Code cleanup
+8aa506e Clean up code based on Sudeep's feedback [BVS-328]
+57af7fc [BSC-3247] DeviceManager must learn devices correctly when the ethernet destination MAC in an ARP response is different from sender hardware address. A device corresponding to the sender hardware address and sender protocol address needs to be learned. Update unit tests accordingly.
+dab81a5 Add ICMP Manager [BVS-328]
+f63f3a2 Add 'host' parameter to JythonServer and JythonDebugInterface.
+d9b1203 Fix DebugServer#run_server() to use 'host' parameter.
+017f72d Handle 'port' parameter of Jython in a similar way to REST and Controller classes.
+182e49e Add 'host' parameter to RestServerApi.
+bcc6231 Add an alternative getConfigParams() to access config via class references.
+f8a51af Add 'openflowhost' parameter for core.FloodlightProvider.
+6fcc36d Fixed bugs with storage source query evaluation
+ab67922 [BVS-324] Remove the usage of getAPMap() when retrieving attachmentpoints. Its use is needed only when computing duplicates.
+ab0d5d6 Don't return from inside if(log.isTraceEnabled()) BSC-3228
+c83b124 Merge into master from pull request #2616: findbugs stuff (https://github.com/bigswitch/bigswitchcontroller/pull/2616)
+b59a25d NodePortTuple class implements comparable to allow for sorting of nodeport tuples. The sorting is first based on the switch id and then on the port id.
+78d2c1d build.xml: increase findbugs memory, exclude more generated code
+51dd04e findbugs-exclude: exclude warnings about thrift generated files
+548a232 Merge pull request #377 from kwanggithub/master
+5a61944 Upgrading Virtual Network Filter to latest bigswitch/quantum plugin (/networkService/v1.1)
+9fc3a84 Merge pull request #376 from kwanggithub/master
+e0c28fd Floodlight subtree update
+a62e792 BSC-3210 - floodlight was writing a controller node into cassandra, this is incorrect. So, if the properties file does not contain controller-id set, then floodlight will write localhost, which is causing a third controller node is cassandra. also there is no need for first boot and upgrade to write controller-id into properties files. so cleaning these up.
+e8b14e2 Merge pull request #375 from kwanggithub/master
+9642fb7 Revert consolidation changes to write() methods
+5840c26 Use more aggressive findbugs settings for eclipse plugin.
+faf963a ant eclipse: create project specific config for FindBugs plugin
+3338307 Don't put project specific eclipse settings in git
+42ff9a7 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller into bigsync
+af7e303 add debug log
+f50c954 BVS-224, order the IDeviceListeners
+6e16802 OFSwitch: add caveat about undocumented behavior
+e1cb19a OFSwitchBase: fix broadcast portBroadcastCacheHitMap
+da8b030 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller into bigsync
+1f07bfc Fix findbugs issue in Forwarding module.
+e94f98a Minor changes to autoportfast default. Remove "final" to allow default to be changed, if needed.
+7e544c6 undo SuppressWarning change
+d737918 floodlight/build.xml: remove superfluous echo
+12aaecf add findbugs-exclude.xml
+214b191 add jars for Findbugs ignore annotations
+6392f0e Remove unused imports
+caf1bd0 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller into bigsync
+3cdb35a Merge pull request #365 from mwfong/producerconsumer
+c48fcd1 Use a set instead of a list to disallow duplicate entries for ignoring MAC
+b80a815 Add functionality to link discovery manager to ignore packets from certain MAC addresses
+56a1683 Fix a number of issues identified by FindBugs
+20f8f8c Remove 'assert' from unit tests
+8006400 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller into bigsync
+e60cbd8 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
+0481a98 Handling portnum correctly in portstats reply when serializing for json in response to a rest call
+417207f Minor code fixes due to FindBugs report.
+092564a Merge into master from pull request #2491: Fix NPE in LinkDiscoveryManager.java (https://github.com/bigswitch/bigswitchcontroller/pull/2491)
+c8162bb Fix NPE in LinkDiscoveryManager.java
+e8b9438 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller into bigsync
+d51ac3c Merge into master from pull request #2489: Bugfix. Should check if portBroadcastDomainLinks contains NodePortTuple, and not long. (https://github.com/bigswitch/bigswitchcontroller/pull/2489)
+5a7271f Bugfix. Should check if portBroadcastDomainLinks contains NodePortTuple, and not long.
+12f4d00 Merge into master from pull request #2488: Fix consistency and rest output for None/null values (https://github.com/bigswitch/bigswitchcontroller/pull/2488)
+5693d93 Make null values not show up in the rest output
+8f2f8fe Option to flush or not flush flow tables on a switch through properties file.
+5fb85a7 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller into bigsync
+075c7dd Fix a javadoc comment
+935fd1b Merge pull request #371 from kwanggithub/master
+8dc731c Squashed commit of the following:
+1679a90 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller into bigsync
+7a1dde4 Fix singleton task initialization
+9554233 Send HA role request to switch when master controller gets permission error
+6efcb2e Dampen frequency of HA role transitions
+078cc7e Update unit test for HA role change
+8f68af3 Merge into master from pull request #2414: lower a message level to trace (https://github.com/bigswitch/bigswitchcontroller/pull/2414)
+f37046a Merge pull request #369 from kwanggithub/master
+fcb30de Add copyright statement
+3fe5647 Merge pull request #368 from kwanggithub/master
+5b6df32 Adding copyright statements
+71f0f2c lower log level to info
+cf61fd8 Adding debug logging to SwitchPortMatcher. Tweak log levels.
+06600b4 Bug fix: When tunnel links are identified, they should not be added to topology switchportlinks. Update unit tests.
+d808dbf refactor loadbalancer to not use StaticFlowEntries
+6d7820d BVS-195, notify listeners for device classification first, then listeners for reconcile.
+215eaa4 Add RPC mechanism and a basic protocol for node communication
+c6f1225 Refactoring some methods to better support extensibility.
+fc98f1b Merge into master from pull request #2255: BVS-150 Snooping DHCP client announced hostname (https://github.com/bigswitch/bigswitchcontroller/pull/2255)
+ae0261d Merge pull request #367 from Sovietaced/sovietaced
+a1615b5 Fixed unsave ant warnings and cleaned up a few things
+254a118 Don't use vlans from devices. Use explicitly specified VLAN. BVS-187
+af73308 Merge pull request #366 from kwanggithub/master
+0faa3a8 Merge branch 'backport' of ../bigswitchcontroller
+0114e25 * Added flush () to write (List, FloodlightContext).
+b8ec8bd * Removed (currently) unused interface.
+04e6b8d An additional port type
+b9cda12 An additional port type
+c7c4286 Fix java warnings in load balancer test
+05656b1 Fix java warnings in load balancer test
+58af7f0 IPv4 octet range check
+bdf797b IPv4 octet range check
+4383f1b Adding vendor id to toString method
+a8679dd Adding vendor id to toString method
+7c97087 BVS-150 Snooping DHCP client announced hostname
+e52cecc * Consolidated write(OFMessage, FloodlightContext) and write(List, FloodlightContext); the latter now invokes the former.
+c716f5f Merge pull request #364 from Sovietaced/sovietaced
+499374a Static Flow Pusher update for OFPFC_MODIFY in the event that only actions are being changed.
+0fbf8e9 Add junit test for LoadBalancer Minor cleanup in LBVip Bug fix for removal actions in LoadBalancer
+3d9f1b3 Add junit test for LoadBalancer Minor cleanup in LBVip Bug fix for removal actions in LoadBalancer
+9fc792c * Implemented deferred (late) producer registration.
+f0d80ed Merge into master from pull request #2128: pull request for BT-95 BT-44 (https://github.com/bigswitch/bigswitchcontroller/pull/2128)
+9d58257 Merge into master from pull request #2128: pull request for BT-95 BT-44 (https://github.com/bigswitch/bigswitchcontroller/pull/2128)
+584d446 openflowj: added parsing infrastructure for custom Vendor Action classes
+3d09ffa openflowj: added parsing infrastructure for custom Vendor Action classes
+5c93c3d floodlight: statisticsmessagebase: fix possible NPE
+73e8266 floodlight: statisticsmessagebase: fix possible NPE
+1c59aa0 Setting action length for list of actions
+05d17fe Setting action length for list of actions
+686a20b Removing tab characters
+4f5e318 Removing tab characters
+2998d3b Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
+6442e0b Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
+e57a418 Add tunnelPortsUpdated variable to help track if tunnel ports were added or not when updates are applied.
+80dfcae Add tunnelPortsUpdated variable to help track if tunnel ports were added or not when updates are applied.
+87f6a01 fix tabs
+2012739 fix tabs
+cf5de13 Merge pull request #363 from kwanggithub/master
+71e8403 Merge branch 'backport' of ../bsc/bigswitchcontroller
+3b9514b Merge pull request #362 from kwanggithub/master
+f650f9f Replace REST calls in load balancer module to use internal static flow pusher calls. Remove three dependent libraries accordingly.
+e627586 Add unit test for null sw to RoleChanger
+3206efd Fix error handling during switch handshake
+90642df Fix tabs
+302a405 Committing floodlight changes
+ee637c3 Committing floodlight changes
+09fa55f Merge remote-tracking branch 'bigswitch/master' into misc
+49207d4 Add helper method that checks if an attribute equals a given object.
+d29770d Merge pull request #361 from kwanggithub/master
+3851be9 Remove non-junit unit test
+266b39b Merge pull request #360 from alexreimers/master
+f325eda Merging subtree
+de623af Merge branch 'master' of github.com:alexreimers/floodlight into backport
+bb4c8a1 FLOODLIGHT-30 - - Undo the delete by cookie optimization. It is not compatible with all switches.
+e77701a Merge pull request #359 from Sovietaced/sovietaced
+0cdcbf5 Small logical error, allowed me to push infinite rules with the same data layer
+cf054f2 Refactoring of tunnel links/ports, link discovery, forwarding base, and appropriate modifications to unit tests.
+dab5acb Merge pull request #358 from mwfong/producerconsumer
+213c8b8 Producer/consumer registration service.
+29aa25c Add isOutgoingDiscoveryAllowed(), isIncomingDiscoveryAllowed(), and getDiscoveryActions() as methods to facilitate changes to discovery procedures easily.
+2d71b2e Add isOutgoingDiscoveryAllowed(), isIncomingDiscoveryAllowed(), and getDiscoveryActions() as methods to facilitate changes to discovery procedures easily.
+5ba4ba7 Merge pull request #357 from kwanggithub/master
+7ec0996 Squashed commit of the following:
+6dad6ba Merge pull request #356 from kwanggithub/master
+6222a55 Merge branch 'master' of github.com:floodlight/floodlight
+41b16c1 Update IRoutingService javadoc
+3dc554e Merge pull request #355 from kwanggithub/master
+42c19e7 Remove commons-logging-1.1.1.jar from lib and build.xml.
+d7d4d93 Merge pull request #354 from Sovietaced/sovietaced
+87ee33a Serialization support for the DPID
+0c4ffc0 Merge pull request #353 from Sovietaced/sovietaced
+cc0600b Added serializer for firewall rules, prints readable MAC, IP addresses
+df131eb Merge pull request #352 from kwanggithub/master
+3fbea3d fix tabs in build.xml; update loadbalancer to use cookie in getRoute()
+04b40e2 Merge branch 'backport' of ../bigswitchcontroller
+192bc56 Merging subtree
+599a4a3 Merge into master from pull request #2058: BSC-3006, make thread counter an atomicInteger (https://github.com/bigswitch/bigswitchcontroller/pull/2058)
+feb55e3 BSC-3006: make the count an tomicInteger.
+fe7265c Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
+423c553 flush flowcache count before update thread count
+87f0117 Controller: allowing listeners registered for error messages to get them
+4e182b9 Controller: fixing unit test for unknown vendor message
+35ccb05 TunnelManager: BVS-70 polling
+7fd1aaa Revert "Move ForwardingTest to correct package."
+457ddf1 Merge remote-tracking branch 'bigswitch/master' into misc
+f023e10 Fix bug in DHCP parser: int to byte comaprision.
+a47eef7 Move ForwardingTest to correct package.
+78c5ca2 Merge pull request #350 from brownsys/ofext
+16633ba Merge pull request #349 from brownsys/ofqueue-structs-msgs
+d9ace24 bug fixes to OF vendor extensions
+3c226d1 add copyright,license header for OF-ext
+0c60764 queue delete should also extend queue data
+a9615f6 whitespace cleanup
+f1d5f67 initial pass at implementing OF 1.0 extensions
+86d6756 OF packet queues are always at least min size
+59105bb Merge pull request #348 from brownsys/ofqueue-structs-msgs
+6eb8ed9 add a constructor which takes a port number
+b2582ec add license, copyright header
+042d676 Copy queue entries rather than setting the pointer
+c276044 whitespace cleanup
+00b7a81 Merge pull request #347 from kwanggithub/LB
+f8f524b extend static flow name to be unique across switches
+34bc892 Merge branch 'backport' of ../../bsckwang/bigswitchcontroller into LB
+44dad72 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller into LB
+cfb56a7 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller into ECMP
+d72f0bd floodlight: adapt build.xml to master branch
+f24688e floodlight: add findbugs to build.xml
+230320a Device moved notification has to be generated when the new attachment point was already in the oldAP list.
+45e5497 initial version of OF queue structures and msgs
+5728567 updated thrift-generated file - now using thrift 0.7.0
+f09ce98 add queue messages to thrift definitions
+34710a4 Merge pull request #346 from brownsys/space-fix
+addc688 another fix for directories with spaces
+eb6fa0d Add to build.xml four lib jars needed for http client in LoadBalancer
+0c0c129 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller into ECMP
+93ec657 Merge pull request #345 from brownsys/space-fix
+0989c6b Improve handling of directories with spaces
+1feaa1f Fix tabs - another try
+b5a429a Updating floodlight subtree - fix tabs
+67067bb Merge pull request #344 from kwanggithub/master
+acff914 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
+c806e1d Fix Tabs in PortDownReconcilation and Test files.
+a669e85 Add an interface method to ITopologyService to get all the switches in the same openflow domain as a given switch id.
+b321114 Merge pull request #343 from wargoth/master
+c31e284 Updating floodlight subtree
+9842461 Add utility functions and file/method headers for load balancer
+d38db32 add library needed for load balancer
+e34357c Adjustment to attachment point logic. If a device is learnt on OFPP_LOCAL of a switch, it will stay in that port until the switch is removed or the port goes down. The attachment point of the device cannot be modified from OFPP_LOCAL, once assigned.
+ca932b3 Fixed duplicate static flow cache population
+7106b84 Merge pull request #342 from alexreimers/master
+5e0d08e Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
+c000894 FLOODLIGHT-30 - Fix sending down the flowmod.
+a21f516 FLOODLIGHT-30 - When deleting all entries put in by the static flow pusher for a specific switch or all switches use a single delete based on matching the static flow pusher cookie instead of deleting each flow individually. Note: this means that flows mods are no longer hashed to have unique cookies.
+4b4bd6a Merge remote-tracking branch 'bigswitch/master' into misc
+cab3711 Do not use bufferId and packet payload on PacketOuts. FL-89
+be25525 Merge pull request #340 from Sovietaced/sovietaced
+1496435 Merge into master from pull request #1946: openflowj: enforce buffer_id XOR payload for PacketOut (https://github.com/bigswitch/bigswitchcontroller/pull/1946)
+a933a6b Merge pull request #341 from alexreimers/master
+5c2b950 Port Down Reconciliation
+0d2f8e8 FLOODLIGHT-13 - Event history size is now configurable via net.floodlightcontroller.linkdiscovery.internal.LinkDiscoveryManager.eventhistorysize = in the properties file. FLOODLIGHT-11 - The log message for received LLDPs that we did not send out has been updated.
+825f4b8 openflowj/OFPacketOut: enforce buffer_id XOR payload
+c9d8e9c Merge pull request #339 from kwanggithub/master
+0bee08a FLOODLIGHT-28 - Change the LearningSwitch FlowMod/PacketOut buffer ID logic. We now send FlowMods with BUFFER_ID_NONE and then PacketOut the packet with the buffer ID. - Add LearningSwitch properties file options to change hard/soft flow timeouts as well as priority. - Add a learningswitch.properties file.
+35ad860 floodlight changes to accommodate future multi-route implementation - add cookie field to all getRoute() methods
+22cdfae - Add getRoutes() to IRoutingService, dummy getRoutes() to TopologyManager - update Link to be comparable/sortable - add routeCount to Route - add cookie to RouteId - make NodeDist protected
+fca68b2 Add more error checking into the links identified on ports. Classify any ports with inconsistent links seen as broadcast domain ports.
+9ec8452 Merge into master from pull request #1930: More resilient OF message handling with role changes. (https://github.com/bigswitch/bigswitchcontroller/pull/1930)
+9df8e79 More resilient OF message handling with role changes.
+08017dc Merge pull request #338 from kwanggithub/master
+ea88565 Fix tab in LinkDiscoveryManager; fix duplicate getInetAddress() after merge in IOFSwitch and test/../OFMessageDamperMockSwitch
+b8735bf Merge pull request #337 from kwanggithub/master
+54f899e Subtree update
+d57ad79 Make OFMatch fromString() recognize "0x" for NW_PROTO field.
+6131cb3 Merge pull request #333 from nilok/iofswitch-inet-addr
+a1c91a2 Merge pull request #336 from thewmf/webui
+a5c5c31 BSC-2822: add unit test
+ae762dd Merge remote-tracking branch 'bigswitch/master' into misc
+42311b9 Fix BSC-2880: "Many IP addresses learned on router interface"
+ec4b48a Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
+13a602f Initial LoadBalancer implementation - ping test successful
+4d2f9f0 Fix controller unit test
+22c60b6 Fixes to HA role request handling (Gregor's comments)
+98c96c4 Queue port status message during switch handshake
+a91b65f floodlight/Controller: fix whitespace + import
+d80c555 openflow/j: Factor out Nicira Vendor Extensions initialization to util class
+86a2301 Log switch description strings
+992cb88 Call IOFSwitch.isPortFast() in link discovery
+01106f3 Test driver binding done in order of most to least specific desc
+f0a53be UI: Improve startup responsiveness It now defers loading any data until the UI has been drawn, avoiding a blank screen. Now the dashboard is drawn (~1s) and then filled in with data. The remaining bottleneck is probably the number of XHRs; concatenating JS and templates and fetching switch data in bulk instead of individually would reduce the number of XHRs dramatically.
+76abc03 Merge into master from pull request #1907: Implement BigOFSwitchImpl, default BigFloodlight switch driver (https://github.com/bigswitch/bigswitchcontroller/pull/1907)
+066ed0a Merge remote-tracking branch 'bigswitch/master' into misc
+9f4e79f Remove final qualifier fron OFSwitchBase methods (feedback from RobS)
+007335e Remove IOFSwitchFeatures, can now be done by overriding switch driver
+aa8a491 Split OFSwitchImpl into OFSwitchBase and OFSwitchImpl
+40aec76 UI: Correctly handle switches and ports going away. Also fixed OVS local port display.
+be23f35 UI: Remove hosts from UI when they go away
+2fc41f6 UI: Added checkbox to header to control background updates
+48627d1 UI: Display controller uptime
+a5e34c8 UI: Fixed a crazy typo in flow display.
+ff5517b openflowj/BasicFactory: inject factories to all newly created objects
+2e7883e Simplify state model and move role reply handling to RoleChanger
+13ef30e Make controller role MASTER if no HA
+596679c openflowj/wildcards: integrated team feedback
+f1d6413 openflowj/Wildcards: more descriptive names
+8455fd5 openflowj/StaitisticsMessageBase: wildcard/fix type parameter of sub-statistics
+131f1e4 openflow/OFStatisticsMessageBase: fix javadoc error
+ca96c40 Forget to update unit test.
+d61bcb3 Merge remote-tracking branch 'bigswitch/master' into misc
+d916f72 Allos learning of entities on ports marked suppress-attachment-point
+b248754 Make HARoleUnsupportedException private to roleChanger
+bd4b81e Rename IOFSwitch.getRole() to getHARole(), remove isActive()
+cbaf005 Remove IOFSwitch.sendHARoleRequest()
+4e88d70 Remove IOFSwitch.getChannel()
+05c316a Add IOFSwitch.getInetAddress and comments to other interfaces
+778df0e Fix HA role related unit tests
+8fcf167 Cleanup IOFSwitch HA related interfaces
+abdc776 Rename IOFSwitch HA role request interface and add unsupported exception
+71f94dd Merge remote-tracking branch 'bigswitch/master' into misc
+7b6e232 bigbench: Fix BSC-1076 - oversized flow stats messages
+709a3b6 floodlight: add a more userfriendly wildcards object
+c506123 Several improvements and bug fixes for Device Manager:
+36701f0 create load balancer class and REST interface based on quantum LBaaS proposal http://wiki.openstack.org/Quantum/LBaaS/API_1.0
+ad2258b floodlight: add google guava library 13
+f8888eb Performance improvement for Device handling: BSC-2835
+c792725 OFMatch: add a method to debug a wildcard constant
+b628270 Adjust LinkDiscoveryManager unit tests to run faster.
+fde9ab5 Merge pull request #335 from alexreimers/master
+4a1343b Add additional system messages and add categories
+ae6d430 Fix NPE in VirtualNetworkFilter
+6cac659 Add system messages for bvs manager, arp manager, dhcp manager, and virtual routing
+9a2123a Merge pull request #332 from Sovietaced/master
+b9bba4a Merge pull request #334 from alexreimers/master
+071273f Merge branch 'master' of github.com:floodlight/floodlight
+5a45437 adding getInetAddress() as a function for IOFSwitch
+2302ff7 Updates Dijkstra's shortest path algorithm. (1) NodeDist will return the node with the smallest weight in the priority queue; (2) The algorithm will replace an existing entry in the priority queue.
+c15dd27 DeviceManager: pass IEntityClass instead of device to findClassDevice
+6f3ce53 Merge into master from pull request #1820: Fix NPE (https://github.com/bigswitch/bigswitchcontroller/pull/1820)
+b8d1c05 Fix NPE, don't process packet-in before handshake is complete
+4995bb4 Bug fix in the cluster computation code when unidirectional links are present.
+923d0ad Read topology configuration from storage and update when storage is modified.
+760376f Fixed inconsistent switch representations in log messages
+2e16c35 Merge pull request #331 from alexreimers/master
+dfd0a0d Merge pull request #329 from kwanggithub/master
+2dc6ea8 Implement OF switch driver binding
+9a0eaec More removal of OFSwitchImpl references
+36c7cff Remove references to IOFSwitchImpl, except in tests
+31dc0d7 add flowCache stub class
+9cabebe list new services in the floodlight.properties
+01b607f remove IFlowCacheService dependency
+c1dc8a4 Merge remote branch 'bigswitch/master'
+68677a1 fix unit tests
+b97c075 reduce flowReconcile rate
+8dc6314 BSC-2751, move counter update to threadLocal
+3862ee5 remove unused import
+e7c11dc Merge remote-tracking branch 'bigswitch/master' into misc
+9cbbace Switch removed update must be passed on even when no links are connected to the switch.
+963a2a2 LinkDiscoveryListener API modified to include List of LDUpdates.
+f27363e Revert "Revert "Remove code that writes runtime state for switch and switch-port to storage""
+87ddb4e Add unit test for testing the default autoportfast feature in floodlight.
+8b585d7 Cosmetic changes. Rename varialbe name topology to linkDiscovery, and getTopology to getLinkDiscoveryManager in LinkDiscoveryManagerTest.java.
+b4a2368 Merge into master from pull request #1725: Added logging for overload drop, updated parameters (https://github.com/bigswitch/bigswitchcontroller/pull/1725)
+c5cd044 Added logging for overload drop, updated parameters
+4e8f8a7 Revert "Remove code that writes runtime state for switch and switch-port to storage"
+fdb9c07 Remove code that writes runtime state for switch and switch-port to storage
+261e45b Remove readSwitchPortStateFromStorage() BSC-2728
+3c2538e openflow/OFError: add convenience constructor + whitespace
+928c293 floodlight/OFStatisticsMessageBase: add convenience method that returns the first stats-req/reply message dcontained in the body
+bf13c98 Turning the overload protection off untill we have tuned it
+78c7994 Added rudimentary overload protection to controller mainloop
+f2aad84 Minor updates
+8e4bb2e Added load monitoring utility class (for linux)
+f5a6b9a Don't include ethernet padding when parsing ipv4 packets by computing the length correctly
+6179fc6 OFStatisticsMessageBase: add a note that the type signature should be improved
+df713c6 Don't overwrite OF port's hardware mac address
+2149959 minor addition of IPv4 dl_type input handling to FirewallRulesResource
+0c1b703 Merge branch 'threadlocal-counters'
+ab1e368 Merge into master from pull request #1636: Open source stuffff (https://github.com/bigswitch/bigswitchcontroller/pull/1636)
+0d4de9e Merge pull request #327 from alexreimers/master
+d86cc37 Updated counters key to use toSting from String.format (better performance)
+9601bf3 Merge branch 'master' of github.com:floodlight/floodlight
+f8775c3 Merge branch 'master' into threadlocal-counters
+4a19bf4 Change getFeaturesReply method to 'query' so it's clear this is an external query, and avoids calling it when serializing to JSON.
+71dfb09 Switch handshake massaging.
+bbc8d2b Updated counter store for fewer string ops and therad local updates
+770e44c Merge remote-tracking branch 'bigswitch/master' into misc
+184c50a Reduce default size of OFMessageDamper cache to be nicer to the jvm
+a510923 BSC-2695 changes made per Gregor's review
+94d4177 Merge remote-tracking branch 'bigswitch/master' into misc
+9a66412 Remove unnecessary locks by using volatile and concurrent set.
+a7aea31 Merge pull request #326 from wargoth/master
+85ea08d Reverted back changes in import block
+4285d04 fix the tab error again
+1ea9758 fix merge error: remove tab
+d06640a this fixed the switches with the same DPID bug BSC-2695
+046ab4f update local view Merge remote-tracking branch 'bigswitch/master'
+ee0eb3c fix the junit test failure
+8a4249b update from master Merge remote-tracking branch 'bigswitch/master'
+c012bcb this is to fix the Switch with same DPID bug
+902407f Changes to REST API for links. http://:8080/wm/topology/links/json would now return only direct and tunnel links (LinkType.DIRECT_LINK or LinkType.TUNNEL). To get external links, use http://:8080/wm/topology/external-links/json.
+256a572 OFPacketOut message prints packetData as hexstring
+96b6701 Topology recompute task now runs every half a second.
+33472a6 Add isTunnelPort() to ILinkDiscoveryService. A tunnel port is not an attachment point port even if no links are found through it.
+ddbe012 Fixed 'illegal start of expression' when using Sun JDK 6 compiler
+6d96c23 merging in Floodlight changes
+7a8523b Merge pull request #324 from oshothebig/javadoc
+facbe12 Merge pull request #323 from alexreimers/master
+c3be8ef BDDP packets are now transmitted with BSN Eth-type. Minor refactoring of the code inclues: (1) Removal of BDDP class; (2) Using LLDP encapsulated inside BSN header for BDDP functionality.
+d3555b8 Fix an issue in the REST API where setting datalayer MAC addresses in OFActions was not getting displayed properly.
+25ec155 Merge into master from pull request #1515: TopologyManager should not process switch removed and port down messages explicitly as they are processed by link discovery module and generate corresponding link removed events. (https://github.com/bigswitch/bigswitchcontroller/pull/1515)
+24947b1 Merge into master from pull request #1514: Add RARP ethertype (https://github.com/bigswitch/bigswitchcontroller/pull/1514)
+b520756 Pretty print LDUpdate
+e1b829b TopologyManager should not process switch removed and port down messages explicitly as they are processed by link discovery module and generate corresponding link removed events.
+673c96d Add RARP ethertype
+8c5a4bd Changes to autoportfast working. Quarantining a fast port does not depend on whether the autoportfast feature is enabled or not.
+be8acc6 LLDP and BDDP should be suppressed only if the autoportfast feature is enabled.
+4d15f38 Rename isLLDPSuppressed to isLinkDiscoverySuppressed. Rewrite of autoPortFast feature and how the ports are added to quarantine and maintenance.
+c3437f9 Do not send forward LLDPs or BDDPs on fastports.
+8fa3f88 updated RoleChange unittest to allow BAD_REQUEST:EPERM
+25fc7a5 Relax our BAD_VENDOR checking to be liberal in what we receive
+e52e2d4 Fix mismatch between Javadoc comment and method argument
+667b1c9 fix queuing of flows to be reconciled
+ca1ed5c more log
+0312eb7 Firewall cleanup + allowing wildcard_hints in forwarding + Firewall unit test revision
+08b8d36 Creating RoutingDecision as only class implementing IRoputingDecision; updating all exisitng dependencies
+9e005b5 Adjust the max system load assumption for flow reconciliation
+a4055b4 Do not send PORT_UP notifications when the ports are cleared from the maintenance queue.
+4402e86 Merge into master from pull request #1375: Four individual pull requests merged. (https://github.com/bigswitch/bigswitchcontroller/pull/1375)
+0e7d420 Send switch update event as part of LDUpdate whenever addedSwitch is called.
+b10bc67 allow to flush the packet in OFMessageDamper
+74f2a55 Fix a null pointer exception. Add rest routable in link discovery only if the restApi is not null.
+4afee94 REST API for getting the list of ports that are enabled for incoming traffic.
+b3e10e7 REST API for enabling/disabling autoportfast feature in LinkDiscovery module.
+fcfca0c Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
+9fc5711 Fixed the flowMod purge sequence on switch connect. fix TABs to spaces.
+9fe524a Merge remote-tracking branch 'bigswitch/master' into spoofing
+e1726b6 Log message if isEntityAllowed returns false
+1d69273 rate limit flowreconcile, BSC-2532
+2dc11c8 Prevent unnecessary device moved notification. Change debug logs to trace logs.
+8269ac4 Merge into master from pull request #1339: Fix NPE in ForwardingVTA & Fix BigBench: ant eclipse (https://github.com/bigswitch/bigswitchcontroller/pull/1339)
+149f561 Merge remote-tracking branch 'bigswitch/master' into spoofing
+05cf1c7 Update switch features when getting new featuresReply from switch
+796f631 Add more descriptive comment
+0630468 Remove cached featuresReply from OFSwitchImpl
+11c2c4c Make show switch features go to the switch
+1b5f30b Merge into master from pull request #321: Make it possible to use LogMessageDocs on types (https://github.com/floodlight/floodlight/pull/321)
+6f5c2a6 Make it possible to use LogMessageDocs on types
+973fea2 Merge pull request #320 from maiergre/misc
+99e8486 Add FlowMod Dampening to Forwarding. Fix broken ForwardingTest.
+3620e5d Add a cache to dampen open flow messages.
+312daeb Merge into master from pull request #319: Rename BroadcastDomainResource to BroadcastDomainPortsResource. (https://github.com/floodlight/floodlight/pull/319)
+f039b66 Rename BroadcastDomainResource to BroadcastDomainPortsResource.
+68a7a45 Merge into master from pull request #318: BVS interfaces are not being cleaned up -- see BSC-2454 (https://github.com/floodlight/floodlight/pull/318)
+28870d8 Fix BVS interface deletion bug
+c4f7aca Merge remote-tracking branch 'floodlight/master' into misc
+a769770 Merge remote-tracking branch 'floodlight/master'
+e8809cc Merge pull request #317 from sriniram/master
+c2ca174 Whenever LDUpdates are applied, track to see if any links are updated. In addition, track if direct and tunnel links are updated. createNewInstance will create a new topology instance only when links are updated.
+4bced34 Merge remote-tracking branch 'floodlight/master' into spoofing
+f4bb88d Merge into master from pull request #315: Fix BSC-2514 (https://github.com/floodlight/floodlight/pull/315)
+cd85d1e Fix show switch xxx features [BSC-2513]
+ef0cc8a Merge into master from pull request #314: Add one REST API call to Topology to get route between two attachment po... (https://github.com/floodlight/floodlight/pull/314)
+e6848f1 Add python circuitpusher application built using floodlight REST API calls created apps directory to store apps
+436d786 Add one REST API call to Topology to get route between two attachment points /wm/topology/route/{src-dpid}/{src-port}/{dst-dpid}/{dst-port}/json
+e33f293 Merge into master from pull request #313: Add tons of log message documentation (https://github.com/floodlight/floodlight/pull/313)
+1c20558 Merge branch 'master' of github.com:floodlight/floodlight
+a8032d6 Add tons of log message documentation
+797d5ae Merge pull request #312 from sriniram/master
+ed14443 Introducing rate control in sending BDDP messages, quarantining ports as they join the network, change API getEnabledPorts().
+1d0b41d Correct the getToS API to return the 6-bit value
+fb37f0e Merge remote-tracking branch 'floodlight/master' into spoofing
+5d527de Merge into master from pull request #311: return correct ToS bits (https://github.com/floodlight/floodlight/pull/311)
+3268f86 Merge into master from pull request #310: Add LogMessageDoc annotation and some initial work at documenting lo... (https://github.com/floodlight/floodlight/pull/310)
+d5e8364 Add LogMessageDoc annotation and some initial work at documenting the log messages in floodlight
+70581d8 Correct the getToS API to return the 6-bit value
+29eeda5 Merge branch 'master' into wallaby
+50f8f08 Merge into master from pull request #309: Add VNF unit tests for added REST API (https://github.com/floodlight/floodlight/pull/309)
+7a794b7 Add VNF unit tests for added REST API Minor code fix in VNF Add logback.xml back for developer use to control logging level Fix git problem for compile problem due to missing file in previous pull request
+fcabe68 Merge into master from pull request #308: Support for larger port numbers in REST API (https://github.com/floodlight/floodlight/pull/308)
+0dc8a49 Merge into master from pull request #307: BSC-2322 Fix counter creation issue (https://github.com/floodlight/floodlight/pull/307)
+b86645e Fix floodlight counter creation issue
+a2fc0b7 BSC-2475: Handle rest output for port numbers larger than 32K
+5d2c766 Merge into master from pull request #306: FL-83/FL-84 Add REST API and Java API for VNF (https://github.com/floodlight/floodlight/pull/306)
+9d77515 FL-83/FL-84 Add REST API and Java API to retrieve a list of virtual networks and hosts associated.
+2d019de Merge remote-tracking branch 'floodlight/master' into spoofing
+b5c21da Merge into master from pull request #305: Send reverse LLDP only when the received messages is forward LLDP (and not BDDP). (https://github.com/floodlight/floodlight/pull/305)
+82aa5da Send reverse LLDP only when the received message is also LLDP (and not BDDP).
+af346b2 Add switchPortChanged() to IOFSwitchListener
+4a79882 Merge into master from pull request #304: Fix a potential null pointer exception while sending discovery messages. (https://github.com/floodlight/floodlight/pull/304)
+b870c73 Fix a potential null pointer exception while sending discovery messages.
+954c082 Merge pull request #303 from sriniram/master
+82ce51e Send the device moved notification only if the attachment points belong to different broadcast domains.
+38bae22 Merge remote-tracking branch 'floodlight/master' into spoofing
+04d6a71 Merge into master from pull request #302: Device moved notification must be sent after the indices are updated. (https://github.com/floodlight/floodlight/pull/302)
+3b4c61a Bug fix: Whenever a device with new entity was created that causes a change in attachment point, deviceMoved notification should be sent after the indices are updated.
+06ff592 Merge into master from pull request #301: BSC-1687 (https://github.com/floodlight/floodlight/pull/301)
+5cedf45 Merge branch 'master' of github.com:alexreimers/floodlight
+de819d8 BSC-1687 - - Add try/catch blocks around parsing flow timeouts.
+bdac401 Remove a lot of log messages that were slowing everything down
+eaebf50 Merge into master from pull request #300: Remove a lot of log messages that were slowing everything down (https://github.com/floodlight/floodlight/pull/300)
+63ae491 Remove a lot of log messages that were slowing everything down
+5315a4c Merge into master from pull request #299: Update to attachment point logic. When a packet-in is seen on the same attachment point as before, retain the old activeSince time. Update unit test to account for 1 second offset. (https://github.com/floodlight/floodlight/pull/299)
+2a29c36 Update unit test to account for 1 second offset.
+b345527 When a packet-in is seen on the same attachment point as before, retain the active since from the old one.
+925ee8e Merge into master from pull request #294: merge for change to classState map definition and some debug logs (https://github.com/floodlight/floodlight/pull/294)
+2b92c6f Made changes to test to incorpate change in classState map in device manager.
+d61997f Merge pull request #298 from sriniram/master
+7a783cd Do not push packet out if outport matches inport.
+8bd5920 Merge into master from pull request #298: Update to attachment point port. newAP is given preference if it is not a broadcast domain port and its active time is later than oldAP. (https://github.com/floodlight/floodlight/pull/298)
+06da6c4 Update to attachment point logic. NewAP is always given preference if it is not broadcast domain port and its active time is later than oldAP.
+d126c26 Rewrite of reclassify, made learnDeviceByEntity the only place where devices get created or updated (through re-allocation).
+23e35b8 Merge branch 'master' of github.com:floodlight/floodlight
+5ca25c2 Merge into master from pull request #297: Update to attachment point logic. Ignore the attachment point if it is not picked up from oldAPlist and does not replace already known AP. (https://github.com/floodlight/floodlight/pull/297)
+b46f690 If an attachment point port from packet-in does not replace already known attachment point, put it in oldAP list only if it was picked up from oldAP list. Otherwise, ignore the attachment point.
+4bf09d0 Merge into master from pull request #296: Bug fix in the attachment point learning, where previously known AP was incorrectly added to the oldAP list. (https://github.com/floodlight/floodlight/pull/296)
+5267503 Bug fix: when an attachment point from packet-in (newAP) does not replace the already known attachment point (oldAP), then we need to put newAP in the oldAPlist for possibly flagging it as duplicate in the future. Earlier, we were adding the already known attachment point in the list.
+2791966 Merge into master from pull request #295: Clear out oldAPs whenever updateAttachmentPoint() is called as it is triggered due to topologyChange and device reclassification. (https://github.com/floodlight/floodlight/pull/295)
+3ae546d Clear out oldAPs whenever updateAttachmentPoint() is called as it is triggered due to topologyChange and device reclassification.
+59502c1 Changes to classState map to use IEntityClass name as key now. Also debug logs sprayed around some methods for more visibility if required while debugging.
+f2e3c40 Merge pull request #293 from sriniram/master
+3a58a47 Update to attachment point comptuation to flag devices flapping between two switch ports. Enable duplicate mac unit tests.
+caa9f24 Merge into master from pull request #292: Bug fix in attachment point comparison. (https://github.com/floodlight/floodlight/pull/292)
+ca22fee Bug fix in attachment point comparison.
+4f3fa65 Add hook to DeviceManager to allow discarding entities before learning.
+6bb3a27 Merge into master from pull request #290: merge for fix to entityclassChanged to reclassify devices that have null entity class as well. (https://github.com/floodlight/floodlight/pull/290)
+50f6aa6 IOFSwitch: add methods to lookup ports by name or number.
+6858cca Merge pull request #291 from kjiang/master
+fc0b1a0 Add logic to select device APs in mockDevice for ease of unit-tests
+fe14eda Reclassify all devices that belong to changed entityclasses or null entity class. And also some fixes to prevent race conditions.
+209ff4b Merge into master from pull request #289: Firewall (https://github.com/floodlight/floodlight/pull/289)
+86c6ac5 Merge into master from pull request #288: BSC-2398 Add getServiceImpls() for MemoryStorageService (https://github.com/floodlight/floodlight/pull/288)
+bd3b474 Merge pull request #287 from kjiang/master
+a4e0595 order the ofmessage listeners in mockFloodlightProvider
+9865f68 Revert "Show wildcard in OFMatch toString()"
+6863b0a Show wildcard in OFMatch toString()
+01883ee Merge into master from pull request #286: merge for fixes to reclassify (https://github.com/floodlight/floodlight/pull/286)
+4cd3afa When deleting or allocating a device as a part of reclassify update the device map, primary and class indices to reflect this change.
+8133378 Undo unwanted changes
+6759e49 Merge remote-tracking branch 'floodlight/master' into bigbench
+722f1ca temp debug disable
+6b5569e Merge into master from pull request #285: Rename writeLink to writeLinkToStorage. Make these methods protected so others can extend them if needed. (https://github.com/floodlight/floodlight/pull/285)
+c949ffd FL-82 - Don't add/remove the Firewall module from the OFPacketIn listeners when enabling/disabling.
+7674fa0 rename writeLink to writeLinkToStorage. Make these methods protected so others can extend them if needed.
+aaf9616 Merge into master from pull request #284: Change time unit from sec to ms and make unit tests faster. (https://github.com/floodlight/floodlight/pull/284)
+a16fd71 FL-82 - Simply enabling/disabling the firewall and log it.
+a9ff6ab Merge remote-tracking branch 'floodlight/master' into addrspace
+6eb6c28 Merge pull request #8 from amertahir/master
+c9acf45 minor fixes
+a8fead6 Merge branch 'firewall' of github.com:alexreimers/floodlight
+4da7a66 small bug-fix and additional test case
+9bc912d Merge into master from pull request #283: merge for filtering the devices that get reclassified. (https://github.com/floodlight/floodlight/pull/283)
+8c24e71 Reclassify devices in entityClassChanged only for devices that belong to entity classes that got changed.
+a2bffd8 FL-82 - Firewall.java - Protect the firewall rules with synchronization.
+6c90b06 Merge remote-tracking branch 'floodlight/master' into addrspace
+6900a7a Change time unit from sec to ms and make unit tests faster.
+2b6b0b3 FL-82 - Fix logging in Firewall.java.
+03910fe FL-82 - Have Forwaring pay attention to IRoutingDecision.FORWARD_OR_FLOOD.
+bbeb2ad FL-82 - Cleanup Forwarding to pay better attention to IRoutingDecisions.
+1bdce61 FL-82 - Get rid of warnings in the Firewall module and test.
+0c1a271 Merge pull request #6 from amertahir/master
+e359f07 Merge pull request #282 from alexreimers/master
+60da75b FL-81 - Don't trust the buffer ID of the PacketIn if the switch has 0 buffers according to it's features reply.
+1de6c2e Merge into master from pull request #281: merge for reclassify without deleting (https://github.com/floodlight/floodlight/pull/281)
+014f9c2 Reclassify without deleting the devices on the fly - BSC-1847
+268cd36 Merge into master from pull request #277: allowing modules to transparently inherit configuration parameters from ... (https://github.com/floodlight/floodlight/pull/277)
+2d139cb Merge into master from pull request #275: removing unused empty file src/main/resources/lib (https://github.com/floodlight/floodlight/pull/275)
+c2a01eb allowing modules to transparently inherit configuration parameters from their superclasses
+ed5c431 minor cleanup
+7d74f94 Merge remote-tracking branch 'floodlight/master' into bigbench
+ce06ff1 temp changes
+e0566f4 Merge into master from pull request #280: BSC-1687 (https://github.com/floodlight/floodlight/pull/280)
+a644080 BSC-1687 - flow mod timeouts for Forwarding are now configurable via the properties file.
+6da4335 Merge into master from pull request #279: Add debug messages to device manager. Change debug messages to trace in link discovery manager. (https://github.com/floodlight/floodlight/pull/279)
+6e385e7 Add debug messages to device manager. Change log.debug to log.trace in link discovery manager.
+addef88 Remove JVM option that was leading to mem leak
+6836f60 Merge into master from pull request #278: Subtree stuff. (https://github.com/floodlight/floodlight/pull/278)
+309a5b5 Updating Floodlight subtree
+1643835 Fix tabbing.
+e2cccae more test cases, code refactoring and cleanup
+510f11c Merge remote-tracking branch 'upstream/master'
+b43b5e7 Merge into master from pull request #276: Remove info level log of sending lldp. (https://github.com/floodlight/floodlight/pull/276)
+cb09e2d Remove info level log of sending LLDP.
+b2c3c44 Merge remote-tracking branch 'upstream/master'
+17cda66 work towards ageing out stale switches
+5d6cf62 removing unused empty file src/main/resources/lib
+4c514ff Merge branch 'master' of github.com:floodlight/floodlight into hot-failover
+bbc2338 read link table on startup
+209d254 write entitities
+6b4ab18 Merge into master from pull request #274: Update for Corrupted device index (https://github.com/floodlight/floodlight/pull/274)
+67f33e7 Update for BSC-2285 (Corrupted device index)
+c467d6d Merge into master from pull request #273: added an attribute (https://github.com/floodlight/floodlight/pull/273)
+f7a6c3f Merge pull request #272 from sriniram/master
+eaab492 Fix a posisble NPE in LinkDiscoveryManager.
+094736d Merge into master from pull request #272: Fix a posisble NPE in LinkDiscoveryManager. (https://github.com/floodlight/floodlight/pull/272)
+12a8bc2 Fix a posisble NPE in LinkDiscoveryManager.
+4978f46 Add a new attribute
+3d779e0 Merge branch 'master' of github.com:floodlight/floodlight into hot-failover
+9c9d354 Merge pull request #271 from sriniram/master
+9232766 Add debug messages for LLDP discovery task rescheduling.
+8ab94e6 fixes according to feedback + test cases
+2aedffb merge with trunk
+3d64ca3 Merge into master from pull request #270: support property setting to enable/disable flowRecoconcile (https://github.com/floodlight/floodlight/pull/270)
+60b363a enable/disable flowReconcile from property setting
+93fc17b Merge pull request #269 from readams/master
+98e01e2 Show openflow clusters by default in REST API, but add a parameter to choose L2 or Openflow
+8aef8db Merge pull request #268 from sriniram/master
+cb2b928 Add port state as part of Link REST API.
+7ea7255 Merge pull request #267 from sriniram/master
+80d5081 Update the ILinkDiscovery service method to include link and linkinfo to get the link type.
+c958dfe Merge into master from pull request #266: pull request for deleteDevice method (https://github.com/floodlight/floodlight/pull/266)
+3e60534 Merge into master from pull request #265: Fix infite loop in DeviceManager (plus some code cleanup) (https://github.com/floodlight/floodlight/pull/265)
+72afdd5 method to delete a device removing all entities, updating secondary map indices first and then delete from devicemap.
+6823996 Merge remote-tracking branch 'floodlight/master' into addrspace
+3f5b9db Remove IStorageListener from DeviceManagerImpl. I didn't use it.
+d3b104c Fix inifite loop in cleanupEntities due to concurrent modification.
+d38ef32 Restructure code. Put all the constructors together! No other changes.
+79281c0 Merge into master from pull request #250: UI: Display flows better (https://github.com/floodlight/floodlight/pull/250)
+5c643e7 Merge pull request #264 from sriniram/master
+9286e6e Bugfix: floodlightProvider.getRole() returns null if the HA role is not enabled. Discovery task schedule/reschedule should include null as a possible setting for role.
+bd775a6 Merge pull request #263 from rombie/master
+8ce026b Merge branch 'master' of github.com:sriniram/floodlight
+22d5c09 Merge branch 'master' of github.com:floodlight/floodlight into hot-failover
+f82fdc6 remove unintended pyc binary object files
+06d0bfb Rechedule discovery task only if role is MASTER. Also, start the scheduling when role is changed to master.
+dbe6f9e Merge into master from pull request #262: Link discovery reschedule task is performed only if controller role is MASTER. Schedule the discovery task when role is changed to master. (https://github.com/floodlight/floodlight/pull/262)
+dea38f1 Merge pull request #260 from rombie/master
+76ddc66 Rechedule discovery task only if role is MASTER. Also, start the scheduling when role is changed to master.
+1c08bea Merge into master from pull request #261: merge request for access modifier change for change in device update. (https://github.com/floodlight/floodlight/pull/261)
+4c96aa7 Minor change to change access modifiers of change in device update.
+38e3017 Merge into master from pull request #259: Add a toString (https://github.com/floodlight/floodlight/pull/259)
+eba8656 Override toString method for OFFlowStatisticsReply
+503ec6e Make prime2 static
+3b4cf52 Merge into master from pull request #258: Log message and toString() polishing (https://github.com/floodlight/floodlight/pull/258)
+17e13a7 Merge pull request #257 from sriniram/master
+abb2ff0 Always recompute topology upon link updates.
+e73130e Merge pull request #256 from sriniram/master
+ce68c6e Bugfix: portLinks.containsKey() must use NodePortTuple as the parameter, not long.
+08d40dd Merge remote-tracking branch 'floodlight/master' into addrspace
+afe679a Merge pull request #255 from readams/master
+9249e35 BSC-2265 DHCP reserialization has IP header checksum uncorrect
+9303b1d Merge into master from pull request #254: merge request for get device iterator for query (https://github.com/floodlight/floodlight/pull/254)
+83baff3 Added a get device iterator as a result of query for devices.
+a62112d entity storage stuff
+0a752cf Merge into master from pull request #253: Make the openflow to external timeout as 30 seconds. (https://github.com/floodlight/floodlight/pull/253)
+2e74ac1 Add input port as additional field for packet hash computation - further changes
+f1d3996 Merge branch 'master' of github.com:floodlight/floodlight
+a9a69a2 Add input port as additional field for packet hash computation
+b03040e Merge into master from pull request #252: FloodlightTestModuler loader, still in beta.... (https://github.com/floodlight/floodlight/pull/252)
+b540b8d Add default cases to get rid of warnings when using the newest version of Eclipse.
+c5c7c78 Fix the comment to reflect the actual value.
+9ad1eca Make the openflow to external transition timeout to 30 seconds.
+6968f3d Merge branch 'master' of github.com:floodlight/floodlight
+14a1d36 add writeEntity()
+430b1b2 Merge branch 'master' of github.com:floodlight/floodlight into hot-failover
+5033b3a Merge remote-tracking branch 'floodlight/master' into addrspace
+5815a33 Fix build.xml for when using the FloodlightTestModuleLoader when running ant tests.
+40680b5 Merge into master from pull request #251: Updated floodlight properties (https://github.com/floodlight/floodlight/pull/251)
+1cc046d Merge branch 'master' of github.com:floodlight/floodlight
+2b284d6 More FloodlightTestModuleLoader stuff.
+a67e74c Added define for debugging with jython
+d59ec08 UI: Generalized flow display code - matches and actions display correctly.
+01efb19 UI: Clean up HTML a little.
+fff3706 Merge pull request #249 from sriniram/master
+98e055a Merge branch 'master' of github.com:floodlight/floodlight into hot-failover
+c95b103 Schedule the link discovery task on startup.
+328da12 Merge remote-tracking branch 'floodlight/master' into addrspace
+4733179 Merge into master from pull request #245: Various UI changes (https://github.com/floodlight/floodlight/pull/245)
+d3c9321 Merge pull request #248 from sriniram/master
+863df39 Merge remote-tracking branch 'floodlight/master' into addrspace
+3f8868e Remove invalid attachments before sending it for comparison in attachment point update logic.
+ebc5d94 bug fixes in REST API + cleanup + Storage support
+2f94545 Merge into master from pull request #247: Increase CONSISTENT_TIMEOUT to 30 seconds in attachment point maintenance. (https://github.com/floodlight/floodlight/pull/247)
+4031b33 Increase CONSISTENT_TIMEOUT to 30 seconds for attachment point maintenance.
+1c5053d completed REST API for rules
+5d865d3 Merge remote-tracking branch 'upstream/master'
+060486b Merge pull request #246 from sriniram/master
+f2d3fdd Send port status update from link discovery manager whenever a port status MODIFY message is received. Minor changes to printing of link discovery updates and addition of some trace logs.
+0adbc18 Merge remote-tracking branch 'floodlight/master' into addrspace
+cc2889c Log message and toString() polishing
+f4c202b UI: Fixed spaces/tabs confusion, hopefully for the last time. A few other small formatting cleanups.
+4f61acc UI: Fix topology view when you only have one switch.
+3b16b7b UI: Display switch IP address and connected since.
+1504bd2 Merge into master from pull request #244: Update attachmentpoint whenever topologyChanged() notification is received. It is not necessary to process every event; just one update call per topologyChanged() should take care of fixing all attachment point changes. (https://github.com/floodlight/floodlight/pull/244)
+d9eed7b Update attachmentpoint whenever topologyChanged() notification is received. It is not necessary to process every event; just one update call per topologyChanged() should take care of fixing all attachment point changes.
+d615e00 Merge into master from pull request #243: Don't hard-depend on topology for unit tests and fix warnings (https://github.com/floodlight/floodlight/pull/243)
+5f5c5d9 Fix import warnings
+989f5d0 Don't hard-depend on topology for unit tests
+c2db5c8 UI: Fix typo that prevented tables from being stripey as intended.
+8a52a25 UI: Remove some unused notifications.
+24cf8bb UI: New switch icon that looks more networky and less railroady.
+cc35d03 Merge pull request #242 from sriniram/master
+fe5e824 Fix a failing unit test.
+b87828c Merge pull request #241 from sriniram/master
+3a94f48 Updates to attachment point learning and udpating. DeviceManager listens to topologyChanged() events. Whenever a port goes down or a switch is removed, attachment points are updated. Cleanup of link discovery manager updates; cleanup also includes port up/down switch update/removed messages.
+2972c2b simplified firewall data structures and revised rule matching algorithm
+d34c291 Merge remote-tracking branch 'upstream/master'
+95365a1 Merge branch 'master' of github.com:floodlight/floodlight into hot-failover
+b8472b6 Merge into master from pull request #240: Move initialization of topology instance from startUp() to init(). (https://github.com/floodlight/floodlight/pull/240)
+aa4a87d Move initialization of topology from startUp() to init().
+6dbfddb Merge into master from pull request #239: Topology Manager must create new topology instance upon startup. (https://github.com/floodlight/floodlight/pull/239)
+452b407 Topology Manager must create a new topology instance in startup.
+2a7c6a1 Merge pull request #238 from sriniram/master
+606bd9e portEnabled(short) should return false if a port is not present. TopologyManager checks for "Special" ports and port status as part of "isAttachmentPointPort". The checking of this logic in devicemanager is remoed.
+a6b5fb4 Merge pull request #237 from sriniram/master
+f3b70e1 Rewrite of attachment point logic. Attachmetn points are maintained independent of entities. Update test cases. Duplicate Mac test is disabled for the time being.
+4305023 handle link removal on SLAVE
+a7d7c78 merge with trunk
+296bb09 Merge into master from pull request #235: Remove methods that change static IEntityClass variable (https://github.com/floodlight/floodlight/pull/235)
+480ac6a Remove methods that change static IEntityClass variable
+9ee908a Merge into master from pull request #234: fix null pointer exception (https://github.com/floodlight/floodlight/pull/234)
+92116b6 Add null pointer check to prevent exception
+9bab8b8 q
+dfeade8 Merge into master from pull request #233: Fixes for BSC-2134 and BSC-2148 (https://github.com/floodlight/floodlight/pull/233)
+49c5c20 Fixed prev checkin (b5f2b1b)
+7cb8b59 Merge remote-tracking branch 'floodlight/master' into misc
+b5f2b1b Fixed handling of firstRoleReplyReceived in error case
+37bc03a Made the packet dump slightly easier to read
+4b988c2 Added check for decode to avoid out of order invocation (wrt to decodeLast)
+90d3327 Merge branch 'master' of github.com:floodlight/floodlight
+a7982a9 link notification
+5129beb Merge into master from pull request #231: Do not send HA role change updates if old and new roles are the same. (https://github.com/floodlight/floodlight/pull/231)
+c8306ad Do not send HA role change upddate if the old and new rules are the same.
+7928f0c Merge into master from pull request #230: Topology manager should drop all packets if isAllowed() is false. Some code cleanup. (https://github.com/floodlight/floodlight/pull/230)
+cda2b77 TopologyManager should drop all packets if isAllowed() is false. Some code cleanup.
+16a8c07 Merge pull request #229 from maiergre/addrspace
+d5f7b44 add newline
+e2ff3bf Merge into master from pull request #228: Fix Links REST API and remove an unused serializer. (https://github.com/floodlight/floodlight/pull/228)
+250dc5a Merge remote-tracking branch 'floodlight/master' into addrspace
+d54a1a5 Fix links REST API.
+9f33d24 Fix Fowarding unit test after my last change
+4cfa141 Adding IDevice.getSwitchPortVlanIds()
+b0ec72f Tweaking ForwardingBase
+b0a574f Delete duplicate OFMatchJSONSerializer.java.
+6860c43 Merge into master from pull request #227: Going easy on the log messages. (https://github.com/floodlight/floodlight/pull/227)
+3c24165 Going easy on the log messages.
+3e9b2a6 Merge into master from pull request #225: [BSC-2136] Don't update switch/port table on SLAVE. (https://github.com/floodlight/floodlight/pull/225)
+57a2f02 Merge pull request #226 from sriniram/master
+b8ce95f Add updatesThread.
+610f55a Merge remote-tracking branch 'floodlight/master' into misc
+74c4a0d Merge branch 'master' of github.com:floodlight/floodlight
+cb07c68 dont update Switch/Port table on SLAVE
+680ae32 Merge pull request #224 from sriniram/master
+82cd951 Enable writing all links for the time being.
+4cb3dea Merge into master from pull request #222: Reduce log level of a number of log messages (https://github.com/floodlight/floodlight/pull/222)
+b5d27c1 Fix null pointer exceptions in link discovery modules.
+3e662a0 Further log message reduction
+1d090e9 Reduce log level of a number of log messages
+5f87ec5 Merge branch 'master' of github.com:floodlight/floodlight
+fe3b9b5 do not update switch info on SLAVE
+d9c3894 Update to link discovery manager. LLDPs are sent every one second; with a three second timeout on ports where links were already found. On ports where links are not present, LLDPs are sent once in every 15 seconds.
+ae256e7 Merge pull request #218 from rombie/master
+2cf4729 Merge into master from pull request #219: enhancement in NodePortTuple class (https://github.com/floodlight/floodlight/pull/219)
+bef3163 Merge branch 'master' of github.com:floodlight/floodlight
+0d41da8 packetOutMultiPort: add version with byte[] and IPacket as input
+e751f95 Merge into master from pull request #220: Add some extra debugs to switch handshake in Controller.java. (https://github.com/floodlight/floodlight/pull/220)
+5be4e03 Add support for dpid and dpid__startswith parameters to switch REST API
+6005a76 Merge branch 'master' of github.com:floodlight/floodlight
+3114415 Add a small enhancement to generate a key string for a node port tuple
+dcb8d88 Add some extra debugs to switch handshake in Controller.java.
+69ca41a Merge into master from pull request #217: Remove dead code and fix a bug in flowToDevice conversion (https://github.com/floodlight/floodlight/pull/217)
+467a5e1 Check if device AP is null before populate its AP
+a89ecd9 Remove dead code
+46d2a18 BSC-2011, update logging on exception
+6a2a30c Commit missing call to addListener()
+0e4bd76 Merge into master from pull request #216: Greatly enhance the information returned by the controller switch REST API (https://github.com/floodlight/floodlight/pull/216)
+90e92e0 Greatly enhance the information returned by the controller switch REST API
+3b1ed52 Bug fix: handleLLDP() method uses incorrect port variable when getting the state of the packet-in port.
+935881a Merge pull request #215 from kjiang/master
+9a272f0 Merge remote-tracking branch 'floodlight/master'
+1c51ce0 BSC-1892 and BSC-1891
+ab4f80f BSC-1846 : Trigger entities cleanup upon address space configuration change
+5ef00e5 Merge into master from pull request #214: Clear all links in storage when transitioning to HA Master role. (https://github.com/floodlight/floodlight/pull/214)
+8766888 Delete all links from storage when transitioning to master role.
+8a0559a Merge into master from pull request #213: Updated instrumentation for [BSC-2134] (https://github.com/floodlight/floodlight/pull/213)
+7390524 Added more instrumentation on receiving curroupted packets
+d0aec69 Merge into master from pull request #212: Change methods in DeviceManagerImpl from private to protected. (https://github.com/floodlight/floodlight/pull/212)
+552bf85 Merge remote-tracking branch 'floodlight/master' into addrspace
+8365524 Change methods in DeviceManagerImpl from private to protected.
+ed16111 Merge remote-tracking branch 'floodlight/master'
+0068af3 BSC-1846 Read address-space config from storage -- Phase 2 changes
+c813d41 Merge into master from pull request #211: handleLLDP() uses incorrect variable when getting status of packet-in port. Fixed. (https://github.com/floodlight/floodlight/pull/211)
+64285d7 Bug fix: handleLLDP() method uses incorrect port variable when getting the state of the packet-in port.
+a5130b3 Replaced tabs with spaces
+ddc1e38 Merge remote-tracking branch 'floodlight/master' into addrspace
+22a704b Entity.toString: fix mac address string length
+bae6e49 Merge into master from pull request #210: Commit to fix set/get of the ToS bits in the OFMatch (https://github.com/floodlight/floodlight/pull/210)
+6cd8ec2 Make IPacket's cloneable.
+f83c9ef Bug fix: prevCluster assignment is changed to reflect the L2 domain ID of the prev entity. It was possible for cur and prev to be swapped when duplicate attachment points were detected, where the prevCluster could have the wrong assignment.
+861d002 Merge into master from pull request #209: Assignment of prevCluster is changed to reflect the L2 domain ID of the prev entity. It was possible for cur and prev to be swapped when duplicate attachment points were detected, where the prevCluster could have the wrong assignment. (https://github.com/floodlight/floodlight/pull/209)
+a388520 Bug fix: prevCluster assignment is changed to reflect the L2 domain ID of the prev entity. It was possible for cur and prev to be swapped when duplicate attachment points were detected, where the prevCluster could have the wrong assignment.
+1b0ff81 Remove public setters for things that don't need to be set
+372d759 Correct the set/get of TOS bits in OFMatch. The 6-bits of DSCP need to be top 6-bits of the network ToS byte.
+56015b3 Merge into master from pull request #208: Another controller unit test. (https://github.com/floodlight/floodlight/pull/208)
+285303c BSC-2021 Add a unit test that makes sure an exception is thrown when someone tries to remove a switch from the active switch map.
+77aa298 Merge into master from pull request #207: Random fixes (https://github.com/floodlight/floodlight/pull/207)
+d832c42 Merge branch 'master' of github.com:floodlight/floodlight
+d3ac2ca Merge pull request #206 from maiergre/addrspace
+e5ab941 Checking for tunnelEnabled does not belong in Topology.
+1f31c82 Fix: IndexedEntity.equals() wasn't symmetric.
+fc37a72 Fix NPE
+7817a9f IDevice should not expose getEntieties()
+f36c32c Change OFPacketIn.MINIMUM_LENGTH from an int to a short. OFPacketIn.setTotalLength() expects a short.
+fa5d18d Merge remote-tracking branch 'floodlight/master' into misc
+ba552a8 Merge remote-tracking branch 'upstream/master'
+e1ac274 Merge into master from pull request #205: DeviceManager: handle null entity classes returned by classifyEntity (https://github.com/floodlight/floodlight/pull/205)
+27329c6 Merge remote-tracking branch 'floodlight/master' into addrspace
+18b3cfd DeviceManager: handle null entity classes returned by classifyEntity
+3527998 Merge remote-tracking branch 'upstream/master'
+188c03d Merge into master from pull request #204: Fix Device Manager entity handling code [BSC-2046] (https://github.com/floodlight/floodlight/pull/204)
+a548fcc Fix Device Manager entity handling code [BSC-2046]
+78f3431 Merge into master from pull request #203: Opcodes for RARP in ARP.java (https://github.com/floodlight/floodlight/pull/203)
+d6d52ae Add RARP opcodes to ARP.java.
+0ad3c7e last week's commit - fixing up firewall class and rule matching
+d293f62 Merge remote-tracking branch 'floodlight/master' into misc
+aee7293 Merge into master from pull request #202: Getting rid of warnings in generated thrift code. (https://github.com/floodlight/floodlight/pull/202)
+00a3ac2 Getting rid of warnings in generated thrift code.
+65efded Merge into master from pull request #201: IPv4.java - Add static method for IPv4 from int to byte[]. (https://github.com/floodlight/floodlight/pull/201)
+76671f1 IPv4.java - Add static method for IPv4 from int to byte[].
+0f825d2 Merge pull request #200 from maiergre/addrspace
+4caabb5 Fix problem in findDevice() and findDeviceByEntity()
+9b217a1 Add unit test for DeviceUniqueIndex
+8f8e4e5 Fix DeviceManager bug: Device.getIPv4Addresses()
+2f099ee Merge remote-tracking branch 'upstream/master'
+e786970 Merge remote-tracking branch 'floodlight/master' into addrspace
+92c5293 If a standard LLDP comes from a different network, we should drop it. The standard LLDP mac address could be :00, :03, :0e.
+a33fc51 Merge branch 'xenon' of github.com:floodlight/floodlight into xenon
+5479c06 Fixed BSC-1941. Make sure switch reference is not null
+2e7ec1f Merge into master from pull request #199: updated CLI (https://github.com/floodlight/floodlight/pull/199)
+eb3d09f updated CLI
+3ed9517 included support for rule matching and rule definitions
+69950f2 Merge remote-tracking branch 'upstream/master'
+eb7e63b EntityClass updates
+8ae5b45 minor syntax change in the REST return value
+0880ad0 minor semantics change for system uptime REST API
+40bf271 System uptime support
+10b5c91 Merge into master from pull request #198: Make getLinkType() in LinkDiscoveryManager public. (https://github.com/floodlight/floodlight/pull/198)
+17f3b82 Add getLinkType() as a public method in ILinkDiscoveryService interface.
+ab381a3 Move getLinkType() back into LinkDiscoveryManager and make it public.
+fb4758e Merge remote-tracking branch 'floodlight/master' into addrspace
+00aef54 Merge remote-tracking branch 'floodlight/master' into misc
+22ec93a Firewall - initial commit
+fafa2da Merge remote-tracking branch 'upstream/master'
+4c41c30 Merge into master from pull request #197: Re-add getLinkType() into LinkDiscoveryManager. (https://github.com/floodlight/floodlight/pull/197)
+305b82f Re-add getLinkType() into LinkDiscoveryManager.
+e51dede Merge into master from pull request #196: making it possible to get LinkType information both from LinkInfo.getLin... (https://github.com/floodlight/floodlight/pull/196)
+abc0220 making it possible to get LinkType information both from LinkInfo.getLinkType() and the REST API
+cf9ff7f Merge into master from pull request #195: The Web UI now has icons and stuff (https://github.com/floodlight/floodlight/pull/195)
+a903fcf UI: Improved topology view, including icons for servers and switches. (These icons were designed from scratch by me with ASL 2.0 license.) Nodes are now labeled with their name (DPID or IP+MAC). Added a hack to ignore multiple attachment points for hosts, since Floodlight's concept of attachment points doesn't correspond to the physical topology.
+9a5b450 Merge remote-tracking branch 'floodlight/master' into misc
+436a143 Merge remote-tracking branch 'upstream/master'
+99c8b76 DeviceManager now depends on IEntityClassifierService
+cf39fa0 Cleaned up formatting.
+d2ac317 Add IDevice.getEntities().
+bff1a6e Merge pull request #194 from kjiang/master
+fd01775 Fix a NPE
+16bfdd8 Fixed BSC-1941. Make sure switch reference is not null
+693443c Merge into master from pull request #193: Added less confusing constructor for OFActionOutput (https://github.com/floodlight/floodlight/pull/193)
+a027e98 Added less confusing constructor for OFActionOutput
+f837228 Merge remote-tracking branch 'upstream/master'
+368a5ae Fix a NPE
+d848660 Fix indentation and add comments
+e541558 Update entity classification
+d0a3bbf Merge into master from pull request #192: Fix an issue with static flow entry pusher where it was not correctly (https://github.com/floodlight/floodlight/pull/192)
+de9a560 Fix an issue with static flow entry pusher where it was not correctly computing the wildcard.
+a2b37a2 Floodlight Firewall skeleton code
+a842b01 Merge into master from pull request #190: Don't set role again if it's the same. Partial fix for BSC-1835 (https://github.com/floodlight/floodlight/pull/190)
+3229f5c Merge into master from pull request #191: Fix a topo issue and comment updates. (https://github.com/floodlight/floodlight/pull/191)
+88fb52f Don't set role again if it's the same. Partial fix for BSC-1835
+3d8cfa2 1 - Fix an issue is getRoute function where an extra hop was being added on the front/end. 2 - Fix some tabbing.
+cf32b0b Small comment update.
+82b4a63 Merge into master from pull request #189: Make role change code more robust. (https://github.com/floodlight/floodlight/pull/189)
+b79aef2 Merge remote-tracking branch 'floodlight/master' into ha-role
+164ce03 Merge into master from pull request #188: Update to getRoute() method to provide complete path even when only one switch is involved. (https://github.com/floodlight/floodlight/pull/188)
+8047029 getRoute() method must provide the complete route from source port to destination port even when the route involves only one switch. getRoute() must also not provide route from same switch-port to itself.
+6f08fdc Merge into master from pull request #187: Refactoring of Route class. (https://github.com/floodlight/floodlight/pull/187)
+cfcf4c6 Refactoring Route class and getRoute() methods to maintain and provide a sequence of switch-ports, rather than links. Update unit tests accordingly.
+54ebee4 Merge into master from pull request #186: Link discovery manager must send LDUpdates when port status change affects existing links. (https://github.com/floodlight/floodlight/pull/186)
+25946ee Link discovery manager must send LDUpdate when port status change message is received if it affects any links that is already known.
+e24b8ce Merge pull request #185 from sriniram/master
+4cca8f3 Link discovery manager must ignore all addresses in the link-local range.
+9ecd0fe Merge remote-tracking branch 'floodlight/master' into ha-role
+8671b6a Merge into master from pull request #184: system uptime support (https://github.com/floodlight/floodlight/pull/184)
+95034ba minor syntax change in the REST return value
+22d692e minor semantics change for system uptime REST API
+6bfeba4 Merge into master from pull request #183: system uptime support (https://github.com/floodlight/floodlight/pull/183)
+e063071 System uptime support
+4635a5c Merge pull request #182 from sriniram/master
+44cb860 If a standard LLDP comes from a different network, we should drop it. The standard LLDP mac address could be :00, :03, :0e.
+3a1fbd8 Merge remote-tracking branch 'floodlight/master' into misc
+9faa803 Merge into master from pull request #181: Added compileall (https://github.com/floodlight/floodlight/pull/181)
+4f49309 Added compileall from jyton package Fixed missing paren in PythonServer
+c2cd414 Merge into master from pull request #180: Use officially assigned BSN ethertype (https://github.com/floodlight/floodlight/pull/180)
+d4f4d32 Use officially assigned BSN ethertype
+7e07b35 Merge into master from pull request #179: Refactoring of methods in topology. (https://github.com/floodlight/floodlight/pull/179)
+8db1a8f Refactoring of how isAttachmentPointPort() and isInternalToOpenflowDomain() are implemented.
+6482228 Merge into master from pull request #178: added `make check` alias for `make tests` (https://github.com/floodlight/floodlight/pull/178)
+b424b60 added `make check` as alias for `make tests`
+3e8e2b5 Change link discovery dst mac to 01:80:c2:00:00:0e
+e05e132 Merge into master from pull request #176: Change LLDP destination mac to 01:80:c2:00:00:0e (https://github.com/floodlight/floodlight/pull/176)
+45e3709 Merge pull request #177 from sriniram/master
+77f9cce Remove IRoutingService dependency from LinkDiscoveryManager.
+e7611eb Change link discovery dst mac to 01:80:c2:00:00:0e
+2b46980 Merge into master from pull request #174: UI: Fix topology graph, various other small improvements (https://github.com/floodlight/floodlight/pull/174)
+cfb0a28 Merge into master from pull request #175: Fixed to VirtualNetworkFilter. (https://github.com/floodlight/floodlight/pull/175)
+f347603 Fix a null pointer exception in creating virtual networks.
+38813c7 UI: Display port state (up/down) and speed. Display port name (ethN, brN, etc.) for OVS ports. Cleaned up some more formatting.
+fb47ccd 1 - Fix gateway handling in VirtualNetworkFilter. 2 - Fixed an issue in DeviceManagerImpl where it was sending updates with the old device.
+d54dfe2 UI: Display errors and dropped packets on each port.
+0ba3be4 Merge remote-tracking branch 'floodlight/master' into misc
+7f817bb Merge remote-tracking branch 'maiergre/misc' into misc
+3a50b3a Merge branch 'master' of https://github.com/floodlight/floodlight into webui
+a29007d UI: Update topology graph due to REST API changes.
+6d29ec1 UI: Make switch list a little prettier while it loads. (For some reason the switch list takes ~10s to load, and I'm running on a monster server.)
+ee9658a Merge into master from pull request #173: Update Web UI to match recent REST API changes (https://github.com/floodlight/floodlight/pull/173)
+240abb7 UI: Make host last seen human readable instead of a Unix timestamp.
+15695d7 UI: Give host models a proper id to fix infinite hosts problem. Updated UI to match REST API changes. Commented out references to VLANs since they're not implemented. Fixed some more space/tab formatting.
+4273f9d Correctly display host attachment points in UI due to REST API change. Also fixed some tab/space formatting inconsistency.
+9ab05d7 Remove placeholder text from UI topology page.
+a88dca3 Reverse the sequence of operations to do when a switch is added - first clear all flow mods and then dispatch switch added callbacks in dispatch thread. Else we have a race condition.
+37f9676 Reverse the sequence of operations to do when a switch is added - first clear all flow mods and then dispatch switch added callbacks in dispatch thread. Else we have a race condition.
+5daedb5 Consolidate queryHandler function. [#28391421]
+826bbd7 Move FC query interface to floodlight
+042a448 Merge into master from pull request #172: Warn if programming a flow with broadcast destination (https://github.com/floodlight/floodlight/pull/172)
+c5e61ea Warn if programming a flow with broadcast as destination
+939f927 Merge remote-tracking branch 'floodlight/master' into misc
+8cac6a2 Merge into master from pull request #171: Add flowCacheService interface (https://github.com/floodlight/floodlight/pull/171)
+f120eff update context names
+32bb31b Merge pull request #170 from sriniram/master
+c41f434 Foratmatting fixes.
+a085930 Consolidate queryHandler function. [#28391421]
+7a567d6 Move FC query interface to floodlight
+9ebf9a1 Merge pull request #169 from sriniram/master
+4f0a435 Merge pull request #168 from sriniram/371a592f1fbae4bd0917d8ebf94f5f4ca0c9c7c6
+f6dc73e Update DeviceManagerImplTest as attachment points are not dependent on topology last update time.
+371a592 Removing reliance on topology last update time.
+6ea4281 Merge into master from pull request #167: Enhancements to Topology REST API. [#28640601] (https://github.com/floodlight/floodlight/pull/167)
+2931b14 TopologyManager: make sure to use getCurrentInstance() everywhere. [#28640601]
+f461b21 Enhancements to the Topology REST API.
+c3ec93a Merge pull request #166 from sriniram/master
+fa6cea8 Updates to DeviceManagerImplTest corresponding to changes in attachment point computation using topology last changed time.
+bc0d4e0 Merge pull request #165 from sriniram/master
+2c5ad16 Ignore entities whose last seen times are earlier than topology changed time.
+6bd7020 Merge remote-tracking branch 'floodlight/master' into misc
+556f162 Merge pull request #164 from alexreimers/master
+f38124d Some minor code cleanups adn comments.
+71b6b92 Merge remote-tracking branch 'floodlight/master' into misc
+8006be2 Merge into master from pull request #163: Remove useless extra logging of stack trace and Don't try to clean out old ports in case they're not really in storage (https://github.com/floodlight/floodlight/pull/163)
+cba9e3d Don't try to clean out old ports in case they're not really in storage
+e676bfd Remove useless extra logging of stack trace
+623c14f Merge into master from pull request #162: Send LLDPs for all the switches first; then followed by BDDPs. (https://github.com/floodlight/floodlight/pull/162)
+d97bcb3 Controller: disabling the deletion of old ports for now
+1bc28ca When sending LLDPs and BDDPs from all the switches, send LLDPs first and then BDDPs. This would enable direct links to be detected first and reduced instability.
+4fae3b6 Merge remote-tracking branch 'floodlight/master' into misc
+efcfc51 Add linkType to linkEventHistory
+b053481 Add linkType to eventHistory
+188e4ef Merge into master from pull request #155: Register everything as an HA role listener where it was missing (https://github.com/floodlight/floodlight/pull/155)
+328791e Merge into master from pull request #161: VirtualNetworkFilter now allows any DHCP traffic. (https://github.com/floodlight/floodlight/pull/161)
+1bf172b Fix build issues caused by the introduction of PacketFactory. Now the net.floodlightcontroller.core.test.* files will not try to be run as jUnit tests.
+18d3bba VirtualNetworkFilter now allows any DHCP traffic.
+361e843 Merge remote-tracking branch 'maiergre/misc' into misc
+65bcb81 Merge remote-tracking branch 'floodlight/master' into misc
+e034cbb Merge into master from pull request #158: Document the new ITopologyService method (https://github.com/floodlight/floodlight/pull/158)
+99f0cd1 Merge into master from pull request #159: Read port data from storage when switching to master state (https://github.com/floodlight/floodlight/pull/159)
+c6ac712 Read port data from storage when switching to master state
+f5aa814 More documentation in the new topologyService method, getLastLinkUpdates()
+3afcf22 Merge remote-tracking branch 'floodlight/master' into misc
+9149ffa Merge into master from pull request #157: Change app ID for VirtualNetworkFilter. (https://github.com/floodlight/floodlight/pull/157)
+642dbb4 Change app ID for VirtualNetworkFilter.
+5357083 Merge into master from pull request #156: get link notification from topology instead of linkDiscovery. (https://github.com/floodlight/floodlight/pull/156)
+f5fa85e Register everything as an HA role listener where it was missing
+c0ae727 topology keeps a list of applied link updates. topologyAware modules can query updated links after getting topologyChanged event
+9811489 Merge branch 'master', remote-tracking branch 'floodlight/master' into misc
+473585c Merge into master from pull request #153: add FlowReconcileService to DeviceManager's dependency list (https://github.com/floodlight/floodlight/pull/153)
+7b2c8e1 add FlowCacheService to DeviceManager's dependency list
+f041fb7 Merge remote-tracking branch 'maiergre/master' into ha-role
+8e2f3bd Adding unit test for Role Changing code in Controller and OFSwitchImpl.
+9c2bdeb Adding unit test for Role Changing code in Controller and OFSwitchImpl.
+cbb787f Merge pull request #152 from sriniram/master
+8a678cb Added a method to ITopologyService to get the blocked ports across all topology instances.
+437ccd2 Merge into master from pull request #151: Fix warning (https://github.com/floodlight/floodlight/pull/151)
+56b46a7 Fix warning in ForwardingBase
+98401dc Merge into master from pull request #150: Minor adjustment to link discovery and add switch broadcast cache to ForwardingBase (https://github.com/floodlight/floodlight/pull/150)
+35758a7 Minor adjustments to link discovery and forwarding [#30267549]
+5977b20 Merge into master from pull request #149: Add a flow reconciliation pipeline (https://github.com/floodlight/floodlight/pull/149)
+4628509 rename an enum value
+e58c89c Merge remote-tracking branch 'floodlight/master'
+458b3b9 Merge pull request #147 from sriniram/master
+d35aae0 Update to attachment point flapping logic. Use active time instead of last seen to order the entities. Corresponding changes to unit tests.
+85dc95b Merge into master from pull request #146: Change domain based hash to switch based hash (https://github.com/floodlight/floodlight/pull/146)
+0d7a6a2 Broadcast cache with domain hash too restrictive
+76c0f4c Making role request message more robust. Checkpoint.
+859edb7 Add flowReconcileService
+1639f2e Merge into master from pull request #145: Floodlight VirtualNetworkFilter. (https://github.com/floodlight/floodlight/pull/145)
+b18b8e6 Fix unit test with flowReconcileService interface
+c0bddbf Fix VirtualNetworkFilter gateway learning.
+7fa0045 VirtualNetworkFilter - Handle ARP to the gateway.
+a847b48 Update VirtualNetworkFilter.
+e010828 VirtualNetworkFilter.addHost() now uses Network ID instead of network name.
+8fb7496 Unit tests and REST API for VirtualNetworkFilter.
+23b7b10 Initial OpenStack (Quantum) checkin. Still todo: 1 - Unit tests 2 - REST API 3 - Handle multicast/broadcast
+a0eb40b flowReconcile pipeline
+5cbd579 Merge into master from pull request #144: Minor improvements to link discovery and forwardingbase (https://github.com/floodlight/floodlight/pull/144)
+6668294 Improve send LLDP and add a couple of forwarding utilities [#30267549]
+a79a9e2 Merge into master from pull request #143: Use lower case project name since people on weird systems like MacOS … (https://github.com/floodlight/floodlight/pull/143)
+9a802ec Fix warnings
+651e04a Merge into master from pull request #143: Use lower case project name since people on weird systems like MacOS … (https://github.com/floodlight/floodlight/pull/143)
+17d705f Use lower case project name since people on weird systems like MacOS seem to have problems
+b36aec4 Merge into master from pull request #142: topology changes (https://github.com/floodlight/floodlight/pull/142)
+a899e3c [#28380339] -- changes in topology to enhance dijkstra
+7477608 Merge into master from pull request #141: Add flow cache interfaces (https://github.com/floodlight/floodlight/pull/141)
+dafa9a7 remove switchDpid from OFMatch
+8f1a567 fix warnings
+403e4a4 remove switchDpid from OFMatch
+7c2a954 integrate with topo
+917e0a9 flowcache pipeline work
+387fd2f remove switchDpid from OFMatch
+d082c32 initial FC re-work
+599fe8d fix the eclipse setup issue on packetStreamer
+ff83dc5 Merge into master from pull request #137: topology ui: more error checking (https://github.com/floodlight/floodlight/pull/137)
+326a351 Merge into master from pull request #138: Add attachment point and link discovery suppression (https://github.com/floodlight/floodlight/pull/138)
+e139dfc topology ui: weight tweaks for style
+02adcdf topology ui: bigger nodes
+72793d4 topology ui: more error conditions
+365a6e5 Attachment point and link discovery suppression [#30267549]
+29671bf Merge into master from pull request #136: Topology changes. (https://github.com/floodlight/floodlight/pull/136)
+aef26f3 DeviceManager update to take into account that previous attachment belongs to non-broadcast domain attachment point. Adding an interface to ITopologyService that indicates if tunnels are enabled for traffic between two hosts.
+8631b45 Merge commit '249f7a187c14d32415bfcac7ae9573137590c366'
+249f7a1 Add json dependency
+154a367 Avoid serializing channel to json
+642846b Update device manager to handle consistent attachment points to properly handle duplicate device flagging.
+c9cb025 Merge into master from pull request #134: dont automatically rebuild thrift (https://github.com/floodlight/floodlight/pull/134)
+440b24a dont automatically rebuild thrift
+c4d3953 Merge into master from pull request #133: Easier packaging (https://github.com/floodlight/floodlight/pull/133)
+239ab66 simplify build by removing packetstreamer jar
+cbe5e10 add optional ant targets to generate thrift code
+d6d5793 Merge branch 'master', remote-tracking branch 'floodlight/master' into ha-role
+ad1bf82 Merge into master from pull request #132: Implement IHAListener in device manager (https://github.com/floodlight/floodlight/pull/132)
+453b747 Implement IHAListener in device manager
+78bffca add a lib ant property
+8a41ddc set javac source and target explicitly
+9a43f11 Merge into master from pull request #130: Remove unused class (https://github.com/floodlight/floodlight/pull/130)
+b80d970 Merge into master from pull request #131: move Debian packaging to a separate repository (https://github.com/floodlight/floodlight/pull/131)
+727e9e1 move Debian packaging to a separate repository
+326dde8 Remove unused class
+29988d7 Bug fixes to topolgy changes.
+8e7c8fe Merge into master from pull request #129: Changes to role request support for HA (https://github.com/floodlight/floodlight/pull/129)
+646561a Fix to serial failover unit test to work with changes to handling of role changes in controller
+9ac17d5 Tweak to code that sends role updates to the switches.
+6877fc5 Don't treat it as an error of the file pointed to by the HA-related rolepath property doesn't exist
+d02522c Fixed incorrect merge problem.
+cd3e6ac Additional comments for configurable controller ID
+149db29 REST API support for getting per-switch HA role info
+ecba53e Initial changes for topology.
+40e39e3 Merge into master from pull request #128: Add @JsonIgore to length fields for OF statistics replies (https://github.com/floodlight/floodlight/pull/128)
+bc3227f Add @JsonIgore to length fields for OF statistics replies
+5cc070e Remove duplicate method in IOFSwitchImpl
+7bda91d Cleanup OFMessageFutures
+ab6eaea add log msg to track switch connection state
+f759b90 Merge into master from pull request #110: Add a class for LLDP Organizationally Specific TLV (https://github.com/floodlight/floodlight/pull/110)
+6f217f9 Merge into master from pull request #127: Create controller_switchconfig table (https://github.com/floodlight/floodlight/pull/127)
+38912f9 Create controller_switchconfig table
+3604d8d Merge into master from pull request #124: Fix test issue related to duplicate devices (https://github.com/floodlight/floodlight/pull/124)
+58ca335 Don't block attachment points in the same broadcast domain
+52cba5d Merge into master from pull request #123: Add support for __startswith parameters when querying for device info (https://github.com/floodlight/floodlight/pull/123)
+be8fe50 Add support for __startswith parameters when querying for device information. Some minor refactoring
+ff80729 Merge into master from pull request #122: move core_switch to switchconfig (https://github.com/floodlight/floodlight/pull/122)
+bcd18f0 Move core-switch from controller_switch to controller_switchconfig
+92f23d3 Merge into master from pull request #121: Add API to IFloodlightProviderServer to return the current Controller IPs. (https://github.com/floodlight/floodlight/pull/121)
+4fc9667 Add API to IFloodlightProviderServer to return the current Controller IPs.
+7c5d4ff Merge into master from pull request #120: Clean up serialization for REST APIs. (https://github.com/floodlight/floodlight/pull/120)
+0af960b Fix warning by removing unused import
+a76e1ab suppress lldp related interface extension [#28380845]
+cd4a948 Clean up serialization for REST APIs. Get rid of the jackson converter module and just use annotations everywhere when appropriate. There may still be a desire for something like the jackson converter module but it didn't really mesh with the plugin system, and the annotations work nicely.
+50d9dcb Merge into master from pull request #119: debian packaging: add versions to Build-Depends (https://github.com/floodlight/floodlight/pull/119)
+ad158c6 Merge into master from pull request #118: Newdevicemanager! (https://github.com/floodlight/floodlight/pull/118)
+845ce4e Merge branch 'master' of github.com:floodlight/floodlight into newdevicemanager
+d54c2c8 Merge into master from pull request #116: Add API and notification to controller node IP address (and changes). (https://github.com/floodlight/floodlight/pull/116)
+d8b1fa1 Merge branch 'master' of github.com:floodlight/floodlight into newdevicemanager
+ad745c6 Merge remote-tracking branch 'floodlight/master'
+a737bf9 Merge into master from pull request #115: debian packaging: use system libraries when possible (https://github.com/floodlight/floodlight/pull/115)
+8cb107d debian packaging: add versions to Build-Depends
+f6fa3ce debian packaging: use system libraries when possible
+42df79b ControllerTest: cleaning up un-used imports
+4dc893d Controller: HA support for switches that have older v1.0 style serial failover [#28337615]
+3b72d7e Merge branch 'master' of github.com:floodlight/floodlight into newdevicemanager
+7258854 Merge remote-tracking branch 'floodlight/master'
+23a4706 Add API and notification to controller node IP address (and changes).
+a7c8be7 debian packaging: java build dependencies
+f1c233f create floodlight-nodeps.jar without included dependencies
+9e32e78 Merge into master from pull request #113: debian packaging: fix lintian warnings (https://github.com/floodlight/floodlight/pull/113)
+4a5ca78 debian packaging: fix lintian warnings
+2615aa5 Merge into master from pull request #111: Debian packaging (https://github.com/floodlight/floodlight/pull/111)
+51f8fe1 debian packaging: add a floodlight man page
+62fbf37 debian packaging: add init script
+e7d93a1 Merge branch 'master' of github.com:floodlight/floodlight into newdevicemanager
+f6f2143 debian packaging: update copyright
+d9c1d66 debian packaging: remove example files
+c27601d debian packaging: fill out control fields
+6b422db debian packaging: use javahelper
+294f356 debian packaging: install floodlight jar and wrapper script
+db011b4 add a .gitignore to the debian directory
+c28cdef initial commit of debian packaging
+da3c294 Merge pull request #107 from oshothebig/lldp-magicnum
+7ba6129 Add a class for LLDP Organizationally Specific TLV
+2400741 Controller: cleanup to roughly stay within 80 cols.
+2659b30 Add some additional unit tests and remove some dead code
+5140108 Merge into master from pull request #108: Fix bug in HexString when MSB is set. (https://github.com/floodlight/floodlight/pull/108)
+e89258a Merge into master from pull request #109: Fix a null pointer exception in DeviceManagerImpl [Bug #436: Resolved]. (https://github.com/floodlight/floodlight/pull/109)
+9a2284a Add some additional unit tests and change error status to null from NONE. Some minor serializer cleanup
+5b02ebd Fix a null pointer exception in DeviceManagerImpl [Bug #436: Resolved].
+3ec16fb Merge remote-tracking branch 'floodlight/master'
+7df21a9 Fix bug in HexString. Increase test coverage for it
+1eb5476 Merge branch 'master' of github.com:floodlight/floodlight into newdevicemanager
+8d98de6 Remove use of magic numbers for the values of length
+71d58a1 Very, very, very simple cli that just outputs json at this point
+7ccc6b2 Merge into master from pull request #106: Add a config parameter to change the port the Jython server runs on. (https://github.com/floodlight/floodlight/pull/106)
+65990c9 Add a config parameter to change the port the Jython server runs on.
+34c4039 Have git ignore the logback.xml file.
+0807ef5 Fix null pointer exception
+0fca30b Merge branch 'master' of github.com:floodlight/floodlight into newdevicemanager
+a7f4cc9 Add a debug REST API to get raw device entities. Fix attachment point blocking code and make it appear in the REST output
+3b80438 Merge branch 'master' of github.com:floodlight/floodlight
+3c9501c Ajax updates for UI.
+98ae0c4 Merge into master from pull request #105: topology ui: more error checking (https://github.com/floodlight/floodlight/pull/105)
+cd98c65 don't break when updating devices
+c6f7e08 change unit test from sleep to a wait loop with timeout minor toString fix in Device
+f94d79b Correct race condition in device learning and topology, remove deviceManager from listening linkEvent
+a2f4842 Revert "Update device AP when necessary"
+c8e31bb clean up log msg
+cd06f86 Update device AP when necessary
+b739991 clean up blocking algorithm for all APs when topo changes
+6a8e984 reset device AP conflict state when topology merges
+a02cd64 remove BD-BD damping timer
+2b9544c Revert "stop packet processing when updating deviceMgr with new topo"
+ff30b91 format update
+42eb5fa stop packet processing when updating deviceMgr with new topo
+1677f28 topology ui: more error checking
+b66d21f Merge into master from pull request #104: topology ui: show vendor names in switch view (https://github.com/floodlight/floodlight/pull/104)
+19a9223 topology ui: show vendor names in switch view
+660d398 Merge into master from pull request #103: topology ui bugfix: don't assume hosts have ips (https://github.com/floodlight/floodlight/pull/103)
+3bb4c0c topology ui bugfix: don't assume hosts have ips
+1faa74b Merge branch 'master' of github.com:floodlight/floodlight into newdevicemanager
+bb1eef0 Fix some failing unit tests
+07c2b20 Merge branch 'master' of github.com:floodlight/floodlight
+95ffc07 don't break when updating devices
+f023462 Fix bad merge
+146dd54 Merge branch 'master' of github.com:floodlight/floodlight into newdevicemanager
+0d58062 Merge into master from pull request #102: Add support for generating test coverage using cobertura (https://github.com/floodlight/floodlight/pull/102)
+5b58c47 Add support for generating test coverage using cobertura
+f643eef Add some preliminary support for showing blocked attachment points
+c2057e0 Merge into master from pull request #101: Enhance TopologyManager REST API. (https://github.com/floodlight/floodlight/pull/101)
+d70b6de Fix LinkDiscoveryManagerTest. [#28640601]
+59e7c41 Add to the Topology REST API. You can now get tunnel links and broadcast domain ports. [#28640601]
+bb29bd7 Removing a couple placeholders unlikely to be filled in for the near future. Would be great to get uptime but have no api for it right now.
+eea5c33 Revert window size in topology - doesn't work for larger topologies.
+4a26c0c Cleaned up web ui with Floodlight logo
+a26df4a Merge branch 'master' of github.com:floodlight/floodlight into newdevicemanager
+2e09336 Add support for supressing attachment point flapping using an 'active' concept
+b091c70 Merge into master from pull request #99: Online javascript files (https://github.com/floodlight/floodlight/pull/99)
+d38e807 Merge into master from pull request #100: Reenabled the mechanism for initializing the HA role of the controller from a file (https://github.com/floodlight/floodlight/pull/100)
+5469742 Necessary javascript files are no longer online.
+f32cd2e Reenabled the mechanism for initializing the HA role of the controller from a file
+dd2e5c1 Merge branch 'master' of github.com:floodlight/floodlight into newdevicemanager
+1418c94 Change host/switch identification to use IDs instead of names in web topology view. Add last seen host IP address.
+c2bcb84 Add hosts and host links to web UI topology view
+1046513 Retab and remove spurious comment for web UI
+7e45a45 Draw lines
+37fa8ea Merge into master from pull request #96: Wait instead of sleep in unit test (https://github.com/floodlight/floodlight/pull/96)
+4ecd679 change unit test from sleep to a wait loop with timeout minor toString fix in Device
+250d4b6 Merge into master from pull request #95: Move the switch learning table out of IOFSwitch and into the LearningSwitch module. (https://github.com/floodlight/floodlight/pull/95)
+c64494e 1 - Fix a UDP deserialization issue. 2 - Move the learning switch table outside of the IOFSwitch and into the LearningSwitch module. 3 - Create a REST API for the LearningSwitch module to get the learned table. Available at "/wm/learningswitch/switch/{DPID or 'all'}/json".
+4dd2203 Make web UI use new API
+a697314 Merge branch 'master' of github.com:floodlight/floodlight into newdevicemanager
+d9df166 Merge pull request #94 from kjiang/master
+7a77f8e Merge branch 'master' of github.com:floodlight/floodlight into newdevicemanager
+0ff4844 Merge remote branch 'floodlight/master'
+788c521 Correct race condition in device learning and topology, remove deviceManager from listening linkEvent
+bca5e90 Fix null pointer exception in device manager and add last seen to device serializer
+83ae82c Interface to Suppress LLDPs on a per switch interface level. [#28379983]
+56b64e4 Merge branch 'master' of github.com:floodlight/floodlight into newdevicemanager
+05d029f Update a comment
+e1c7c34 Revert "Update device AP when necessary"
+f5c5500 Merge into master from pull request #93: Remove a character because of compilation warning (https://github.com/floodlight/floodlight/pull/93)
+ec02ea7 Remove a character because of compilation error
+1e5a6ea Merge pull request #92 from kjiang/master
+bc067bb Merge remote branch 'kjiang/master'
+cc8b25c Merge remote branch 'floodlight/master'
+dfee35f clean up log msg
+0ae432f Update device AP when necessary
+f3f6608 Merge branch 'master' of github.com:floodlight/floodlight into newdevicemanager
+4c2b615 Port broadcast domain logic from old device manager
+25cc86f Merge into master from pull request #91: Fix listener sorting for partially-ordered dependencies (https://github.com/floodlight/floodlight/pull/91)
+eacffc8 Merge branch 'master' of github.com:readams/floodlight into newdevicemanager
+bfe34eb Fix listener sorting for partially-ordered dependencies
+8a11682 Tweak device updates
+5b71d94 Merge remote-tracking branch 'floodlight/master'
+923daa7 Merge into master from pull request #90: Add IHARoleListener interface so modules can listen for role changes. (https://github.com/floodlight/floodlight/pull/90)
+fbfe8e9 Clean up some debug output on initialization to be more succinct
+0df0371 1 - Get Controller ID and role from Floodlight properties file. 2 - Update module HA role change actions 3 - Add unit tests for HA role changes
+f7aa98b Add IHARoleListener interface and have modules load/unload db state on HA role change. [#23365441]
+30ae19e Merge branch 'newdevicemanager' of github.com:readams/floodlight into newdevicemanager
+2ed0e3a Cleanup of topology manager to match floodlight style. Remove StackTraceUtil. Add packet-in listener to topology
+2f8ea31 Cleanup of topology manager to match floodlight style. Remove StackTraceUtil.
+3e4126f Merge branch 'master' of github.com:floodlight/floodlight into newdevicemanager
+9d986b8 Fix warning
+3ed7806 Merge branch 'master' of github.com:floodlight/floodlight into newdevicemanager
+e2c095c Merge into master from pull request #89: Remove useless IStaticWebRoutableService (https://github.com/floodlight/floodlight/pull/89)
+1966d9c Remove useless IStaticWebRoutableService; now the StaticWebRoutable module provides no services.
+0afa4c6 Merge remote branch 'floodlight/master'
+8735b7a Merge into master from pull request #87: Web UI (https://github.com/floodlight/floodlight/pull/87)
+336ab55 Merge into master from pull request #88: reset device AP conflict algorithm computation after topology changes (https://github.com/floodlight/floodlight/pull/88)
+235994a Merge remote-tracking branch 'floodlight/master'
+3e77b09 clean up blocking algorithm for all APs when topo changes
+6c47480 Merge branch 'master' of github.com:floodlight/floodlight into newdevicemanager
+371154a Merge into master from pull request #86: Fix Javadoc of Forwarding#doFlood() (https://github.com/floodlight/floodlight/pull/86)
+7960f3c Merge pull request #83 from nilok/disallow-multiple-providers
+6538a15 Fix Javadoc of Forwarding#doFlood()
+781c91a Merge into master from pull request #85: Modifications to Static Flow Pusher. (https://github.com/floodlight/floodlight/pull/85)
+cf8806a Fix unit tests for Static Flow Pusher.
+be0a42a 1 - Static Flow Pusher - On OFActionOutput set max length to be Short.MAX_VALUE 2 - Log PacketIns with no payload and stop processing 3 - Remove unused IOFController interface
+404abfe Fixing bug which allowed multiple modules that provide service X to be loaded
+142dddb Display loaded module list in a nicer way.
+de73f36 Topology graphing is starting to work.
+e716682 Merge into master from pull request #82: Initialize modules listed in the config file first then dependencies. (https://github.com/floodlight/floodlight/pull/82)
+6b711ff Initialize modules listed in the config file first then dependencies.
+d85488f Inital commit of Web UI.
+e163c4c Merge branch 'master' of github.com:floodlight/floodlight into newdevicemanager
+755b9cc Merge into master from pull request #81: Fix Javadoc comments (https://github.com/floodlight/floodlight/pull/81)
+9e6f7a2 Fix Javadoc comments
+ca8b51e Merge into master from pull request #80: Changes Static Flow Pusher to return a status when using it's REST API. (https://github.com/floodlight/floodlight/pull/80)
+5d7d947 DeviceManager: don't log a debug message on every packet_in, use trace level
+78ca35e Changes Static Flow Pusher to return a status when using it's REST API.
+642b747 Minor cleanup
+f8b0a6e Merge remote branch 'floodlight/master'
+fc43649 reset device AP conflict state when topology merges
+9e596d5 Merge branch 'master' of github.com:floodlight/floodlight into newdevicemanager
+36d0f5c Merge pull request #78 from oshothebig/fix/javadoc
+22c397f remove BD-BD damping timer
+ad3bb20 Revert "stop packet processing when updating deviceMgr with new topo"
+0be7770 format update
+51ca40a stop packet processing when updating deviceMgr with new topo
+dbe16f2 revert back to only reset AP's blocking state
+30cb91f revert back to only reset AP's blocking state
+ba3198c reset device ap's blocking algorithm computation on topology change.
+3966adc Merge pull request #79 from kjiang/master
+d54bb9c reset device ap's blocking algorithm computation on topology change.
+9e4433b Fix typo and spelling in Javadoc comments
+3012811 clear device's AP blocking state upon topology change
+b2222bd Merge pull request #77 from kjiang/master
+a57e6e9 clear device's AP blocking state upon topology change
+1dc36af cleanup logs
+b28c6c9 Update old ap when device moves
+6a83fff Update device AP learning
+eb90408 Remove inapplicable device web stuff
+441d120 Merge branch 'master' of github.com:floodlight/floodlight into newdevicemanager
+6c645fd Merge into master from pull request #76: re-organize device attachment point learning logic (https://github.com/floodlight/floodlight/pull/76)
+133f1f2 cleanup logs
+fd3e036 Logging tweak
+21ae908 Add try-catch clauses around all update queues.
+a9189d6 Add try-catch clauses around all update queues.
+eda7513 Logging tweak
+ca47bef Update old ap when device moves
+2ad9ce1 Merge remote branch 'floodlight/master'
+1a1cd41 Update device AP learning
+7259ddb Merge into master from pull request #74: Add try-catch clauses around all update queues. (https://github.com/floodlight/floodlight/pull/74)
+547d724 Merge into master from pull request #75: Add more Static Flow Pusher REST APIs and make it an IFloodlightService. (https://github.com/floodlight/floodlight/pull/75)
+c4a9e17 Get all the OFActions working for IStaticFlowPusherService.
+e1c4dc7 Add try-catch clauses around all update queues.
+08fcfd0 Add try-catch clauses around all update queues.
+af0fb43 Added an API to list all static flows by switch. The URL is: /wm/staticflowentrypusher/list/{switch}/json {switch} can be 'all' or a DPID in Hex format, i.e. '00:00:00:00:00:00:00:01'
+5024274 Change how modules are inited/started to be more deterministic.
+670806e When you clear static flows via the REST API you can now specify "all" or a DPID in hex format.
+89f2dc1 Make static flow pusher into a service (IStaticFlowEntryPusherService). This will allow other Floodlight modules to push static flows without using the REST API.
+1e6f631 Merge remote-tracking branch 'floodlight/master'
+7c9c677 Add 5 seconds for attachment point change from one broadcast domain to another. When the attachment points flap quickly, the controller should avoid learing the attachment point but should continue processing the packet.
+715a6c2 Resetting broadcast domain to broadcast domain attachment point change to 0 ms.
+3db32b0 Merge remote-tracking branch 'floodlight/master'
+1943f8c Device manager will have a 5-second time gap to change an attachment point for a host from one broadcast domain to another.
+aaf9cc1 Merge remote-tracking branch 'floodlight/master'
+f1ae6db Merge into master from pull request #72: Reduce log level of some messages (https://github.com/floodlight/floodlight/pull/72)
+c1b0cdf Reduce log level of some messages
+b24506b Fix an issue causing infinite broadcast loops in OpenFlow topologies that have loops.
+763e8b7 Merge pull request #71 from alexreimers/master
+e7f5ce6 Fix an issue causing infinite broadcast loops in OpenFlow topologies that have loops.
+438cefd Merge into master from pull request #70: broadcast ARP if cluster doesn't know dst device's AP (https://github.com/floodlight/floodlight/pull/70)
+3971782 Add message to debug flapping between the same port
+2180096 broadcast ARP for cluster that doesn't have the dst device's AP
+ce868b2 Merge remote-tracking branch 'floodlight/master'
+0551014 Merge remote-tracking branch 'maiergre/master'
+49ebd8c Introduce a convenience method inSameIsland, which is the same as inSameCluster. In future, they may have different functionalities.
+adae344 Introduce a method called isConsistent(..) that compares an old attachment and a new attachment point. If the new attachment point is not consistent with the old one, then it has to be learnt by the device manager.
+914fd82 Merge into master from pull request #69: Removing prints not through logger (https://github.com/floodlight/floodlight/pull/69)
+8e1ccda Fix a bug for checking BDDP packet if the packet is not unicast for it to continue down the processing chain.
+a551290 If the incoming node port is blocked, allow only unicast and BDDP packets to continue down the processing chain.
+2ca047b Interface methods for getting outgoing broadcast ports from a between two switch port tuples.
+46f20aa Removing prints not through logger
+bf78394 Remove obsolete ITopology method stubs from LinkDiscoveryManager. Clean up logging.
+ce28542 Merge into master from pull request #67: Add a method to TopologyService (https://github.com/floodlight/floodlight/pull/67)
+6e76e0e Merge into master from pull request #68: DeviceManager REST API take two (https://github.com/floodlight/floodlight/pull/68)
+508c65f Topology service can provide alternative broadcast port given a src/dst pair
+8c8d6d8 When the device manager gets cleaned up (or when during topologyChanged), it should consider the time difference between switching from broadcast to non-broadcast attachment points (as they might be previously on two different switches).
+f8370ad Harden up HexString.fromHexString() and check for errors in the DeviceManager REST API.
+cc27f92 Check for the correct MAC address size when getting a device from DeviceManager.
+74001a2 Added a DeviceManager REST API. You can use this to see what devices the controller has learned along with their IPs and attachment points.
+a57aa44 Merge pull request #66 from kjiang/master
+e0595ac Fix a bug and some cleanup in topology
+c9429b2 Remove obsolete ITopology method stubs from LinkDiscoveryManager. Clean up logging.
+7036a32 Merge into master from pull request #65: Only remove flows on move when the cookie is from forwarding (https://github.com/floodlight/floodlight/pull/65)
+b22e2f6 Merge branch 'master' of github.com:floodlight/floodlight
+fedaf81 Merge into master from pull request #64: fix eclipse environment (https://github.com/floodlight/floodlight/pull/64)
+75f98a5 Only remove flows on move when the cookie is from forwarding
+ed51d67 fix eclipse env
+6e38f55 Device manager should implement ITopologyListener to clear out attachment points when topology changes.
+b721c69 (1) Device manager will drop packets (as the first step) if the topology indicates the packet-in port is not allowed for incoming transmissions. (2) Remove a log message from LinkDiscoveryManager. (3) Topology provides a service called isAllowed() that indicates if the port is enabled for incoming and outgoing traffic. (4) Tests are modified accordingly.
+3606d00 Merge into master from pull request #63: cleanup device, device ap, and device network address. (https://github.com/floodlight/floodlight/pull/63)
+50ad7e8 Broadcast BDDP from another controller only if myId is less than the other's.
+ec4eed9 remove build dependency on thrift
+979addb fix a mistake in merge
+28547d8 Merge remote-tracking branch 'floodlight/master'
+ae9ffb1 Rename isIncomingBroadcastAllowedOnSwitchPort to isIncomingBroadcastAllowed.
+e4b5a0e Oops, removed forwarding from configuration file.
+4b99d3c Merge into master from pull request #62: device manager attachment points on broadcast domains (https://github.com/floodlight/floodlight/pull/62)
+2570a56 Change device manager to not allow attachment point flapping (there was a bug in the implementation before). Also, remove some crappy info log from ForwardingBase.
+9ca894c Fix the unit test failure
+f2694fe Merge into master from pull request #61: Added a DeviceManager REST API. (https://github.com/floodlight/floodlight/pull/61)
+3d050e0 Added a DeviceManager REST API. You can use this to see what devices the controller has learned along with their IPs and attachment points.
+3571adb Add unit test to verify device, device AP, and device Network address aging
+f1f130d Merge branch 'master' of github.com:readams/floodlight into newdevicemanager
+a33f89a remove unnecessary daily deviceStorage, some cleanup in deviceAging
+0c92ecc Merge into master from pull request #59: Small fixes & tweaks. (https://github.com/floodlight/floodlight/pull/59)
+506905c Merge remote-tracking branch 'floodlight/master'
+32a02b1 Merge into master from pull request #58: Attachment point move suppresion when moving from non-broadcast domain port to broadcast domain port wasn't working. Fixed. (https://github.com/floodlight/floodlight/pull/58)
+8469de7 Change type of port from Short to short and fix toString.
+43c23b9 Fix null pointer exception in logging code
+bacac89 Attachment point move suppresion when moving from non-broadcast domain port to broadcast domain port wasn't working. Fixed.
+03df9fc Merge branch 'devicemanager' of github.com:readams/floodlight into newdevicemanager
+723184f Increase the timeout for switching attachment point from non broadcast domain ports to broadcast domain ports to 5 minutes (from 5 seconds).
+3cf29ca Change BDDP ether type to 0x8999, and correctly drop STP packets
+a04b78e If the attachment point of device moves too fast from a non-broadcast domain switch port to a broadcast domain switch port, ignore learning and stop processing the packets.
+be2f6ea remove unnecessary daily deviceStorage, some cleanup in deviceAging
+26e469e Merge pull request #57 from capveg/master
+f4420e8 fixed NPE race condition in topologymgr
+f3491ee Expose topology.isBroadcastDomainPort()
+0c09d00 Merge into master from pull request #56: Make the module loader more resilient to configuration errors. (https://github.com/floodlight/floodlight/pull/56)
+0a208a6 Changes to the module loading system. 1 - Handle the case where you specify more than one module that provides the same service in the config. Print out an error message saying which ones are conflicting. 2 - If a service has more than one implementation and none are specified in the configuration file print out which modules can be used in the error message.
+814ffa6 Merge into master from pull request #55: Move the thread pool out of IFloodlightProvider and into it's own service (ITheadPoolService). (https://github.com/floodlight/floodlight/pull/55)
+23862a2 Add BSN probe packet
+71599cd Extend LLDP packet to BDDP.
+7f96ff4 Oooops forgot these files.
+611e42a Fix to unit tests.
+0a1d34c Move the thread pool out of IFloodlightProvider and into it's own service (ITheadPoolService).
+ede87d1 Merge branch 'master' of github.com:floodlight/floodlight
+a6e7b79 Removing a log message that was used for debugging.
+755af28 Merge into master from pull request #54: Change output of Processing Time module so it's easier to understand. (https://github.com/floodlight/floodlight/pull/54)
+3fcace7 Updates to writing link type to storage.
+0f3254d Change output of Processing Time module so it's easier to understand.
+7c26558 Add a method to allow re-directing flows if needed.
+16e2f2e Merge branch 'master' of github.com:floodlight/floodlight
+e8a43bf Adding getPorts() and getBroadcastPorts() methods to ITopologyService interface.
+c9e553f Remove link from tunnel and broadcast domain link sets if it is a direct link.
+4c07aa2 Merge into master from pull request #53: Lots of refactoring to PacketInProcessingTime module. (https://github.com/floodlight/floodlight/pull/53)
+c1e0d93 Lazy load configuration parameter maps for modules.
+34ccf1b Rewrite the PacketInProcessingTime module.
+204cc4b Device manager will learn new attachment points only if the switch ports do not belong to the same broadcast domain.
+b07d9b1 Merge into master from pull request #52: Allow mac-ip learning on both ARP request and reply (https://github.com/floodlight/floodlight/pull/52)
+6fe222b allow MAC-IP learning from both ARP request and reply
+52dc58a Move new topology instance computation as a singleton task.
+8ab3ceb Merge into master from pull request #51: Only learn ip address from ARP replies (https://github.com/floodlight/floodlight/pull/51)
+2782f96 Add unit test to verify not learning from ARP request
+fd1af31 learn ip on ARP reply only and update network address lastseen on all ip packets
+5bff562 Merge branch 'master' of github.com:floodlight/floodlight
+80a1d69 Merge into master from pull request #50: Format datalayer address in log messages (https://github.com/floodlight/floodlight/pull/50)
+adfaa43 Merge branch 'master' of github.com:floodlight/floodlight
+bf51f82 Add device service rest API
+c659c28 Format dl address correctly
+d5f226a Further refactoring of LinkDiscoveryManager.
+c59fd5f SummaryResource should implement ServerResource
+002593c pushPacket function updated to drop packets if the inport and outport are the same.
+53ba157 Add notifications on entity removal
+20396a8 Change value of DL_VLAN_PCP in OFMatch,java.
+b06c72c Merge pull request #49 from alexreimers/master
+f8af68c Change value of DL_VLAN_PCP in OFMatch,java.
+9458447 Merge branch 'master' of github.com:floodlight/floodlight
+7699757 Rename some interfaces
+1aec392 Fix a typo that incorrectly identified the TCP/UDP dst port in Static Flow Pusher's DB tables.
+4391a5f Merge pull request #47 from alexreimers/master
+5a4c767 Fix a typo that incorrectly identified the TCP/UDP dst port in Static Flow Pusher's DB tables.
+33f3c48 Merge branch 'master' of github.com:floodlight/floodlight
+c5348a2 Add entity expiration
+dfe45f8 Merge into master from pull request #46: Added two REST to pdf utilities: graphDeps and graphTopo (https://github.com/floodlight/floodlight/pull/46)
+498a5da Added two REST to pdf utilities: graphDeps and graphTopo
+98541fc Fix some unit tests using a mock device with fewer dependencies
+b75c882 Merge branch 'master' of github.com:floodlight/floodlight
+6de891d Some work on ip address handling
+8443d51 Merge into master from pull request #45: Changed LLDP's in topodiscovery to real src mac (https://github.com/floodlight/floodlight/pull/45)
+65c4df2 Changed LLDP's in topodiscovery to real src mac
+24ef7f8 Don't print out an incorrect warning about floodlight.modules on startup time.
+5994615 Merge pull request #44 from alexreimers/master
+d128aa2 Don't print out an incorrect warning about floodlight.modules on startup time.
+e4f1cff Merge branch 'master' of github.com:floodlight/floodlight
+bf20fad Switch to not deleting entities for host moves
+cdc3e00 Move SwitchClustersResource and TopologyWebRoutable to topology package.
+2cc9107 Merge into master from pull request #43: Extra checks to event history in REST API. (https://github.com/floodlight/floodlight/pull/43)
+f99efa1 Add Null/ClassCastException checks to the event history REST APIs.
+3d2c246 Changed FloodlightModuleContext to create/return an empty configuration parameter map if a module requests it and it doesn' exist.
+a0250d8 Use canonical names of services insread of strings.
+b1df886 Use writeLink instead of writeLinkInfo at all places.
+2a79653 New method to identify if a port is broadcastDomainPort or not.
+e8894cb Merge into master from pull request #42: add per port broadcast cache hit counter and expose them through debug REST API (https://github.com/floodlight/floodlight/pull/42)
+3826497 Add per-port broadcast cache hit counter
+0da7f6a Remove redundent field in counterName
+8a91203 Add per-port broadcast cache hit counter
+341b0e2 Merge into master from pull request #41: Per module configuration parameters and change the way we look for Floodlight config files. (https://github.com/floodlight/floodlight/pull/41)
+f6d2fe3 Fix unit tests to work with module config parameters.
+f41cdee Merge remote-tracking branch 'floodlight/master'
+8f29d63 Merge branch 'master' of github.com:floodlight/floodlight
+2ff1049 Changed the order we look for configuration files. The order is: 1 - Specified via the command line using -cf 2 - Loading config/floodlight.properties if it exists 3 - Using the default src/main/resources/floodlightdefault.properties that is built into the jar.
+2e9427e Initial support for OVS-style role request messages and maintaining connections with switches in a backup role [#23366119]. Added REST API to get/set the current role of the controller [#2336329]. Added simple health check REST API [#23364299]. Fixed off-by-one error in the message code values for the role request/reply messages.
+3e17c68 Use Java properties (either via config file or command line) for per-module specific configuration files. Note: This obsoletes previous command line configuration properties apart from -cf (configuration file).
+4d43e2e Renaming old topology.* to linkdiscovery.*; and renaming topologymanager to topology.
+e9f67ec Merge branch 'master' of github.com:floodlight/floodlight
+fef25b2 Add most of code for (efficient) secondary indices on device information
+d4c978a Use the same destination rooted tree for broadcast purpose.
+167ff62 Merge into master from pull request #39: Some cleanups (https://github.com/floodlight/floodlight/pull/39)
+05e534d Move getData from OFMessageFilterManager to OFMessage and remove the dependency of CoreModule on IOFMessageFilterManagerService.
+e0b714d New TopologyManager. Previous TopologyImpl would simply do link discovery. Cosmetic refactoring (renaming etc.) would be done separately.
+af5c33b Some cleanups to IPktInProcessingTimeService.
+d5284ed Strip whitespace when reading modules from the configuration file.
+03460cc Removing Long objects in IRoutingService.
+96b2f56 Updates to BroadcastTree data structure; Renaming of IRoutingEngineService to IRoutingService; Updates to signatures of IRoutingService interface methods.
+e94020a Bug fix. Assign type during the Update object instantiation.
+dc99659 Remove IOFSwitch references from ITopologyService interface.
+0c120bd Cosmetic changes. Changing "cluster_merged" to "topology_changed".
+c91fcaf Refactoring Link and Route data structures in the RoutingImpl.
+84b5a32 Move LRUHashMap from RoutingImpl to util.
+45c0547 Removing IOFSwitch usage from ILinkDiscoveryListener.
+9ef8297 Introduce ILinkDiscovery as the base class from which ILinkDiscoveryService and ILinkDiscoveryListener are extended. Introduce link types in ILinkDiscovery. The link type is sent to all listeners.
+8068aa8 Merge into master from pull request #38: Re-write of the Static Flow Entry Pusher. This one uses memory storag… (https://github.com/floodlight/floodlight/pull/38)
+669443a Re-write of the Static Flow Entry Pusher. This one uses memory storage notifications and supports more actions.
+0d36d75 Added check for flush() being called with no messages having been sent
+ead2d58 Fixing a null pointer exception in situations where there are no links a topology.
+44b327e Merge into master from pull request #37: Improved Module Loader REST interface (https://github.com/floodlight/floodlight/pull/37)
+bfdc501 added missing file to unbreak build
+fde4887 Merge pull request #32 from lalithsuresh/patch
+b647a74 Improved Module Loader REST interface
+40da007 Merge pull request #36 from capveg/master
+3bfe594 Added REST support for querying loaded modules
+2513a30 Eliminating SwitchClusterId in IOFSwitch interface.
+6fa3bf8 Merge into master from pull request #35: Only measure the start and end time of an OFMessage if the processing… (https://github.com/floodlight/floodlight/pull/35)
+3268d90 Remove redundent field in counterName
+50f1ac2 Only measure the start and end time of an OFMessage if the processing time service is enabled.
+311ea6b Merge branch 'master' of github.com:floodlight/floodlight
+2c5bbbe Handle host move learning
+7f17d13 Change the compound key separator for these primary keys to '|'
+a676985 Updating the addAware and removeAware methods for Link Discovery and Topology.
+8c7e628 Splitting the TopologyService and TopologyListener into Topology and LinkDiscovery pieces.
+329bada Delete methods in IRoutingInterface that refer to switch objects. [It is also not used anywhere in the code as of now.]
+f084c36 Merge into master from pull request #34: Create NullCounterStore and NullPktInProcessingTime modules. (https://github.com/floodlight/floodlight/pull/34)
+f902503 Make static flow entry pusher test time a little higher for it to pass more consistently.
+7f91dc7 Merge branch 'master' of github.com:floodlight/floodlight
+fedb4fc Merge into master from pull request #33: stats for broadcast and multicast pktIns (https://github.com/floodlight/floodlight/pull/33)
+2402870 Create NullCounterStore and NullPktInProcessingTime modules. These are used to create a minimal configuration for performance testing or to turn them off.
+65c99c6 Additional work on new device manager
+4abce32 add stats for broadcast, multicast
+4ae7d7b add stats for broadcast, multicast
+d182e14 Added API to get transaction id to be used for sending async. stats query to a switch. Added parameter to pushRoute to pass flow mod. command type and if messages to be flushed after the write().
+6e66dae Fix restPort hard coding
+38e9193 Use msglist for write to switch for async requests.
+baaf2e5 Updated unite test for flush
+2bd9894 Added updates for perf-testing
+32ff18d Inter-switch links are double counted
+4c34426 Merge into master from pull request #31: Add back in the Jython debug server as a module. (https://github.com/floodlight/floodlight/pull/31)
+69c6480 Create a Jython debug server module.
+b302f32 Merge branch 'master' of github.com:floodlight/floodlight
+7b2e21b Make static flow entry test more reliable
+74bcfed Added an API to submit stats/flow query for a switch. The response is returned asynchronously via a callback provided by the caller.
+4e5d888 Add info provider interface floodlight and implement controller/summary info
+66fbddc Merge into master from pull request #30: New controller stats (https://github.com/floodlight/floodlight/pull/30)
+80ac889 Updated to flush all writes when a list of incomming messages has been handled
+d71c397 Added updates for perf-testing
+12f3b16 fix counterStore API as a service
+23d72fb fix a merge issue
+6fd8367 Add controller-wide of stats to REST API
+c89e18a fix the unit test with counter changes
+d3bf2ff move updateCounter methods to counterStore, add controller-level packetIn, packetOut, and flowmod counters
+f5d43e0 Merge branch 'master' of github.com:floodlight/floodlight
+54f6fe3 Revivify mock device manager, redo devicemanageraware
+eaa0810 Moved cookie creation to Forwarding from ForwardingBase. Removed one of the pushRoute method that is not needed anymore.
+4827ca5 Merge branch 'master' of github.com:floodlight/floodlight
+c325d3b Fix some testing issues
+e72de66 Merge into master from pull request #29: Modify LearningSwitch and Hub to be proper loadable IFloodlightModules. (https://github.com/floodlight/floodlight/pull/29)
+ede7e02 Fixed static flow entry pusher test.
+fa8ae5e Merge branch 'master' of github.com:floodlight/floodlight
+892d3d1 Moved StaticFlowPusher REST API into the Static Flow Pusher module (URL has been changed).
+d7f6fa6 Modify LearningSwitch and Hub to be proper loadable IFloodlightModules.
+a0542e7 Merge into master from pull request #29: Modify LearningSwitch and Hub to be proper loadable IFloodlightModules. (https://github.com/floodlight/floodlight/pull/29)
+ecb15f7 Modify LearningSwitch and Hub to be proper loadable IFloodlightModules.
+00270c4 Merge branch 'master' of github.com:floodlight/floodlight
+67074cb Merge branch 'master' of github.com:floodlight/floodlight
+27b9444 Merge pull request #28 from alexreimers/master
+f522a6b Fixed ControllerTest.
+96c1763 Tweaks and fixes for correctness and performance.
+685162b Changing storageSource to NoSqlStorageSource in StorageTest.java.
+cd4a28b Merge branch 'master' of github.com:floodlight/floodlight
+65bd5e4 Basic pinging working with new Device manager
+54c6caf Compiles successfully with all unit tests passing (except for device manager tests)
+f7a9a83 Forgot to add the file that implements the REST API to get the storage source tables.
+9894675 Merge branch 'master' of github.com:floodlight/floodlight
+68e7478 Unit tests for the parts of device manager that should be working, and some effort at fixing compile errors in other modules
+a29e505 Move code from startUp() to init().
+16da2f5 Add switchClusterBroadcastDomainMap to maintain the set of broadcast domains connected to each cluster. [#23198243]
+6a9bc52 Added support for storage source counters for query, update, and delete operations [#25095875]. Added a REST API to get the list of storage source tables used by floodlight.
+d69e73d Added support for storage source counters for query, update, and delete operations [#25095875]. Added a REST API to get the list of storage source tables used by floodlight.
+683a6b1 Call super's startup in MemoryStorageSource.
+24b3455 Support for parsing the vendor data associated with OFVendor messages. Support for the role request/reply vendor extensions used in OVS.
+80ea844 Merge branch 'master' of github.com:floodlight/floodlight
+8aeeeb8 Changing broadcast domains from a Set to Map. Adding an id for broadcastdomain.
+537d330 Fix.
+26daf21 Updates to avoid some null pointer exceptions in dfsTraverse routine.
+9acdea9 Merge branch 'master' of github.com:floodlight/floodlight
+870ecf4 Fix null exception in message filter
+f6dbac9 Fix null exception in message filter
+a10e1b7 Remove flow-cache package.
+81c81e6 Enhanced debug stmt for link removal event.
+ee636ca Allocate Controller's datastructures on init().
+0e37c09 Fix up storage source.
+0b5b6ad Add controller-wide of stats to REST API
+43d0b1b Ooops adding CoreWebRoutable got removed.
+9dcfda6 fix the unit test with counter changes
+a0aa3aa Merge branch 'master' of github.com:floodlight/floodlight
+b80da4a Initial stubbing out of new device manager
+81e6469 Fix mismerge
+d53c40f Use port name instead of port number in port-channel config
+82a47d5 Add unittest for port-channel
+90420ac Handle duplicate mac based on port-channel config [#24678661]
+7e31b38 move updateCounter methods to counterStore, add controller-level packetIn, packetOut, and flowmod counters
+81c0868 Merge into master from pull request #27: Fix device aging issue (https://github.com/floodlight/floodlight/pull/27)
+970cfbb Device is immutable. The new device needs to be returned when aged network address or AP is removed
+d4ac8fd update storage when device network address or ap is aged out
+0bcd23b Device is immutable. The new device needs to be returned when aged network address or AP is removed
+772d082 Merge branch 'master' of github.com:floodlight/floodlight
+912ea9a Use port name instead of port number in port-channel config
+b8d6012 Move this to avoid null pointers.
+b9619ec update storage when device network address or ap is aged out
+1598a6f Merge into master from pull request #26: Fix a mismatch of a parameter name in Javadoc. (https://github.com/floodlight/floodlight/pull/26)
+6310038 Change topology aware structure to arraylist from set so that the updates are dispached on order. Changed default performance monitoring window to 1hr from 5min. Fixed a bug in topology where routes were not getting recompured when an internal link went down. (RoutingImpl.java around line 214).
+2ef2e88 Create the port channel table in DeviceManager.
+91136fb Merge branch 'master' of github.com:floodlight/floodlight
+0250b20 Fix some merge issues and unit tests.
+00e0a3b Change performance monitoring default window duration to be 2hrs from 5min.
+de4f07d Fix a mismatch of a parameter name in Javadoc.
+ad47290 Add unittest for port-channel
+262b0d4 remove tabs
+9c4bf88 remove tabs
+99fdc75 Merge branch 'master' of github.com:floodlight/floodlight
+baa9ffc Change the networkAddr and AP aging removal code to correctly update all deviceMaps.
+1b7e022 Change the networkAddr and AP aging removal code to correctly update all deviceMaps.
+5431ad3 Merge branch 'master' of github.com:floodlight/floodlight
+27a44d1 Fix base controller exception catch, undo previous catch add
+d2e0fd3 Add log message when catching exceptions
+e22c3f3 Fix base controller exception catch, undo previous catch add
+aca9c53 Further loosen range for SingletonTaskTest
+170fac2 Tweak style settings
+397cd12 Add log message when catching exceptions
+7e20096 Handle duplicate mac based on port-channel config [#24678661]
+21f8180 Rename this file.
+136014e Make singletontasktest (hopefully) less likely to fail on a loaded system
+34dfbf5 Change the dependency loading algorithm from DFS to BFS to better deal with circular dependencies.
+bbd5ecf Shorten device manager impl test
+6e304b3 Greatly shorten staticflowentrypusher test time
+527ec8f Change to milliseconds for wall-clock time in event history.
+79df444 Fixed recording of attachment point blocking event-history.
+298259b Use Date and SimpleDateFormat instead of TimeStamp for formatting the date string. Catch illformated event-history count cases.
+aaa9e7d Configuration file for module loading.
+05a2a2f Merge into master from pull request #25: speed up staticflowpusher unittests (https://github.com/floodlight/floodlight/pull/25)
+60710c8 retune staticflowpusher timer for faster unittests
+7607908 Made OFMatch.fromString() take hex for VLAN
+713c2f8 Ignore links that are in the broadcast domain when computing clusters.
+7681657 Identifying broadcast domains in the network.
+930d8da API to add compponents to be topology aware.[#23320827]
+2cef256 Updates to unit tests.
+1183eaf cherry-pick from master 8cc5d3112
+167dee7 Merge branch 'master' of github.com:floodlight/floodlight
+f6dba0b Ensuring that isTruncated is always assigned during deserialization.
+5b7d18a Ensuring that isTruncated is always assigned during deserialization.
+ee1e00b Adding isTruncated field to the IPv4. It is set to true of the totalLength doesn't match the byte[] length during deserialization.
+24738ae Merge into master from pull request #24: log msg cleanup (https://github.com/floodlight/floodlight/pull/24)
+1dce3e8 Adding isTruncated field to the IPv4. It is set to true of the totalLength doesn't match the byte[] length during deserialization.
+8cc5d31 remove a log msg, show packetIn in packetIn toString()src/main/java/net/floodlightcontroller/core/internal/Controller.java
+cba2d34 Adding last unicast ARP conversion time to DeviceNetworkAddress class.
+5719272 Adding last unicast ARP conversion time to DeviceNetworkAddress class.
+d835684 Adjustment of listeners' ID. Removal of a unnecessary import.
+90dd1e8 Moved the REST API to it's own module. Fixed JUnit tests.
+c4f44ce More module loading stuff.
+f4ee2d7 Minor alignments.
+7e7213f Merge into master from pull request #22: Add a command line option to change the number of threads. (https://github.com/floodlight/floodlight/pull/22)
+77e8567 Add a variable to control the state of the flow cache.
+d68cb05 Stubs for flow cache. [i#23320773]
+969d83a Add a command line option to change the number of threads.
+9e9ff4e Event-history for topology related events: switch connects/disconnects, links ups/downs, cluster merge/splits.
+f86c843 Move switch locking code from IOFSwitch interface to OFSwitchImpl.
+c8c8673 Update unit test.
+7278191 Fix continouing problems when switches with same DPID connect.
+a05d426 Fix when switches with same DPIDs connect.
+8393667 Finished module loading system (execpt for all the things that don't work yet).
+3aec000 Merge into master from pull request #21: Move switch locking code from IOFSwitch interface to OFSwitchImpl. (https://github.com/floodlight/floodlight/pull/21)
+b9f11a6 Move switch locking code from IOFSwitch interface to OFSwitchImpl.
+702b68c Merge branch 'master' of github.com:floodlight/floodlight
+74eec3b Fir checkin for Floodlight module loading system.
+80146aa Revert to sending LLDP on all switches on switch add
+dcf9d05 Fix Compiler warnings
+8a8eed1 remove unnecessary log msg
+45998c1 Merge into master from pull request #19: On switch connect send LLDPs only from that switch. (https://github.com/floodlight/floodlight/pull/19)
+fe405b0 Merge into master from pull request #20: Still had problems when switches with same DPID connect. Should be fixed now. (https://github.com/floodlight/floodlight/pull/20)
+2dcc31e Fixed thread names to make logs easier to understand
+623fdda Update unit test.
+e31f062 Fix continouing problems when switches with same DPID connect.
+0ba0e8b Added .pydevproject Added *.class
+2e496b8 Updated jython server to use java logging (and made log object available to python code)
+ba85edc On a switch connection only send LLDPs from that switch instead of all switches.
+bebc264 Undoing the previous changes to the controller and OFSwitchImpl.
+dd3cb5f Close the channel in the finalize() function of OFSwitchImpl.
+3f37cad Merge into master from pull request #18: Fix when switches with same DPIDs connect. (https://github.com/floodlight/floodlight/pull/18)
+8af6bb0 Changed jarpath to work in eclipse and dev env as well
+25e0e47 Fix when switches with same DPIDs connect.
+8f9fea7 Print warning messages when packet-in processing time exceeds a certain threshold.
+27dbb7d Printing the flow-mod properties even if ethernet packet was null.
+080d326 New network addresses are learned only from ARP messages.
+b5d9e82 New network addresses are learned only from ARP messages.
+66faff3 Merge into master from pull request #17: Fix an issue in ITopologyImpl where we were leaking LLDPs across islands. (https://github.com/floodlight/floodlight/pull/17)
+ecc9849 Added jython shell for debug in field
+7bdce67 Fixed an issue with leaking LLDPs across islands in TopologyImpl.
+0600013 1 - Recompute topology when an inter-switch link times out. 2 - Added more comments to TopologyImpl.
+cfad992 Adding args4j to this branch, makes switching between branches simpler
+a616db6 Merge into master from pull request #16: Move the SwitchCluster REST API from core into topology. (https://github.com/floodlight/floodlight/pull/16)
+726aeaf Move the switchcluster REST API from /wm/core/controller/switchclusters/json to /wm/topology/switchclusters/json. [#23518013]
+dbcadb4 Javadoc updates for updateCluster and dfsTraverse.
+c0116e2 Removed assignment to a variable that's not used. Unit tests would still pass.
+d632c75 Fixing the corresponding spelling error on controller.java.
+ea08285 Revert "Fixing the corresponding spelling error in controller.java."
+8e5e67b Fixing the corresponding spelling error in controller.java.
+295c4a9 Added jython shell for debug in field
+e1ae58a Updates for printing warning messages when packet processing time exceeds certain threshold.
+7f3ba6d Merge into master from pull request #15: Fix an issue in TopologyImpl. Comment functions in TopologyImpl. (https://github.com/floodlight/floodlight/pull/15)
+74354a7 1 - Recompute topology when an inter-switch link times out. 2 - Added more comments to TopologyImpl.
+7409243 Enum toStrings for OFPhysicalPort.java.
+3fbc942 Merge into master from pull request #14: Rename PortSettings to CmdLineSettings and first checking of ITopology REST API. (https://github.com/floodlight/floodlight/pull/14)
+f9cf9ab First checking for ITopology REST API. Links between OpenFlow switches connected to the controller can now be seen through /wm/topology/links. [#23518013]
+15ee0a0 1 - Rename PortSettings to CmdLineSettings 2 - Added a call to change StaticFlowPusher push interval 3 - Added various comments
+836cfa0 1 - Rename PortSettings to CmdLineSettings 2 - Added a call to change StaticFlowPusher push interval 3 - Added various comments
+e7fae77 Fixes to DeviceUpdateWorker on map updates.
+308485f Fixes to DeviceUpdateWorker on map updates.
+e4a0206 Select only non-internal AP when merging cluster
+3623e1e Re-added back in boolean Ethernet.isMACAddress(String macAddress).
+51aa40f Merge into master from pull request #5: Adding a class representing MAC address (https://github.com/floodlight/floodlight/pull/5)
+2935cc6 Merge into master from pull request #11: Keep non-internal device AP when merging cluster (https://github.com/floodlight/floodlight/pull/11)
+11bfeb7 Select only non-internal AP when merging cluster
+5df34b7 Adding 1 second delay when multiple links are added in TopologyImplTest.
+0576d1a Adding 1 second delay when multiple links are added in the TopologyImplTest.
+be109c9 Error message added back to detectLoopInCluster.
+0048437 Cluster computation is changed to the new code. TopologyImpl unit tests updated as well.
+6fda92b Initialization for parentDFSIndex added.
+f27c447 Minor fixes to member names and functions for consistent naming.
+eb22c31 Clean-up of the code; cluster computation algorithm is back to its original implementation.
+e7ed951 Removing unused libraries from TopologyImplTest.java
+917d7ce Fixing the TopologyImplTest to have mockFloodlightProvider's switches set. Clean-up of and javadoc to switch cluster computation code and corresponding data structure.
+004b030 Updated ant for concurrentlinkedhashmap
+a03257c Updated ant for concurrentlinkedhashmap
+320e3d4 Fixed TimedCache to be mt-safe, also renamed it from TimedHasMap
+4065d56 Fixed TimedCache to be mt-safe, also renamed it from TimedHasMap
+07b87d9 Make asplus single threaded...again
+397b50a Rewriting switch cluster computation to return strongly connected components in the presence of unidirectional links. The notion of internal switchPort is also changed.
+10dcbc0 Changed forwarding to packet out directly to dst-interface instead of a table lookup
+4758fb7 Add per switch TimedHashMap and minor rearrangements, not functional change
+69aa2b2 Changed forwarding to packet out directly to dst-interface instead of a table lookup
+9e3d554 Add per switch TimedHashMap and minor rearrangements, not functional change
+ee79833 Fix a typo in Javadoc comment.
+87297af Merge into master from pull request #10: Fix mismatches of parameter names in Javadoc. (https://github.com/floodlight/floodlight/pull/10)
+638ea2d Fix mismatches of parameter names in Javadoc.
+2cb1aee Cleanup of performance monitoring, custom json serializers, and CLI display support.
+80f1773 Merge into master from pull request #9: Fix mismatches of parameter names between in Javadoc and method definition (https://github.com/floodlight/floodlight/pull/9)
+d232983 Prepend zero if dataLayerType hex-string is less than 4 chars.
+9ac347c Fix mismatches of parameter names between in Javadoc and method definition.
+df93733 Cleanup of event-history infra.
+0fe7674 Merge pull request #8 from alexreimers/master
+177b733 Create storage source after the other packages.
+d52e597 Moved storage source setup to it's own function.
+e8ae4b0 Merge into master from pull request #7: Replace LearningSwitch with L2 Forwarding. (https://github.com/floodlight/floodlight/pull/7)
+80f7451 Fixed unit tests for Forwarding. [#21940749]
+5a6e719 Enable Forwarding. This replaces LearningSwitch and uses L2 shortest path routing to forward Packets. [#21940749]
+bb63a50 Adding more debug messages to ForwardingBase.
+5231013 Fixing a bug where floodlight doesn't provide a floodlight context, resulting in a null-pointer exception.
+73da8a3 Merge into master from pull request #6: Remove unnecessary error log. (https://github.com/floodlight/floodlight/pull/6)
+928692e remove unnecessary log msg
+6e67d37 Fix for the index displayed in event-history.
+605358e Add infra for event-history. Add event history for packet-in and attachment-point
+ae0906a Add a class representing MAC address and use it in the Ethernet class.
+86d856b Merge into master from pull request #4: Fixed a typo in a javadoc comment. (https://github.com/floodlight/floodlight/pull/4)
+44735d9 Added API to get the latest unblocked attachemnt point for a device.
+fc6d4d4 Pretty print log message of network address change
+4a91d04 Fixed a typo in a javadoc comment.
+48b6d3d Add log message when network addresses change, move Ethernet string conversion to the right place
+95974d2 Merge into master from pull request #3: Added command line options to change the port numbers (https://github.com/floodlight/floodlight/pull/3)
+3673c49 Added command line options to change the port numbers of OpenFlow and REST API.
+8bfbb08 Adding additional debug messages using OFMessageFilterManager functions.
+d32dea5 Adding more debug messages through OFMessageFilterManager's functions (for packet-in, packet-out, and flow-mods.).
+21c1edd Merge aaf7ea3862858b009d623ae3bed69870c484347f into master
+aaf7ea3 Remove the undefined property in build.xml.
+179a71a Updates to print messages to log.info when packet-in processing time exceeds 0.5s.
+e7ed19d Updated storage for IPaddress that was removed from the hashtable
+b7f2ee8 Updated storage for IPaddress that was removed from the hashtable
+ba0d49f Added check for IP address mapping is updated for most recent IP address seen by device manager
+70f6601 Added check for IP address mapping is updated for most recent IP address seen by device manager
+dc5f35c Merge pull request #1 from alexreimers/master
+6220798 Add packetStreamerClient example
+e52aca1 Added a make javadoc target, same as make doc/docs.
+ab012e5 Add REST API to mac-based packettracer
+6028eff Changed netty to use one thread on this branch
+38f7442 Fixed concurrent access to devicemanager maps and unresolved ap's list
+cc1882c Fixes some static hashmaps/return values to be ConcurrentHashMap Updates corresponding interface definitions to use Map
+8758aff Add javadoc to packetstreamer
+60fd2fe Fixed concurrent access to devicemanager maps and unresolved ap's list
+465857a Fixes some static hashmaps/return values to be ConcurrentHashMap Updates corresponding interface definitions to use Map
+91607e2 Fix compile-test command
+9544497 Fix test classpath
+e3cdbed Add dependency to eclipse target
+ed20123 Remove extraneous entry from dist target
+ac6e54f Move packetstreamer classes into main source directory. Make all generated files in target directory
+93030da Initial commit for Floodlight OpenFlow controller.
diff --git a/lib/openflowj-0.3.5-SNAPSHOT-javadoc.jar b/lib/openflowj-0.3.5-SNAPSHOT-javadoc.jar
deleted file mode 100644
index 49c3f4551b..0000000000
Binary files a/lib/openflowj-0.3.5-SNAPSHOT-javadoc.jar and /dev/null differ
diff --git a/lib/openflowj-0.3.5-SNAPSHOT-sources.jar b/lib/openflowj-0.3.5-SNAPSHOT-sources.jar
deleted file mode 100644
index 5786ced23c..0000000000
Binary files a/lib/openflowj-0.3.5-SNAPSHOT-sources.jar and /dev/null differ
diff --git a/lib/openflowj-0.3.5-SNAPSHOT-tests.jar b/lib/openflowj-0.3.5-SNAPSHOT-tests.jar
deleted file mode 100644
index 67646a8c35..0000000000
Binary files a/lib/openflowj-0.3.5-SNAPSHOT-tests.jar and /dev/null differ
diff --git a/lib/openflowj-0.3.5-SNAPSHOT.jar b/lib/openflowj-0.9.0-SNAPSHOT-javadoc.jar
similarity index 51%
rename from lib/openflowj-0.3.5-SNAPSHOT.jar
rename to lib/openflowj-0.9.0-SNAPSHOT-javadoc.jar
index dcb33c10e4..9e685f2be1 100644
Binary files a/lib/openflowj-0.3.5-SNAPSHOT.jar and b/lib/openflowj-0.9.0-SNAPSHOT-javadoc.jar differ
diff --git a/lib/openflowj-0.9.0-SNAPSHOT-sources.jar b/lib/openflowj-0.9.0-SNAPSHOT-sources.jar
new file mode 100644
index 0000000000..bd73277584
Binary files /dev/null and b/lib/openflowj-0.9.0-SNAPSHOT-sources.jar differ
diff --git a/lib/openflowj-0.9.0-SNAPSHOT.jar b/lib/openflowj-0.9.0-SNAPSHOT.jar
new file mode 100644
index 0000000000..bef1d78001
Binary files /dev/null and b/lib/openflowj-0.9.0-SNAPSHOT.jar differ
diff --git a/src/main/java/net/floodlightcontroller/core/Main.java b/src/main/java/net/floodlightcontroller/core/Main.java
index 0bda3c0c55..c437a93472 100644
--- a/src/main/java/net/floodlightcontroller/core/Main.java
+++ b/src/main/java/net/floodlightcontroller/core/Main.java
@@ -59,8 +59,6 @@ public static void main(String[] args) throws FloodlightModuleException {
FloodlightModuleLoader fml = new FloodlightModuleLoader();
try {
IFloodlightModuleContext moduleContext = fml.loadModulesFromConfig(settings.getModuleFile());
- // @Ryan TODO This should probably be implemented and run as a normal service for consistency;
- // although, it does need all modules to be loaded and their prior to running.
IRestApiService restApi = moduleContext.getServiceImpl(IRestApiService.class);
restApi.run();
} catch (FloodlightModuleConfigFileNotFoundException e) {
diff --git a/src/main/java/net/floodlightcontroller/core/OFConnectionCounters.java b/src/main/java/net/floodlightcontroller/core/OFConnectionCounters.java
index b88d55c29f..aef32b24d9 100644
--- a/src/main/java/net/floodlightcontroller/core/OFConnectionCounters.java
+++ b/src/main/java/net/floodlightcontroller/core/OFConnectionCounters.java
@@ -37,8 +37,8 @@ public class OFConnectionCounters {
private final IDebugCounter ctrWriteGetConfigReply;
private final IDebugCounter ctrWriteSetConfig;
private final IDebugCounter ctrWritePacketIn;
- private final IDebugCounter ctrWritePacketOut;
private final IDebugCounter ctrWriteFlowRemoved;
+ private final IDebugCounter ctrWritePacketOut;
private final IDebugCounter ctrWritePortStatus;
private final IDebugCounter ctrWriteFlowMod;
private final IDebugCounter ctrWritePortMod;
@@ -46,16 +46,21 @@ public class OFConnectionCounters {
private final IDebugCounter ctrWriteStatsReply;
private final IDebugCounter ctrWriteBarrierRequest;
private final IDebugCounter ctrWriteBarrierReply;
- private final IDebugCounter ctrWriteGetAsyncReply;
- private final IDebugCounter ctrWriteGetAsyncRequest;
- private final IDebugCounter ctrWriteGroupMod;
- private final IDebugCounter ctrWriteMeterMod;
- private final IDebugCounter ctrWriteQueueGetConfigReply;
private final IDebugCounter ctrWriteQueueGetConfigRequest;
+ private final IDebugCounter ctrWriteQueueGetConfigReply;
+ private final IDebugCounter ctrWriteGroupMod;
+ private final IDebugCounter ctrWriteTableMod;
private final IDebugCounter ctrWriteRoleRequest;
private final IDebugCounter ctrWriteRoleReply;
+ private final IDebugCounter ctrWriteGetAsyncRequest;
+ private final IDebugCounter ctrWriteGetAsyncReply;
private final IDebugCounter ctrWriteSetAsync;
- private final IDebugCounter ctrWriteTableMod;
+ private final IDebugCounter ctrWriteMeterMod;
+ private final IDebugCounter ctrWriteRoleStatus;
+ private final IDebugCounter ctrWriteTableStatus;
+ private final IDebugCounter ctrWriteRequestForward;
+ private final IDebugCounter ctrWriteBundleControl;
+ private final IDebugCounter ctrWriteBundleAdd;
// Read Counters
//
@@ -89,6 +94,11 @@ public class OFConnectionCounters {
private final IDebugCounter ctrReadRoleReply;
private final IDebugCounter ctrReadSetAsync;
private final IDebugCounter ctrReadTableMod;
+ private final IDebugCounter ctrReadRoleStatus;
+ private final IDebugCounter ctrReadTableStatus;
+ private final IDebugCounter ctrReadBundleAdd;
+ private final IDebugCounter ctrReadBundleControl;
+ private final IDebugCounter ctrReadRequestForward;
private static final Logger logger =
LoggerFactory.getLogger(OFConnectionCounters.class);
@@ -287,6 +297,36 @@ public OFConnectionCounters(IDebugCounterService counters,
hierarchy,
stringId,
OFType.TABLE_MOD.toString());
+
+ ctrWriteBundleAdd =
+ registerCounterLocal(counters,
+ hierarchy,
+ stringId,
+ OFType.BUNDLE_ADD_MESSAGE.toString());
+
+ ctrWriteBundleControl =
+ registerCounterLocal(counters,
+ hierarchy,
+ stringId,
+ OFType.BUNDLE_CONTROL.toString());
+
+ ctrWriteRequestForward =
+ registerCounterLocal(counters,
+ hierarchy,
+ stringId,
+ OFType.REQUESTFORWARD.toString());
+
+ ctrWriteRoleStatus =
+ registerCounterLocal(counters,
+ hierarchy,
+ stringId,
+ OFType.ROLE_STATUS.toString());
+
+ ctrWriteTableStatus =
+ registerCounterLocal(counters,
+ hierarchy,
+ stringId,
+ OFType.TABLE_STATUS.toString());
// Register Read Counters
//
@@ -446,6 +486,36 @@ public OFConnectionCounters(IDebugCounterService counters,
hierarchy,
stringId,
OFType.TABLE_MOD.toString());
+
+ ctrReadBundleAdd =
+ registerCounterLocal(counters,
+ hierarchy,
+ stringId,
+ OFType.BUNDLE_ADD_MESSAGE.toString());
+
+ ctrReadBundleControl =
+ registerCounterLocal(counters,
+ hierarchy,
+ stringId,
+ OFType.BUNDLE_CONTROL.toString());
+
+ ctrReadRequestForward =
+ registerCounterLocal(counters,
+ hierarchy,
+ stringId,
+ OFType.REQUESTFORWARD.toString());
+
+ ctrReadRoleStatus =
+ registerCounterLocal(counters,
+ hierarchy,
+ stringId,
+ OFType.ROLE_STATUS.toString());
+
+ ctrReadTableStatus =
+ registerCounterLocal(counters,
+ hierarchy,
+ stringId,
+ OFType.TABLE_STATUS.toString());
}
/**
@@ -583,7 +653,27 @@ public void updateWriteStats(OFMessage ofm) {
case TABLE_MOD:
ctrWriteTableMod.increment();
break;
-
+
+ case BUNDLE_ADD_MESSAGE:
+ ctrWriteBundleAdd.increment();
+ break;
+
+ case BUNDLE_CONTROL:
+ ctrWriteBundleControl.increment();
+ break;
+
+ case REQUESTFORWARD:
+ ctrWriteRequestForward.increment();
+ break;
+
+ case ROLE_STATUS:
+ ctrWriteRoleStatus.increment();
+ break;
+
+ case TABLE_STATUS:
+ ctrWriteTableStatus.increment();
+ break;
+
default:
logger.warn(ofm.getType().toString() +
": Invalid OpenFlow Messaqe!");
@@ -716,6 +806,26 @@ public void updateReadStats(OFMessage ofm){
case TABLE_MOD:
ctrReadTableMod.increment();
break;
+
+ case BUNDLE_ADD_MESSAGE:
+ ctrReadBundleAdd.increment();
+ break;
+
+ case BUNDLE_CONTROL:
+ ctrReadBundleControl.increment();
+ break;
+
+ case REQUESTFORWARD:
+ ctrReadRequestForward.increment();
+ break;
+
+ case ROLE_STATUS:
+ ctrReadRoleStatus.increment();
+ break;
+
+ case TABLE_STATUS:
+ ctrReadTableStatus.increment();
+ break;
default:
logger.warn(ofm.getType().toString() +
diff --git a/src/main/java/net/floodlightcontroller/core/OFSwitch.java b/src/main/java/net/floodlightcontroller/core/OFSwitch.java
index e8c0b1da6c..ece9ac5615 100644
--- a/src/main/java/net/floodlightcontroller/core/OFSwitch.java
+++ b/src/main/java/net/floodlightcontroller/core/OFSwitch.java
@@ -701,7 +701,7 @@ public void removeConnection(IOFConnectionBackend connection) {
@Override
public void write(OFMessage m) {
- log.debug("Channel info: {} {}", connections.get(OFAuxId.MAIN).getRemoteInetAddress(), connections.get(OFAuxId.MAIN).isConnected());
+ log.trace("Channel: {}, Connected: {}", connections.get(OFAuxId.MAIN).getRemoteInetAddress(), connections.get(OFAuxId.MAIN).isConnected());
connections.get(OFAuxId.MAIN).write(m);
}
diff --git a/src/main/java/net/floodlightcontroller/core/internal/Controller.java b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
index 730287381a..86299625e9 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/Controller.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
@@ -178,9 +178,6 @@ public enum ModuleLoaderState {
FLOW_COLUMN_ACCESS_PRIORITY,
FLOW_COLUMN_CORE_PRIORITY
};
-
- // TODO @Ryan delete? not referenced anywhere private static short DEFAULT_ACCESS_PRIORITY = 10;
- // TODO @Ryan delete? not referenced anywhere private static short DEFAULT_CORE_PRIORITY = 1000;
// Perf. related configuration
protected static final int SEND_BUFFER_SIZE = 128 * 1024;
@@ -250,9 +247,7 @@ public interface IUpdate {
*/
public void dispatch();
}
-
- //TODO @Ryan ReadyForReconcileUpdate was here. Obsolete?
-
+
/**
* Update message indicating
* IPs of controllers in controller cluster have changed.
@@ -443,7 +438,7 @@ protected void flcontext_free(FloodlightContext flcontext) {
public void handleMessage(IOFSwitch sw, OFMessage m,
FloodlightContext bContext) {
Ethernet eth = null;
- log.debug("~~~~~~~~GOT PACKET IN MESSAGE FROM SWITCH~~~~~~~~~");
+ log.trace("Dispatching OFMessage to listeners.");
if (this.notifiedRole == HARole.STANDBY) {
counters.dispatchMessageWhileStandby.increment();
// We are SLAVE. Do not dispatch messages to listeners.
@@ -796,7 +791,7 @@ public void startupComponents(FloodlightModuleLoader floodlightModuleLoader) thr
storageSourceService.createTable(FLOW_PRIORITY_TABLE_NAME, null);
storageSourceService.setTablePrimaryKeyName(FLOW_PRIORITY_TABLE_NAME, FLOW_COLUMN_PRIMARY_KEY);
storageSourceService.addListener(FLOW_PRIORITY_TABLE_NAME, this);
- readFlowPriorityConfigurationFromStorage();
+ readFlowPriorityConfigurationFromStorage(); //
// Startup load monitoring
if (overload_drop) {
@@ -833,10 +828,10 @@ private void readFlowPriorityConfigurationFromStorage() {
String primary_key = (String) row.get(FLOW_COLUMN_PRIMARY_KEY);
if (primary_key.equals(FLOW_VALUE_PRIMARY_KEY)) {
if (row.containsKey(FLOW_COLUMN_ACCESS_PRIORITY)) {
- //TODO @Ryan delete? Not referenced anywhere DEFAULT_ACCESS_PRIORITY = Short.valueOf((String) row.get(FLOW_COLUMN_ACCESS_PRIORITY));
+ // Not used anymore DEFAULT_ACCESS_PRIORITY = Short.valueOf((String) row.get(FLOW_COLUMN_ACCESS_PRIORITY));
}
if (row.containsKey(FLOW_COLUMN_CORE_PRIORITY)) {
- //TODO @Ryan delete? Not referenced anywhere DEFAULT_CORE_PRIORITY = Short.valueOf((String) row.get(FLOW_COLUMN_CORE_PRIORITY));
+ // Not used anymore DEFAULT_CORE_PRIORITY = Short.valueOf((String) row.get(FLOW_COLUMN_CORE_PRIORITY));
}
}
}
diff --git a/src/main/java/net/floodlightcontroller/core/internal/OFSwitchHandshakeHandler.java b/src/main/java/net/floodlightcontroller/core/internal/OFSwitchHandshakeHandler.java
index 5acd44059d..e70b43c36b 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/OFSwitchHandshakeHandler.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/OFSwitchHandshakeHandler.java
@@ -37,6 +37,8 @@
import org.projectfloodlight.openflow.protocol.OFFactories;
import org.projectfloodlight.openflow.protocol.OFFactory;
import org.projectfloodlight.openflow.protocol.OFFeaturesReply;
+import org.projectfloodlight.openflow.protocol.OFFlowAdd;
+import org.projectfloodlight.openflow.protocol.OFFlowDelete;
import org.projectfloodlight.openflow.protocol.OFFlowModFailedCode;
import org.projectfloodlight.openflow.protocol.OFFlowRemoved;
import org.projectfloodlight.openflow.protocol.OFGetConfigReply;
@@ -57,10 +59,13 @@
import org.projectfloodlight.openflow.protocol.OFStatsType;
import org.projectfloodlight.openflow.protocol.OFType;
import org.projectfloodlight.openflow.protocol.OFVersion;
+import org.projectfloodlight.openflow.protocol.action.OFAction;
import org.projectfloodlight.openflow.protocol.errormsg.OFBadRequestErrorMsg;
import org.projectfloodlight.openflow.protocol.errormsg.OFFlowModFailedErrorMsg;
import org.projectfloodlight.openflow.types.DatapathId;
import org.projectfloodlight.openflow.types.OFAuxId;
+import org.projectfloodlight.openflow.types.OFPort;
+import org.projectfloodlight.openflow.types.TableId;
import org.projectfloodlight.openflow.types.U64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -417,6 +422,51 @@ synchronized private void setSwitchRole(OFControllerRole role, RoleRecvStatus st
}
}
+ /**
+ * Removes all present flows and adds an initial table-miss flow to each
+ * and every table on the switch. This replaces the default behavior of
+ * forwarding table-miss packets to the controller. The table-miss flows
+ * inserted will forward all packets that do not match a flow to the
+ * controller for processing.
+ *
+ * Adding the default flow only applies to OpenFlow 1.3+ switches, which
+ * remove the default forward-to-controller behavior of flow tables.
+ */
+ private void clearAndSetDefaultFlows() {
+ /*
+ * No tables for OF1.0, so omit that field for flow deletion.
+ */
+ if (this.sw.getOFFactory().getVersion().compareTo(OFVersion.OF_10) == 0) {
+ OFFlowDelete deleteFlows = this.factory.buildFlowDelete()
+ .build();
+ this.sw.write(deleteFlows);
+ } else { /* All other OFVersions support multiple tables. */
+ OFFlowDelete deleteFlows = this.factory.buildFlowDelete()
+ .setTableId(TableId.ALL)
+ .build();
+ this.sw.write(deleteFlows);
+ }
+
+ /*
+ * Only for OF1.3+, insert the default forward-to-controller flow for
+ * each table. This is priority=0 with no Match.
+ */
+ if (this.sw.getOFFactory().getVersion().compareTo(OFVersion.OF_13) >= 0) {
+ ArrayList actions = new ArrayList(1);
+ actions.add(factory.actions().output(OFPort.CONTROLLER, 0xffFFffFF));
+ ArrayList flows = new ArrayList();
+ for (int tableId = 0; tableId < this.sw.getTables(); tableId++) {
+ OFFlowAdd defaultFlow = this.factory.buildFlowAdd()
+ .setTableId(TableId.of(tableId))
+ .setPriority(0)
+ .setActions(actions)
+ .build();
+ flows.add(defaultFlow);
+ }
+ this.sw.write(flows);
+ }
+ }
+
/**
* Default implementation for message handlers in any state.
*
@@ -812,7 +862,7 @@ void enterState() {
* - use the switch driver to bind the switch and get an IOFSwitch
* instance, setup the switch instance
* - setup the IOFSwitch instance
- * - add switch to FloodlightProvider and send the intial role
+ * - add switch to FloodlightProvider and send the initial role
* request to the switch.
*
* Next state: WaitOFAuxCxnsReplyState (if OF1.3), else
@@ -1084,6 +1134,7 @@ public class MasterState extends OFSwitchHandshakeState {
@Override
void enterState() {
setSwitchStatus(SwitchStatus.MASTER);
+ clearAndSetDefaultFlows();
}
@LogMessageDoc(level="WARN",
diff --git a/src/main/java/net/floodlightcontroller/core/web/AllSwitchStatisticsResource.java b/src/main/java/net/floodlightcontroller/core/web/AllSwitchStatisticsResource.java
index 72e7698b39..3a7624943f 100644
--- a/src/main/java/net/floodlightcontroller/core/web/AllSwitchStatisticsResource.java
+++ b/src/main/java/net/floodlightcontroller/core/web/AllSwitchStatisticsResource.java
@@ -1,19 +1,19 @@
/**
-* Copyright 2011, Big Switch Networks, Inc.
-* Originally created by David Erickson, Stanford 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.
-**/
+ * Copyright 2011, Big Switch Networks, Inc.
+ * Originally created by David Erickson, Stanford 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 net.floodlightcontroller.core.web;
@@ -39,139 +39,173 @@
* @author readams
*/
public class AllSwitchStatisticsResource extends SwitchResourceBase {
- protected static Logger log =
- LoggerFactory.getLogger(AllSwitchStatisticsResource.class);
-
- @Get("json")
- public Map retrieve() {
- String statType = (String) getRequestAttributes().get(CoreWebRoutable.STR_STAT_TYPE);
- return retrieveInternal(statType);
- }
-
- public Map retrieveInternal(String statType) {
- HashMap model = new HashMap();
-
- OFStatsType type = null;
- REQUESTTYPE rType = null;
-
- switch (statType) {
- case OFStatsTypeStrings.PORT:
- type = OFStatsType.PORT;
- rType = REQUESTTYPE.OFSTATS;
- break;
- case OFStatsTypeStrings.QUEUE:
- type = OFStatsType.QUEUE;
- rType = REQUESTTYPE.OFSTATS;
- break;
- case OFStatsTypeStrings.FLOW:
- type = OFStatsType.FLOW;
- rType = REQUESTTYPE.OFSTATS;
- break;
- case OFStatsTypeStrings.AGGREGATE:
- type = OFStatsType.AGGREGATE;
- rType = REQUESTTYPE.OFSTATS;
- break;
- case OFStatsTypeStrings.DESC:
- type = OFStatsType.DESC;
- rType = REQUESTTYPE.OFSTATS;
- break;
- case OFStatsTypeStrings.TABLE:
- type = OFStatsType.TABLE;
- rType = REQUESTTYPE.OFSTATS;
- break;
- case OFStatsTypeStrings.FEATURES:
- rType = REQUESTTYPE.OFFEATURES;
- break;
- default:
- return model;
- }
-
- IOFSwitchService switchService =
- (IOFSwitchService) getContext().getAttributes().
- get(IOFSwitchService.class.getCanonicalName());
- Set switchDpids = switchService.getAllSwitchDpids();
- List activeThreads = new ArrayList(switchDpids.size());
- List pendingRemovalThreads = new ArrayList();
- GetConcurrentStatsThread t;
- for (DatapathId l : switchDpids) {
- t = new GetConcurrentStatsThread(l, rType, type);
- activeThreads.add(t);
- t.start();
- }
-
- // Join all the threads after the timeout. Set a hard timeout
- // of 12 seconds for the threads to finish. If the thread has not
- // finished the switch has not replied yet and therefore we won't
- // add the switch's stats to the reply.
- for (int iSleepCycles = 0; iSleepCycles < 12; iSleepCycles++) {
- for (GetConcurrentStatsThread curThread : activeThreads) {
- if (curThread.getState() == State.TERMINATED) {
- if (rType == REQUESTTYPE.OFSTATS) {
- model.put(curThread.getSwitchId().toString(), curThread.getStatisticsReply());
- } else if (rType == REQUESTTYPE.OFFEATURES) {
- model.put(curThread.getSwitchId().toString(), curThread.getFeaturesReply());
- }
- pendingRemovalThreads.add(curThread);
- }
- }
-
- // remove the threads that have completed the queries to the switches
- for (GetConcurrentStatsThread curThread : pendingRemovalThreads) {
- activeThreads.remove(curThread);
- }
- // clear the list so we don't try to double remove them
- pendingRemovalThreads.clear();
-
- // if we are done finish early so we don't always get the worst case
- if (activeThreads.isEmpty()) {
- break;
- }
-
- // sleep for 1 s here
- try {
- Thread.sleep(1000);
- } catch (InterruptedException e) {
- log.error("Interrupted while waiting for statistics", e);
- }
- }
-
- return model;
- }
-
- protected class GetConcurrentStatsThread extends Thread {
- private List switchReply;
- private DatapathId switchId;
- private OFStatsType statType;
- private REQUESTTYPE requestType;
- private OFFeaturesReply featuresReply;
-
- public GetConcurrentStatsThread(DatapathId switchId, REQUESTTYPE requestType, OFStatsType statType) {
- this.switchId = switchId;
- this.requestType = requestType;
- this.statType = statType;
- this.switchReply = null;
- this.featuresReply = null;
- }
-
- public List getStatisticsReply() {
- return switchReply;
- }
-
- public OFFeaturesReply getFeaturesReply() {
- return featuresReply;
- }
-
- public DatapathId getSwitchId() {
- return switchId;
- }
-
- @Override
- public void run() {
- if ((requestType == REQUESTTYPE.OFSTATS) && (statType != null)) {
- switchReply = getSwitchStatistics(switchId, statType);
- } else if (requestType == REQUESTTYPE.OFFEATURES) {
- featuresReply = getSwitchFeaturesReply(switchId);
- }
- }
- }
+ protected static Logger log =
+ LoggerFactory.getLogger(AllSwitchStatisticsResource.class);
+
+ @Get("json")
+ public Map retrieve() {
+ String statType = (String) getRequestAttributes().get(CoreWebRoutable.STR_STAT_TYPE);
+
+ return retrieveInternal(statType);
+ }
+
+ private Map retrieveInternal(String statType) {
+ HashMap model = new HashMap();
+
+ OFStatsType type = null;
+ REQUESTTYPE rType = null;
+
+ switch (statType) {
+ case OFStatsTypeStrings.PORT:
+ type = OFStatsType.PORT;
+ rType = REQUESTTYPE.OFSTATS;
+ break;
+ case OFStatsTypeStrings.PORT_DESC:
+ type = OFStatsType.PORT_DESC;
+ rType = REQUESTTYPE.OFSTATS;
+ break;
+ case OFStatsTypeStrings.QUEUE:
+ type = OFStatsType.QUEUE;
+ rType = REQUESTTYPE.OFSTATS;
+ break;
+ case OFStatsTypeStrings.FLOW:
+ type = OFStatsType.FLOW;
+ rType = REQUESTTYPE.OFSTATS;
+ break;
+ case OFStatsTypeStrings.AGGREGATE:
+ type = OFStatsType.AGGREGATE;
+ rType = REQUESTTYPE.OFSTATS;
+ break;
+ case OFStatsTypeStrings.DESC:
+ type = OFStatsType.DESC;
+ rType = REQUESTTYPE.OFSTATS;
+ break;
+ case OFStatsTypeStrings.TABLE:
+ type = OFStatsType.TABLE;
+ rType = REQUESTTYPE.OFSTATS;
+ break;
+ case OFStatsTypeStrings.TABLE_FEATURES:
+ type = OFStatsType.TABLE_FEATURES;
+ rType = REQUESTTYPE.OFSTATS;
+ break;
+
+ case OFStatsTypeStrings.GROUP:
+ type = OFStatsType.GROUP;
+ rType = REQUESTTYPE.OFSTATS;
+ break;
+ case OFStatsTypeStrings.GROUP_DESC:
+ type = OFStatsType.GROUP_DESC;
+ rType = REQUESTTYPE.OFSTATS;
+ break;
+ case OFStatsTypeStrings.GROUP_FEATURES:
+ type = OFStatsType.GROUP_FEATURES;
+ rType = REQUESTTYPE.OFSTATS;
+ break;
+ case OFStatsTypeStrings.METER:
+ type = OFStatsType.METER;
+ rType = REQUESTTYPE.OFSTATS;
+ break;
+ case OFStatsTypeStrings.METER_CONFIG:
+ type = OFStatsType.METER_CONFIG;
+ rType = REQUESTTYPE.OFSTATS;
+ break;
+ case OFStatsTypeStrings.METER_FEATURES:
+ type = OFStatsType.METER_FEATURES;
+ rType = REQUESTTYPE.OFSTATS;
+ break;
+ case OFStatsTypeStrings.FEATURES:
+ rType = REQUESTTYPE.OFFEATURES;
+ break;
+ default:
+ return model;
+ }
+
+ IOFSwitchService switchService = (IOFSwitchService) getContext().getAttributes().
+ get(IOFSwitchService.class.getCanonicalName());
+
+ Set switchDpids = switchService.getAllSwitchDpids();
+ List activeThreads = new ArrayList(switchDpids.size());
+ List pendingRemovalThreads = new ArrayList();
+ GetConcurrentStatsThread t;
+ for (DatapathId l : switchDpids) {
+ t = new GetConcurrentStatsThread(l, rType, type);
+ activeThreads.add(t);
+ t.start();
+ }
+
+ // Join all the threads after the timeout. Set a hard timeout
+ // of 12 seconds for the threads to finish. If the thread has not
+ // finished the switch has not replied yet and therefore we won't
+ // add the switch's stats to the reply.
+ for (int iSleepCycles = 0; iSleepCycles < 12; iSleepCycles++) {
+ for (GetConcurrentStatsThread curThread : activeThreads) {
+ if (curThread.getState() == State.TERMINATED) {
+ if (rType == REQUESTTYPE.OFSTATS) {
+ model.put(curThread.getSwitchId().toString(), new StatsReply(curThread.getSwitchId(), curThread.getStatisticsReply(), type));
+ } else if (rType == REQUESTTYPE.OFFEATURES) {
+ model.put(curThread.getSwitchId().toString(), new StatsReply(curThread.getSwitchId(), curThread.getFeaturesReply(), type));
+ }
+ pendingRemovalThreads.add(curThread);
+ }
+ }
+
+ // remove the threads that have completed the queries to the switches
+ for (GetConcurrentStatsThread curThread : pendingRemovalThreads) {
+ activeThreads.remove(curThread);
+ }
+ // clear the list so we don't try to double remove them
+ pendingRemovalThreads.clear();
+
+ // if we are done finish early so we don't always get the worst case
+ if (activeThreads.isEmpty()) {
+ break;
+ }
+
+ // sleep for 1 s here
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ log.error("Interrupted while waiting for statistics", e);
+ }
+ }
+
+ return model;
+ }
+
+ protected class GetConcurrentStatsThread extends Thread {
+ private List switchReply;
+ private DatapathId switchId;
+ private OFStatsType statType;
+ private REQUESTTYPE requestType;
+ private OFFeaturesReply featuresReply;
+
+ public GetConcurrentStatsThread(DatapathId switchId, REQUESTTYPE requestType, OFStatsType statType) {
+ this.switchId = switchId;
+ this.requestType = requestType;
+ this.statType = statType;
+ this.switchReply = null;
+ this.featuresReply = null;
+ }
+
+ public List getStatisticsReply() {
+ return switchReply;
+ }
+
+ public OFFeaturesReply getFeaturesReply() {
+ return featuresReply;
+ }
+
+ public DatapathId getSwitchId() {
+ return switchId;
+ }
+
+ @Override
+ public void run() {
+ if ((requestType == REQUESTTYPE.OFSTATS) && (statType != null)) {
+ switchReply = getSwitchStatistics(switchId, statType);
+ } else if (requestType == REQUESTTYPE.OFFEATURES) {
+ featuresReply = getSwitchFeaturesReply(switchId);
+ }
+ }
+ }
}
diff --git a/src/main/java/net/floodlightcontroller/core/web/ControllerSwitchesResource.java b/src/main/java/net/floodlightcontroller/core/web/ControllerSwitchesResource.java
index 63d361fcd9..423b8c1f6d 100644
--- a/src/main/java/net/floodlightcontroller/core/web/ControllerSwitchesResource.java
+++ b/src/main/java/net/floodlightcontroller/core/web/ControllerSwitchesResource.java
@@ -18,25 +18,59 @@
package net.floodlightcontroller.core.web;
import java.util.Set;
+import java.util.HashSet;
import net.floodlightcontroller.core.internal.IOFSwitchService;
+import net.floodlightcontroller.core.IOFSwitch;
import org.projectfloodlight.openflow.types.DatapathId;
import org.restlet.resource.Get;
import org.restlet.resource.ServerResource;
+import net.floodlightcontroller.core.web.serializers.DPIDSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
/**
* Get a list of switches connected to the controller
* @author readams
*/
public class ControllerSwitchesResource extends ServerResource {
-
- public static final String DPID_ERROR = "Invalid switch DPID string. Must be a 64-bit value in the form 00:11:22:33:44:55:66:77.";
-
+
+ public static final String DPID_ERROR = "Invalid switch DPID string. Must be a 64-bit value in the form 00:11:22:33:44:55:66:77.";
+ public static class DatapathIDJsonSerializerWrapper {
+ private final DatapathId dpid;
+ private final String inetAddress;
+ private final long connectedSince;
+ public DatapathIDJsonSerializerWrapper(DatapathId dpid, String inetAddress, long connectedSince) {
+ this.dpid = dpid;
+ this.inetAddress = inetAddress;
+ this.connectedSince = connectedSince;
+ }
+
+ @JsonSerialize(using=DPIDSerializer.class)
+ public DatapathId getSwitchDPID() {
+ return dpid;
+ }
+ public String getInetAddress() {
+ return inetAddress;
+ }
+ public long getConnectedSince() {
+ return connectedSince;
+ }
+
+
+
+ }
+
@Get("json")
- public Set retrieve(){
+ public Set retrieve(){
IOFSwitchService switchService =
(IOFSwitchService) getContext().getAttributes().
get(IOFSwitchService.class.getCanonicalName());
- return switchService.getAllSwitchDpids();
+ Set dpidSets = new HashSet();
+ for(IOFSwitch sw: switchService.getAllSwitchMap().values()) {
+ dpidSets.add(new DatapathIDJsonSerializerWrapper(sw.getId(), sw.getInetAddress().toString(), sw.getConnectedSince().getTime()));
+
+ }
+ return dpidSets;
}
}
diff --git a/src/main/java/net/floodlightcontroller/core/web/SwitchResourceBase.java b/src/main/java/net/floodlightcontroller/core/web/SwitchResourceBase.java
index 99b4d2d830..358d737171 100644
--- a/src/main/java/net/floodlightcontroller/core/web/SwitchResourceBase.java
+++ b/src/main/java/net/floodlightcontroller/core/web/SwitchResourceBase.java
@@ -27,6 +27,7 @@
import org.projectfloodlight.openflow.protocol.OFFeaturesReply;
import org.projectfloodlight.openflow.protocol.match.Match;
+import org.projectfloodlight.openflow.protocol.ver13.OFMeterSerializerVer13;
import org.projectfloodlight.openflow.types.DatapathId;
import org.projectfloodlight.openflow.types.OFPort;
import org.projectfloodlight.openflow.types.TableId;
@@ -34,6 +35,7 @@
import org.projectfloodlight.openflow.protocol.OFStatsReply;
import org.projectfloodlight.openflow.protocol.OFStatsRequest;
import org.projectfloodlight.openflow.protocol.OFStatsType;
+import org.projectfloodlight.openflow.protocol.OFVersion;
import org.restlet.resource.ResourceException;
import org.restlet.resource.ServerResource;
import org.slf4j.Logger;
@@ -61,6 +63,13 @@ protected void doInit() throws ResourceException {
}
+ /**
+ * Use for requests that originate from the REST server that use their context to get a
+ * reference to the switch service.
+ * @param switchId
+ * @param statType
+ * @return
+ */
@SuppressWarnings("unchecked")
@LogMessageDoc(level="ERROR",
message="Failure retrieving statistics from switch {switch}",
@@ -70,9 +79,7 @@ protected void doInit() throws ResourceException {
LogMessageDoc.GENERIC_ACTION)
protected List getSwitchStatistics(DatapathId switchId,
OFStatsType statType) {
- IOFSwitchService switchService =
- (IOFSwitchService) getContext().getAttributes().
- get(IOFSwitchService.class.getCanonicalName());
+ IOFSwitchService switchService = (IOFSwitchService) getContext().getAttributes().get(IOFSwitchService.class.getCanonicalName());
IOFSwitch sw = switchService.getSwitch(switchId);
ListenableFuture future;
@@ -109,20 +116,73 @@ protected List getSwitchStatistics(DatapathId switchId,
.build();
break;
case DESC:
- case TABLE:
// pass - nothing todo besides set the type above
req = sw.getOFFactory().buildDescStatsRequest()
.build();
break;
- case EXPERIMENTER: //TODO @Ryan support new OF1.1+ stats types
case GROUP:
- case GROUP_DESC:
- case GROUP_FEATURES:
+ if (sw.getOFFactory().getVersion().compareTo(OFVersion.OF_10) > 0) {
+ req = sw.getOFFactory().buildGroupStatsRequest()
+ .build();
+ }
+ break;
+
case METER:
+ if (sw.getOFFactory().getVersion().compareTo(OFVersion.OF_13) >= 0) {
+ req = sw.getOFFactory().buildMeterStatsRequest()
+ .setMeterId(OFMeterSerializerVer13.ALL_VAL)
+ .build();
+ }
+ break;
+
+ case GROUP_DESC:
+ if (sw.getOFFactory().getVersion().compareTo(OFVersion.OF_10) > 0) {
+ req = sw.getOFFactory().buildGroupDescStatsRequest()
+ .build();
+ }
+ break;
+
+ case GROUP_FEATURES:
+ if (sw.getOFFactory().getVersion().compareTo(OFVersion.OF_10) > 0) {
+ req = sw.getOFFactory().buildGroupFeaturesStatsRequest()
+ .build();
+ }
+ break;
+
case METER_CONFIG:
+ if (sw.getOFFactory().getVersion().compareTo(OFVersion.OF_13) >= 0) {
+ req = sw.getOFFactory().buildMeterConfigStatsRequest()
+ .build();
+ }
+ break;
+
case METER_FEATURES:
+ if (sw.getOFFactory().getVersion().compareTo(OFVersion.OF_13) >= 0) {
+ req = sw.getOFFactory().buildMeterFeaturesStatsRequest()
+ .build();
+ }
+ break;
+
+ case TABLE:
+ if (sw.getOFFactory().getVersion().compareTo(OFVersion.OF_10) > 0) {
+ req = sw.getOFFactory().buildTableStatsRequest()
+ .build();
+ }
+ break;
+
+ case TABLE_FEATURES:
+ if (sw.getOFFactory().getVersion().compareTo(OFVersion.OF_10) > 0) {
+ req = sw.getOFFactory().buildTableFeaturesStatsRequest()
+ .build();
+ }
+ break;
case PORT_DESC:
- case TABLE_FEATURES:
+ if (sw.getOFFactory().getVersion().compareTo(OFVersion.OF_13) >= 0) {
+ req = sw.getOFFactory().buildPortDescStatsRequest()
+ .build();
+ }
+ break;
+ case EXPERIMENTER: //TODO @Ryan support new OF1.1+ stats types
default:
log.error("Stats Request Type {} not implemented yet", statType.name());
break;
@@ -167,6 +227,5 @@ protected OFFeaturesReply getSwitchFeaturesReply(DatapathId switchId) {
protected OFFeaturesReply getSwitchFeaturesReply(String switchId) {
return getSwitchFeaturesReply(DatapathId.of(switchId));
- }
-
-}
\ No newline at end of file
+ }
+}
diff --git a/src/main/java/net/floodlightcontroller/core/web/SwitchStatisticsResource.java b/src/main/java/net/floodlightcontroller/core/web/SwitchStatisticsResource.java
index a6e7ad5e3d..89733f1d15 100644
--- a/src/main/java/net/floodlightcontroller/core/web/SwitchStatisticsResource.java
+++ b/src/main/java/net/floodlightcontroller/core/web/SwitchStatisticsResource.java
@@ -36,6 +36,7 @@ public class SwitchStatisticsResource extends SwitchResourceBase {
@Get("json")
public StatsReply retrieve(){
+
StatsReply result = new StatsReply();
Object values = null; // set for error detection in serializer
String switchIdStr = (String) getRequestAttributes().get(CoreWebRoutable.STR_SWITCH_ID);
@@ -53,9 +54,7 @@ public StatsReply retrieve(){
}
// stop if the DPID is invalid or is not presently connected
- if (!switchId.equals(DatapathId.NONE) && switchService.getSwitch(switchId) != null) {
- // TODO these strings should be defined someplace. StatsReply.java?
-
+ if (!switchId.equals(DatapathId.NONE) && switchService.getSwitch(switchId) != null) {
// at this point, the switch DPID is valid AND exists; what about the OFStatsType?
switch (statType) {
case OFStatsTypeStrings.PORT:
@@ -77,47 +76,50 @@ public StatsReply retrieve(){
case OFStatsTypeStrings.DESC:
values = getSwitchStatistics(switchId, OFStatsType.DESC);
result.setStatType(OFStatsType.DESC);
- break;
- case OFStatsTypeStrings.TABLE:
- values = getSwitchStatistics(switchId, OFStatsType.TABLE);
- result.setStatType(OFStatsType.TABLE);
- break;
- case OFStatsTypeStrings.TABLE_FEATURES:
- values = getSwitchFeaturesReply(switchId);
- result.setStatType(OFStatsType.TABLE_FEATURES);
- break;
- case OFStatsTypeStrings.EXPERIMENTER:
- values = getSwitchFeaturesReply(switchId);
- result.setStatType(OFStatsType.EXPERIMENTER);
- break;
+ break;
case OFStatsTypeStrings.PORT_DESC:
- values = getSwitchFeaturesReply(switchId);
+ values = getSwitchStatistics(switchId, OFStatsType.PORT_DESC);
result.setStatType(OFStatsType.PORT_DESC);
break;
case OFStatsTypeStrings.GROUP:
- values = getSwitchFeaturesReply(switchId);
+ values = getSwitchStatistics(switchId, OFStatsType.GROUP);
result.setStatType(OFStatsType.GROUP);
break;
case OFStatsTypeStrings.GROUP_DESC:
- values = getSwitchFeaturesReply(switchId);
+ values = getSwitchStatistics(switchId, OFStatsType.GROUP_DESC);
result.setStatType(OFStatsType.GROUP_DESC);
break;
case OFStatsTypeStrings.GROUP_FEATURES:
- values = getSwitchFeaturesReply(switchId);
+ values = getSwitchStatistics(switchId, OFStatsType.GROUP_FEATURES);
result.setStatType(OFStatsType.GROUP_FEATURES);
break;
case OFStatsTypeStrings.METER:
- values = getSwitchFeaturesReply(switchId);
+ values = getSwitchStatistics(switchId, OFStatsType.METER);
result.setStatType(OFStatsType.METER);
break;
case OFStatsTypeStrings.METER_CONFIG:
- values = getSwitchFeaturesReply(switchId);
+ values = getSwitchStatistics(switchId, OFStatsType.METER_CONFIG);
result.setStatType(OFStatsType.METER_CONFIG);
break;
case OFStatsTypeStrings.METER_FEATURES:
- values = getSwitchFeaturesReply(switchId);
+ values = getSwitchStatistics(switchId, OFStatsType.METER_FEATURES);
result.setStatType(OFStatsType.METER_FEATURES);
break;
+ case OFStatsTypeStrings.TABLE:
+ values = getSwitchStatistics(switchId, OFStatsType.TABLE);
+ result.setStatType(OFStatsType.TABLE);
+ break;
+ case OFStatsTypeStrings.TABLE_FEATURES:
+ values = getSwitchStatistics(switchId, OFStatsType.TABLE_FEATURES);
+ result.setStatType(OFStatsType.TABLE_FEATURES);
+ break;
+ case OFStatsTypeStrings.EXPERIMENTER:
+ values = getSwitchFeaturesReply(switchId);
+ result.setStatType(OFStatsType.EXPERIMENTER);
+ break;
+ case OFStatsTypeStrings.FEATURES:
+ values = getSwitchFeaturesReply(switchId);
+ result.setStatType(null); // we will assume anything in "values" with a null stattype is "features"
default:
log.error("Invalid or unimplemented stat request type {}", statType);
break;
diff --git a/src/main/java/net/floodlightcontroller/core/web/serializers/MatchSerializer.java b/src/main/java/net/floodlightcontroller/core/web/serializers/MatchSerializer.java
new file mode 100644
index 0000000000..c242cc6305
--- /dev/null
+++ b/src/main/java/net/floodlightcontroller/core/web/serializers/MatchSerializer.java
@@ -0,0 +1,164 @@
+package net.floodlightcontroller.core.web.serializers;
+
+import java.io.IOException;
+import java.util.Iterator;
+
+import net.floodlightcontroller.util.MatchUtils;
+
+import org.projectfloodlight.openflow.protocol.match.Match;
+import org.projectfloodlight.openflow.protocol.match.MatchField;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+/**
+ * Serialize any Match in JSON.
+ *
+ * Use automatically by Jackson via JsonSerialize(using=MatchSerializer.class),
+ * or use the static function within this class within another serializer.
+ *
+ * @author Ryan Izard, ryan.izard@bigswitch.com, rizard@g.clemson.edu
+ */
+public class MatchSerializer extends JsonSerializer {
+ protected static Logger logger = LoggerFactory.getLogger(OFActionListSerializer.class);
+
+ @Override
+ public void serialize(Match match, JsonGenerator jGen, SerializerProvider serializer) throws IOException,
+ JsonProcessingException {
+ serializeMatch(jGen, match);
+ }
+
+ public static void serializeMatch(JsonGenerator jGen, Match match) throws IOException, JsonProcessingException {
+ // list flow matches
+ jGen.writeObjectFieldStart("match");
+ Iterator> mi = match.getMatchFields().iterator(); // get iter to any match field type
+ Match m = match;
+
+ while (mi.hasNext()) {
+ MatchField mf = mi.next();
+ switch (mf.id) {
+ case IN_PORT:
+ jGen.writeStringField(MatchUtils.STR_IN_PORT, m.get(MatchField.IN_PORT).toString());
+ break;
+ case IN_PHY_PORT:
+ jGen.writeStringField(MatchUtils.STR_IN_PHYS_PORT, m.get(MatchField.IN_PHY_PORT).toString());
+ break;
+ case ARP_OP:
+ jGen.writeNumberField(MatchUtils.STR_ARP_OPCODE, m.get(MatchField.ARP_OP).getOpcode());
+ break;
+ case ARP_SHA:
+ jGen.writeStringField(MatchUtils.STR_ARP_SHA, m.get(MatchField.ARP_SHA).toString());
+ break;
+ case ARP_SPA:
+ jGen.writeStringField(MatchUtils.STR_ARP_SPA, m.get(MatchField.ARP_SPA).toString());
+ break;
+ case ARP_THA:
+ jGen.writeStringField(MatchUtils.STR_ARP_DHA, m.get(MatchField.ARP_THA).toString());
+ break;
+ case ARP_TPA:
+ jGen.writeStringField(MatchUtils.STR_ARP_DPA, m.get(MatchField.ARP_TPA).toString());
+ break;
+ case ETH_TYPE:
+ jGen.writeNumberField(MatchUtils.STR_DL_TYPE, m.get(MatchField.ETH_TYPE).getValue());
+ break;
+ case ETH_SRC:
+ jGen.writeStringField(MatchUtils.STR_DL_SRC, m.get(MatchField.ETH_SRC).toString());
+ break;
+ case ETH_DST:
+ jGen.writeStringField(MatchUtils.STR_DL_DST, m.get(MatchField.ETH_DST).toString());
+ break;
+ case VLAN_VID:
+ jGen.writeNumberField(MatchUtils.STR_DL_VLAN, m.get(MatchField.VLAN_VID).getVlan());
+ break;
+ case VLAN_PCP:
+ jGen.writeNumberField(MatchUtils.STR_DL_VLAN_PCP, m.get(MatchField.VLAN_PCP).getValue());
+ break;
+ case ICMPV4_TYPE:
+ jGen.writeNumberField(MatchUtils.STR_ICMP_TYPE, m.get(MatchField.ICMPV4_TYPE).getType());
+ break;
+ case ICMPV4_CODE:
+ jGen.writeNumberField(MatchUtils.STR_ICMP_CODE, m.get(MatchField.ICMPV4_CODE).getCode());
+ break;
+ case ICMPV6_TYPE:
+ jGen.writeNumberField(MatchUtils.STR_ICMPV6_TYPE, m.get(MatchField.ICMPV6_TYPE).getValue());
+ break;
+ case ICMPV6_CODE:
+ jGen.writeNumberField(MatchUtils.STR_ICMPV6_CODE, m.get(MatchField.ICMPV6_CODE).getValue());
+ break;
+ case IP_DSCP:
+ jGen.writeNumberField(MatchUtils.STR_NW_DSCP, m.get(MatchField.IP_DSCP).getDscpValue());
+ break;
+ case IP_ECN:
+ jGen.writeNumberField(MatchUtils.STR_NW_ECN, m.get(MatchField.IP_ECN).getEcnValue());
+ break;
+ case IP_PROTO:
+ jGen.writeNumberField(MatchUtils.STR_NW_PROTO, m.get(MatchField.IP_PROTO).getIpProtocolNumber());
+ break;
+ case IPV4_SRC:
+ jGen.writeStringField(MatchUtils.STR_NW_SRC, m.get(MatchField.IPV4_SRC).toString());
+ break;
+ case IPV4_DST:
+ jGen.writeStringField(MatchUtils.STR_NW_DST, m.get(MatchField.IPV4_DST).toString());
+ break;
+ case IPV6_SRC:
+ jGen.writeStringField(MatchUtils.STR_IPV6_SRC, m.get(MatchField.IPV6_SRC).toString());
+ break;
+ case IPV6_DST:
+ jGen.writeStringField(MatchUtils.STR_IPV6_DST, m.get(MatchField.IPV6_DST).toString());
+ break;
+ case IPV6_FLABEL:
+ jGen.writeNumberField(MatchUtils.STR_IPV6_FLOW_LABEL, m.get(MatchField.IPV6_FLABEL).getIPv6FlowLabelValue());
+ break;
+ case IPV6_ND_SLL:
+ jGen.writeNumberField(MatchUtils.STR_IPV6_ND_SSL, m.get(MatchField.IPV6_ND_SLL).getLong());
+ break;
+ case IPV6_ND_TARGET:
+ jGen.writeNumberField(MatchUtils.STR_IPV6_ND_TARGET, m.get(MatchField.IPV6_ND_TARGET).getZeroCompressStart());
+ break;
+ case IPV6_ND_TLL:
+ jGen.writeNumberField(MatchUtils.STR_IPV6_ND_TTL, m.get(MatchField.IPV6_ND_TLL).getLong());
+ break;
+ case METADATA:
+ jGen.writeNumberField(MatchUtils.STR_METADATA, m.get(MatchField.METADATA).getValue().getValue());
+ break;
+ case MPLS_LABEL:
+ jGen.writeNumberField(MatchUtils.STR_MPLS_LABEL, m.get(MatchField.MPLS_LABEL).getValue());
+ break;
+ case MPLS_TC:
+ jGen.writeNumberField(MatchUtils.STR_MPLS_TC, m.get(MatchField.MPLS_TC).getValue());
+ break;
+ case MPLS_BOS:
+ jGen.writeStringField(MatchUtils.STR_MPLS_BOS, m.get(MatchField.MPLS_BOS).toString());
+ break;
+ case SCTP_SRC:
+ jGen.writeNumberField(MatchUtils.STR_SCTP_SRC, m.get(MatchField.SCTP_SRC).getPort());
+ break;
+ case SCTP_DST:
+ jGen.writeNumberField(MatchUtils.STR_SCTP_DST, m.get(MatchField.SCTP_DST).getPort());
+ break;
+ case TCP_SRC:
+ jGen.writeNumberField(MatchUtils.STR_TCP_SRC, m.get(MatchField.TCP_SRC).getPort());
+ break;
+ case TCP_DST:
+ jGen.writeNumberField(MatchUtils.STR_TCP_DST, m.get(MatchField.TCP_DST).getPort());
+ break;
+ case UDP_SRC:
+ jGen.writeNumberField(MatchUtils.STR_UDP_SRC, m.get(MatchField.UDP_SRC).getPort());
+ break;
+ case UDP_DST:
+ jGen.writeNumberField(MatchUtils.STR_UDP_DST, m.get(MatchField.UDP_DST).getPort());
+ break;
+ default:
+ // either a BSN or unknown match type
+ break;
+ } // end switch of match type
+ } // end while over non-wildcarded matches
+
+ jGen.writeEndObject(); // end match
+ }
+}
+
diff --git a/src/main/java/net/floodlightcontroller/core/web/serializers/OFActionListSerializer.java b/src/main/java/net/floodlightcontroller/core/web/serializers/OFActionListSerializer.java
new file mode 100644
index 0000000000..5756d5487a
--- /dev/null
+++ b/src/main/java/net/floodlightcontroller/core/web/serializers/OFActionListSerializer.java
@@ -0,0 +1,294 @@
+package net.floodlightcontroller.core.web.serializers;
+
+import java.io.IOException;
+import java.util.List;
+
+import net.floodlightcontroller.util.ActionUtils;
+import net.floodlightcontroller.util.MatchUtils;
+
+import org.projectfloodlight.openflow.protocol.action.OFAction;
+import org.projectfloodlight.openflow.protocol.action.OFActionEnqueue;
+import org.projectfloodlight.openflow.protocol.action.OFActionExperimenter;
+import org.projectfloodlight.openflow.protocol.action.OFActionGroup;
+import org.projectfloodlight.openflow.protocol.action.OFActionOutput;
+import org.projectfloodlight.openflow.protocol.action.OFActionPopMpls;
+import org.projectfloodlight.openflow.protocol.action.OFActionPushMpls;
+import org.projectfloodlight.openflow.protocol.action.OFActionPushPbb;
+import org.projectfloodlight.openflow.protocol.action.OFActionPushVlan;
+import org.projectfloodlight.openflow.protocol.action.OFActionSetDlDst;
+import org.projectfloodlight.openflow.protocol.action.OFActionSetDlSrc;
+import org.projectfloodlight.openflow.protocol.action.OFActionSetField;
+import org.projectfloodlight.openflow.protocol.action.OFActionSetMplsLabel;
+import org.projectfloodlight.openflow.protocol.action.OFActionSetMplsTc;
+import org.projectfloodlight.openflow.protocol.action.OFActionSetMplsTtl;
+import org.projectfloodlight.openflow.protocol.action.OFActionSetNwDst;
+import org.projectfloodlight.openflow.protocol.action.OFActionSetNwEcn;
+import org.projectfloodlight.openflow.protocol.action.OFActionSetNwSrc;
+import org.projectfloodlight.openflow.protocol.action.OFActionSetNwTos;
+import org.projectfloodlight.openflow.protocol.action.OFActionSetNwTtl;
+import org.projectfloodlight.openflow.protocol.action.OFActionSetQueue;
+import org.projectfloodlight.openflow.protocol.action.OFActionSetTpDst;
+import org.projectfloodlight.openflow.protocol.action.OFActionSetTpSrc;
+import org.projectfloodlight.openflow.protocol.action.OFActionSetVlanPcp;
+import org.projectfloodlight.openflow.protocol.action.OFActionSetVlanVid;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmArpOp;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmArpSha;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmArpSpa;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmArpTha;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmArpTpa;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmEthDst;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmEthSrc;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmEthType;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmIcmpv4Code;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmIcmpv4Type;
+
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmIcmpv6Code;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmIcmpv6Type;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmIpDscp;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmIpEcn;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmIpProto;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmIpv4Dst;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmIpv4Src;
+
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmIpv6Dst;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmIpv6Flabel;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmIpv6NdSll;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmIpv6NdTarget;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmIpv6NdTll;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmIpv6Src;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmMetadata;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmMplsBos;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmMplsLabel;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmMplsTc;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmSctpDst;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmSctpSrc;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmTcpDst;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmTcpSrc;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmUdpDst;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmUdpSrc;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmVlanPcp;
+import org.projectfloodlight.openflow.protocol.oxm.OFOxmVlanVid;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+/**
+ * Serialize any List of OFAction in JSON.
+ *
+ * Use automatically by Jackson via JsonSerialize(using=OFActionListSerializer.class),
+ * or use the static function within this class within another serializer.
+ *
+ * @author Ryan Izard, ryan.izard@bigswitch.com, rizard@g.clemson.edu
+ */
+public class OFActionListSerializer extends JsonSerializer> {
+ protected static Logger logger = LoggerFactory.getLogger(OFActionListSerializer.class);
+
+ @Override
+ public void serialize(List actions, JsonGenerator jGen, SerializerProvider serializer) throws IOException,
+ JsonProcessingException {
+ jGen.writeStartObject();
+ serializeActions(jGen, actions);
+ jGen.writeEndObject();
+ }
+
+ /**
+ * Write a JSON string given a list of OFAction. Supports OF1.0 - OF1.3.
+ * This is the only place actions are serialized, for any OF version. Because
+ * some OF version share actions, it makes sense to have them in one place.
+ * @param jsonGenerator
+ * @param actions
+ * @throws IOException
+ * @throws JsonProcessingException
+ */
+ public static void serializeActions(JsonGenerator jsonGenerator, List actions) throws IOException, JsonProcessingException {
+ if (actions.isEmpty()) {
+ jsonGenerator.writeStringField("none", "drop");
+ }
+ for (OFAction a : actions) {
+ switch (a.getType()) {
+ case OUTPUT:
+ jsonGenerator.writeStringField(ActionUtils.STR_OUTPUT, ((OFActionOutput)a).getPort().toString());
+ break;
+ /* begin OF1.0 ONLY actions */
+ case SET_VLAN_VID:
+ jsonGenerator.writeNumberField(ActionUtils.STR_VLAN_SET_VID, ((OFActionSetVlanVid)a).getVlanVid().getVlan());
+ break;
+ case SET_VLAN_PCP:
+ jsonGenerator.writeNumberField(ActionUtils.STR_VLAN_SET_PCP, ((OFActionSetVlanPcp)a).getVlanPcp().getValue());
+ break;
+ case SET_QUEUE:
+ jsonGenerator.writeNumberField(ActionUtils.STR_QUEUE_SET, ((OFActionSetQueue)a).getQueueId());
+ break;
+ case SET_DL_SRC:
+ jsonGenerator.writeStringField(ActionUtils.STR_DL_SRC_SET, ((OFActionSetDlSrc)a).getDlAddr().toString());
+ break;
+ case SET_DL_DST:
+ jsonGenerator.writeStringField(ActionUtils.STR_DL_DST_SET, ((OFActionSetDlDst)a).getDlAddr().toString());
+ break;
+ case SET_NW_SRC:
+ jsonGenerator.writeStringField(ActionUtils.STR_NW_SRC_SET, ((OFActionSetNwSrc)a).getNwAddr().toString());
+ break;
+ case SET_NW_DST:
+ jsonGenerator.writeStringField(ActionUtils.STR_NW_DST_SET, ((OFActionSetNwDst)a).getNwAddr().toString());
+ break;
+ case SET_NW_TOS:
+ jsonGenerator.writeNumberField(ActionUtils.STR_NW_TOS_SET, ((OFActionSetNwTos)a).getNwTos());
+ break;
+ case SET_TP_SRC:
+ jsonGenerator.writeNumberField(ActionUtils.STR_TP_SRC_SET, ((OFActionSetTpSrc)a).getTpPort().getPort());
+ break;
+ case SET_TP_DST:
+ jsonGenerator.writeNumberField(ActionUtils.STR_TP_DST_SET, ((OFActionSetTpDst)a).getTpPort().getPort());
+ break;
+ /* end OF1.0 ONLY actions; begin OF1.1+ actions */
+ case ENQUEUE:
+ jsonGenerator.writeNumberField(ActionUtils.STR_ENQUEUE, ((OFActionEnqueue)a).getPort().getPortNumber());
+ break;
+ case GROUP:
+ jsonGenerator.writeStringField(ActionUtils.STR_GROUP, ((OFActionGroup)a).getGroup().toString());
+ break;
+ case STRIP_VLAN:
+ jsonGenerator.writeString(ActionUtils.STR_VLAN_STRIP);
+ break;
+ case PUSH_VLAN:
+ jsonGenerator.writeNumberField(ActionUtils.STR_VLAN_PUSH, ((OFActionPushVlan)a).getEthertype().getValue());
+ break;
+ case PUSH_MPLS:
+ jsonGenerator.writeNumberField(ActionUtils.STR_MPLS_PUSH, ((OFActionPushMpls)a).getEthertype().getValue());
+ break;
+ case PUSH_PBB:
+ jsonGenerator.writeNumberField(ActionUtils.STR_PBB_PUSH, ((OFActionPushPbb)a).getEthertype().getValue());
+ break;
+ case POP_VLAN:
+ jsonGenerator.writeString(ActionUtils.STR_VLAN_POP);
+ break;
+ case POP_MPLS:
+ jsonGenerator.writeNumberField(ActionUtils.STR_MPLS_POP, ((OFActionPopMpls)a).getEthertype().getValue());
+ break;
+ case POP_PBB:
+ jsonGenerator.writeString(ActionUtils.STR_PBB_POP);
+ break;
+ case COPY_TTL_IN:
+ jsonGenerator.writeString(ActionUtils.STR_TTL_IN_COPY);
+ break;
+ case COPY_TTL_OUT:
+ jsonGenerator.writeString(ActionUtils.STR_TTL_OUT_COPY);
+ break;
+ case DEC_NW_TTL:
+ jsonGenerator.writeString(ActionUtils.STR_NW_TTL_DEC);
+ break;
+ case DEC_MPLS_TTL:
+ jsonGenerator.writeString(ActionUtils.STR_MPLS_TTL_DEC);
+ break;
+ case SET_MPLS_LABEL:
+ jsonGenerator.writeNumberField(ActionUtils.STR_MPLS_LABEL_SET, ((OFActionSetMplsLabel)a).getMplsLabel());
+ break;
+ case SET_MPLS_TC:
+ jsonGenerator.writeNumberField(ActionUtils.STR_MPLS_TC_SET, ((OFActionSetMplsTc)a).getMplsTc());
+ break;
+ case SET_MPLS_TTL:
+ jsonGenerator.writeNumberField(ActionUtils.STR_MPLS_TTL_SET, ((OFActionSetMplsTtl)a).getMplsTtl());
+ break;
+ case SET_NW_ECN:
+ jsonGenerator.writeNumberField(ActionUtils.STR_NW_ECN_SET, ((OFActionSetNwEcn)a).getNwEcn().getEcnValue());
+ break;
+ case SET_NW_TTL:
+ jsonGenerator.writeNumberField(ActionUtils.STR_NW_TTL_SET, ((OFActionSetNwTtl)a).getNwTtl());
+ break;
+ case EXPERIMENTER:
+ jsonGenerator.writeNumberField(ActionUtils.STR_EXPERIMENTER, ((OFActionExperimenter)a).getExperimenter());
+ break;
+ case SET_FIELD:
+ if (((OFActionSetField)a).getField() instanceof OFOxmArpOp) {
+ jsonGenerator.writeNumberField(MatchUtils.STR_ARP_OPCODE, ((OFOxmArpOp) ((OFActionSetField) a).getField()).getValue().getOpcode());
+ } else if (((OFActionSetField)a).getField() instanceof OFOxmArpSha) {
+ jsonGenerator.writeStringField(MatchUtils.STR_ARP_SHA, ((OFOxmArpSha) ((OFActionSetField) a).getField()).getValue().toString()); // macaddress formats string already
+ } else if (((OFActionSetField)a).getField() instanceof OFOxmArpTha) {
+ jsonGenerator.writeStringField(MatchUtils.STR_ARP_DHA, ((OFOxmArpTha) ((OFActionSetField) a).getField()).getValue().toString());
+ } else if (((OFActionSetField)a).getField() instanceof OFOxmArpSpa) {
+ jsonGenerator.writeStringField(MatchUtils.STR_ARP_SPA, ((OFOxmArpSpa) ((OFActionSetField) a).getField()).getValue().toString()); // ipaddress formats string already
+ } else if (((OFActionSetField)a).getField() instanceof OFOxmArpTpa) {
+ jsonGenerator.writeStringField(MatchUtils.STR_ARP_DPA, ((OFOxmArpTpa) ((OFActionSetField) a).getField()).getValue().toString());
+ } else if (((OFActionSetField)a).getField() instanceof OFOxmIpv6NdSll) {
+ jsonGenerator.writeStringField(MatchUtils.STR_IPV6_ND_SSL, ((OFOxmIpv6NdSll) ((OFActionSetField) a).getField()).getValue().toString());
+ } else if (((OFActionSetField)a).getField() instanceof OFOxmIpv6NdTll) {
+ jsonGenerator.writeStringField(MatchUtils.STR_IPV6_ND_TTL, ((OFOxmIpv6NdTll) ((OFActionSetField) a).getField()).getValue().toString());
+ } else if (((OFActionSetField)a).getField() instanceof OFOxmIpv6NdTarget) {
+ jsonGenerator.writeStringField(MatchUtils.STR_IPV6_ND_TARGET, ((OFOxmIpv6NdTarget) ((OFActionSetField) a).getField()).getValue().toString());
+ }
+ /* DATA LAYER */
+ else if (((OFActionSetField)a).getField() instanceof OFOxmEthType) {
+ jsonGenerator.writeNumberField(MatchUtils.STR_DL_TYPE, ((OFOxmEthType) ((OFActionSetField) a).getField()).getValue().getValue());
+ } else if (((OFActionSetField)a).getField() instanceof OFOxmEthSrc) {
+ jsonGenerator.writeStringField(MatchUtils.STR_DL_SRC, ((OFOxmEthSrc) ((OFActionSetField) a).getField()).getValue().toString());
+ } else if (((OFActionSetField)a).getField() instanceof OFOxmEthDst) {
+ jsonGenerator.writeStringField(MatchUtils.STR_DL_DST, ((OFOxmEthDst) ((OFActionSetField) a).getField()).getValue().toString());
+ } else if (((OFActionSetField)a).getField() instanceof OFOxmVlanVid) {
+ jsonGenerator.writeNumberField(MatchUtils.STR_DL_VLAN, ((OFOxmVlanVid) ((OFActionSetField) a).getField()).getValue().getVlan());
+ } else if (((OFActionSetField)a).getField() instanceof OFOxmVlanPcp) {
+ }
+ /* ICMP */
+ else if (((OFActionSetField)a).getField() instanceof OFOxmIcmpv4Code) {
+ jsonGenerator.writeNumberField(MatchUtils.STR_ICMP_CODE, ((OFOxmIcmpv4Code) ((OFActionSetField) a).getField()).getValue().getCode());
+ } else if (((OFActionSetField)a).getField() instanceof OFOxmIcmpv4Type) {
+ jsonGenerator.writeNumberField(MatchUtils.STR_ICMP_TYPE, ((OFOxmIcmpv4Type) ((OFActionSetField) a).getField()).getValue().getType());
+ } else if (((OFActionSetField)a).getField() instanceof OFOxmIcmpv6Code) {
+ jsonGenerator.writeNumberField(MatchUtils.STR_ICMPV6_CODE, ((OFOxmIcmpv6Code) ((OFActionSetField) a).getField()).getValue().getRaw());
+ } else if (((OFActionSetField)a).getField() instanceof OFOxmIcmpv6Type) {
+ jsonGenerator.writeNumberField(MatchUtils.STR_ICMPV6_TYPE, ((OFOxmIcmpv6Type) ((OFActionSetField) a).getField()).getValue().getRaw());
+ }
+ /* NETWORK LAYER */
+ else if (((OFActionSetField)a).getField() instanceof OFOxmIpProto) {
+ jsonGenerator.writeNumberField(MatchUtils.STR_NW_PROTO, ((OFOxmIpProto) ((OFActionSetField) a).getField()).getValue().getIpProtocolNumber());
+ } else if (((OFActionSetField)a).getField() instanceof OFOxmIpv4Src) {
+ jsonGenerator.writeStringField(MatchUtils.STR_NW_SRC, ((OFOxmIpv4Src) ((OFActionSetField) a).getField()).getValue().toString());
+ } else if (((OFActionSetField)a).getField() instanceof OFOxmIpv4Dst) {
+ jsonGenerator.writeStringField(MatchUtils.STR_NW_DST, ((OFOxmIpv4Dst) ((OFActionSetField) a).getField()).getValue().toString());
+ } else if (((OFActionSetField)a).getField() instanceof OFOxmIpv6Src) {
+ jsonGenerator.writeStringField(MatchUtils.STR_IPV6_SRC, ((OFOxmIpv6Src) ((OFActionSetField) a).getField()).getValue().toString());
+ } else if (((OFActionSetField)a).getField() instanceof OFOxmIpv6Dst) {
+ jsonGenerator.writeStringField(MatchUtils.STR_IPV6_DST, ((OFOxmIpv6Dst) ((OFActionSetField) a).getField()).getValue().toString());
+ } else if (((OFActionSetField)a).getField() instanceof OFOxmIpv6Flabel) {
+ jsonGenerator.writeStringField(MatchUtils.STR_IPV6_FLOW_LABEL, ((OFOxmIpv6Flabel) ((OFActionSetField) a).getField()).getValue().toString());
+ } else if (((OFActionSetField)a).getField() instanceof OFOxmIpEcn) {
+ jsonGenerator.writeNumberField(MatchUtils.STR_NW_ECN, ((OFOxmIpEcn) ((OFActionSetField) a).getField()).getValue().getEcnValue());
+ } else if (((OFActionSetField)a).getField() instanceof OFOxmIpDscp) {
+ jsonGenerator.writeNumberField(MatchUtils.STR_NW_DSCP, ((OFOxmIpDscp) ((OFActionSetField) a).getField()).getValue().getDscpValue());
+ }
+ /* TRANSPORT LAYER, TCP, UDP, and SCTP */
+ else if (((OFActionSetField)a).getField() instanceof OFOxmTcpSrc) {
+ jsonGenerator.writeNumberField(MatchUtils.STR_TCP_SRC, ((OFOxmTcpSrc) ((OFActionSetField) a).getField()).getValue().getPort());
+ } else if (((OFActionSetField)a).getField() instanceof OFOxmTcpDst) {
+ jsonGenerator.writeNumberField(MatchUtils.STR_TCP_DST, ((OFOxmTcpDst) ((OFActionSetField) a).getField()).getValue().getPort());
+ } else if (((OFActionSetField)a).getField() instanceof OFOxmUdpSrc) {
+ jsonGenerator.writeNumberField(MatchUtils.STR_UDP_SRC, ((OFOxmUdpSrc) ((OFActionSetField) a).getField()).getValue().getPort());
+ } else if (((OFActionSetField)a).getField() instanceof OFOxmUdpDst) {
+ jsonGenerator.writeNumberField(MatchUtils.STR_UDP_DST, ((OFOxmUdpDst) ((OFActionSetField) a).getField()).getValue().getPort());
+ } else if (((OFActionSetField)a).getField() instanceof OFOxmSctpSrc) {
+ jsonGenerator.writeNumberField(MatchUtils.STR_SCTP_SRC, ((OFOxmSctpSrc) ((OFActionSetField) a).getField()).getValue().getPort());
+ } else if (((OFActionSetField)a).getField() instanceof OFOxmSctpDst) {
+ jsonGenerator.writeNumberField(MatchUtils.STR_SCTP_DST, ((OFOxmSctpDst) ((OFActionSetField) a).getField()).getValue().getPort());
+ }
+ /* MPLS */
+ else if (((OFActionSetField)a).getField() instanceof OFOxmMplsLabel) {
+ jsonGenerator.writeNumberField(MatchUtils.STR_MPLS_LABEL, ((OFOxmMplsLabel) ((OFActionSetField) a).getField()).getValue().getValue());
+ } else if (((OFActionSetField)a).getField() instanceof OFOxmMplsTc) {
+ jsonGenerator.writeNumberField(MatchUtils.STR_MPLS_TC, ((OFOxmMplsTc) ((OFActionSetField) a).getField()).getValue().getValue());
+ } else if (((OFActionSetField)a).getField() instanceof OFOxmMplsBos) {
+ jsonGenerator.writeStringField(MatchUtils.STR_MPLS_TC, ((OFOxmMplsBos) ((OFActionSetField) a).getField()).getValue().toString());
+ }
+ /* METADATA */
+ else if (((OFActionSetField)a).getField() instanceof OFOxmMetadata) {
+ jsonGenerator.writeNumberField(MatchUtils.STR_METADATA, ((OFOxmMetadata) ((OFActionSetField) a).getField()).getValue().getValue().getValue());
+ } else {
+ logger.error("Could not decode Set-Field action field: {}", ((OFActionSetField) a));
+ // need to get a logger in here somehow log.error("Could not decode Set-Field action field: {}", ((OFActionSetField) a));
+ }
+ } // end switch over action type
+ } // end for over all actions
+ } // end method
+}
diff --git a/src/main/java/net/floodlightcontroller/core/web/serializers/OFFlowModSerializer.java b/src/main/java/net/floodlightcontroller/core/web/serializers/OFFlowModSerializer.java
new file mode 100644
index 0000000000..42d9afa8f6
--- /dev/null
+++ b/src/main/java/net/floodlightcontroller/core/web/serializers/OFFlowModSerializer.java
@@ -0,0 +1,102 @@
+package net.floodlightcontroller.core.web.serializers;
+
+/**
+ * Copyright 2011,2012 Big Switch Networks, Inc.
+ * Originally created by David Erickson, Stanford 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.
+ **/
+
+import java.io.IOException;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.JsonGenerator.Feature;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+import org.projectfloodlight.openflow.protocol.OFFlowMod;
+import org.projectfloodlight.openflow.protocol.OFVersion;
+import org.projectfloodlight.openflow.protocol.ver11.OFFlowModFlagsSerializerVer11;
+import org.projectfloodlight.openflow.protocol.ver12.OFFlowModFlagsSerializerVer12;
+import org.projectfloodlight.openflow.protocol.ver13.OFFlowModFlagsSerializerVer13;
+import org.projectfloodlight.openflow.protocol.ver14.OFFlowModFlagsSerializerVer14;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Serialize any OFFlowMod in JSON.
+ *
+ * Use automatically by Jackson via JsonSerialize(using=OFFlowModSerializer.class),
+ * or use the static function within this class within another serializer.
+ *
+ * @author Ryan Izard, ryan.izard@bigswitch.com, rizard@g.clemson.edu
+ */
+public class OFFlowModSerializer extends JsonSerializer {
+ protected static Logger logger = LoggerFactory.getLogger(OFFlowModSerializer.class);
+
+ @Override
+ public void serialize(OFFlowMod fm, JsonGenerator jGen, SerializerProvider serializer)
+ throws IOException, JsonProcessingException {
+
+ }
+
+ public static void serializeFlowMod(JsonGenerator jGen, OFFlowMod flowMod) throws IOException, JsonProcessingException {
+
+ jGen.configure(Feature.WRITE_NUMBERS_AS_STRINGS, true); // IMHO this just looks nicer and is easier to read if everything is quoted
+
+ jGen.writeStartObject();
+ jGen.writeStringField("version", flowMod.getVersion().toString()); // return the enum names
+ jGen.writeStringField("command", flowMod.getCommand().toString());
+ jGen.writeNumberField("cookie", flowMod.getCookie().getValue());
+ jGen.writeNumberField("cookieMask", flowMod.getCookieMask().getValue());
+ jGen.writeStringField("tableId", flowMod.getTableId().toString());
+ jGen.writeNumberField("priority", flowMod.getPriority());
+ jGen.writeNumberField("idleTimeoutSec", flowMod.getIdleTimeout());
+ jGen.writeNumberField("hardTimeoutSec", flowMod.getHardTimeout());
+ jGen.writeStringField("outGroup", flowMod.getOutGroup().toString());
+ jGen.writeStringField("outPort", flowMod.getOutPort().toString());
+
+ switch (flowMod.getVersion()) {
+ case OF_10:
+ break;
+ case OF_11:
+ jGen.writeNumberField("flags", OFFlowModFlagsSerializerVer11.toWireValue(flowMod.getFlags()));
+ break;
+ case OF_12:
+ jGen.writeNumberField("flags", OFFlowModFlagsSerializerVer12.toWireValue(flowMod.getFlags()));
+ break;
+ case OF_13:
+ jGen.writeNumberField("flags", OFFlowModFlagsSerializerVer13.toWireValue(flowMod.getFlags()));
+ break;
+ case OF_14:
+ jGen.writeNumberField("flags", OFFlowModFlagsSerializerVer14.toWireValue(flowMod.getFlags()));
+ break;
+ default:
+ logger.error("Could not decode OFVersion {}", flowMod.getVersion());
+ break;
+ }
+
+ MatchSerializer.serializeMatch(jGen, flowMod.getMatch());
+
+ // handle OF1.1+ instructions with actions within
+ if (flowMod.getVersion() == OFVersion.OF_10) {
+ jGen.writeObjectFieldStart("actions");
+ OFActionListSerializer.serializeActions(jGen, flowMod.getActions());
+ jGen.writeEndObject();
+ } else {
+ OFInstructionListSerializer.serializeInstructionList(jGen, flowMod.getInstructions());
+ } // end not-empty instructions (else)
+ jGen.writeEndObject();
+ } // end method
+}
diff --git a/src/main/java/net/floodlightcontroller/core/web/serializers/OFInstructionListSerializer.java b/src/main/java/net/floodlightcontroller/core/web/serializers/OFInstructionListSerializer.java
new file mode 100644
index 0000000000..e16b185482
--- /dev/null
+++ b/src/main/java/net/floodlightcontroller/core/web/serializers/OFInstructionListSerializer.java
@@ -0,0 +1,80 @@
+package net.floodlightcontroller.core.web.serializers;
+
+import java.io.IOException;
+import java.util.List;
+
+import net.floodlightcontroller.util.InstructionUtils;
+
+import org.projectfloodlight.openflow.protocol.instruction.OFInstruction;
+import org.projectfloodlight.openflow.protocol.instruction.OFInstructionApplyActions;
+import org.projectfloodlight.openflow.protocol.instruction.OFInstructionExperimenter;
+import org.projectfloodlight.openflow.protocol.instruction.OFInstructionGotoTable;
+import org.projectfloodlight.openflow.protocol.instruction.OFInstructionMeter;
+import org.projectfloodlight.openflow.protocol.instruction.OFInstructionWriteActions;
+import org.projectfloodlight.openflow.protocol.instruction.OFInstructionWriteMetadata;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+/**
+ * Serialize any List of OFInstruction in JSON.
+ *
+ * Use automatically by Jackson via JsonSerialize(using=OFInstructionListSerializer.class),
+ * or use the static function within this class within another serializer.
+ *
+ * @author Ryan Izard, ryan.izard@bigswitch.com, rizard@g.clemson.edu
+ */
+public class OFInstructionListSerializer extends JsonSerializer> {
+
+ @Override
+ public void serialize(List instructions, JsonGenerator jGen, SerializerProvider serializer) throws IOException,
+ JsonProcessingException {
+ serializeInstructionList(jGen, instructions);
+ }
+
+ public static void serializeInstructionList(JsonGenerator jGen, List instructions) throws IOException, JsonProcessingException {
+ jGen.writeObjectFieldStart("instructions");
+ if (instructions.isEmpty()) {
+ jGen.writeStringField("none", "drop");
+ } else {
+ for (OFInstruction i : instructions) {
+ switch (i.getType()) {
+ case CLEAR_ACTIONS:
+ jGen.writeObjectFieldStart(InstructionUtils.STR_CLEAR_ACTIONS);
+ break;
+ case WRITE_METADATA:
+ jGen.writeStartObject();
+ jGen.writeNumberField(InstructionUtils.STR_WRITE_METADATA, ((OFInstructionWriteMetadata)i).getMetadata().getValue());
+ jGen.writeNumberField(InstructionUtils.STR_WRITE_METADATA + "_mask", ((OFInstructionWriteMetadata)i).getMetadataMask().getValue());
+ break;
+ case EXPERIMENTER:
+ jGen.writeStartObject();
+ jGen.writeNumberField(InstructionUtils.STR_EXPERIMENTER, ((OFInstructionExperimenter)i).getExperimenter());
+ break;
+ case GOTO_TABLE:
+ jGen.writeStartObject();
+ jGen.writeNumberField(InstructionUtils.STR_GOTO_TABLE, ((OFInstructionGotoTable)i).getTableId().getValue());
+ break;
+ case METER:
+ jGen.writeStartObject();
+ jGen.writeNumberField(InstructionUtils.STR_GOTO_METER, ((OFInstructionMeter)i).getMeterId());
+ break;
+ case APPLY_ACTIONS:
+ jGen.writeObjectFieldStart(InstructionUtils.STR_APPLY_ACTIONS);
+ OFActionListSerializer.serializeActions(jGen, ((OFInstructionApplyActions)i).getActions());
+ break;
+ case WRITE_ACTIONS:
+ jGen.writeObjectFieldStart(InstructionUtils.STR_WRITE_ACTIONS);
+ OFActionListSerializer.serializeActions(jGen, ((OFInstructionWriteActions)i).getActions());
+ default:
+ // shouldn't ever get here
+ break;
+ } // end switch on instruction
+ jGen.writeEndObject(); // end specific instruction
+ } // end for instructions
+ jGen.writeEndObject();
+ } // end process instructions (OF1.1+ only)
+ } // end not-empty instructions (else)
+}
diff --git a/src/main/java/net/floodlightcontroller/core/web/serializers/StatsReplySerializer.java b/src/main/java/net/floodlightcontroller/core/web/serializers/StatsReplySerializer.java
index e9766245a8..fcd5d99454 100644
--- a/src/main/java/net/floodlightcontroller/core/web/serializers/StatsReplySerializer.java
+++ b/src/main/java/net/floodlightcontroller/core/web/serializers/StatsReplySerializer.java
@@ -19,7 +19,6 @@
import java.io.IOException;
import java.util.List;
-import java.util.Iterator;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonGenerator.Feature;
@@ -29,22 +28,99 @@
import net.floodlightcontroller.core.web.OFStatsTypeStrings;
import net.floodlightcontroller.core.web.StatsReply;
-import net.floodlightcontroller.util.ActionUtils;
-import net.floodlightcontroller.util.InstructionUtils;
-import net.floodlightcontroller.util.MatchUtils;
+import org.projectfloodlight.openflow.protocol.OFActionType;
+import org.projectfloodlight.openflow.protocol.OFBucket;
+import org.projectfloodlight.openflow.protocol.OFBucketCounter;
+import org.projectfloodlight.openflow.protocol.OFFeaturesReply;
import org.projectfloodlight.openflow.protocol.OFFlowStatsReply;
import org.projectfloodlight.openflow.protocol.OFFlowStatsEntry;
+import org.projectfloodlight.openflow.protocol.OFDescStatsReply;
+import org.projectfloodlight.openflow.protocol.OFGroupDescStatsEntry;
+import org.projectfloodlight.openflow.protocol.OFGroupDescStatsReply;
+import org.projectfloodlight.openflow.protocol.OFGroupFeaturesStatsReply;
+import org.projectfloodlight.openflow.protocol.OFGroupStatsEntry;
+import org.projectfloodlight.openflow.protocol.OFGroupStatsReply;
+import org.projectfloodlight.openflow.protocol.OFMeterBandStats;
+import org.projectfloodlight.openflow.protocol.OFMeterConfigStatsReply;
+import org.projectfloodlight.openflow.protocol.OFMeterFeatures;
+import org.projectfloodlight.openflow.protocol.OFMeterFeaturesStatsReply;
+import org.projectfloodlight.openflow.protocol.OFMeterStats;
+import org.projectfloodlight.openflow.protocol.OFMeterStatsReply;
+import org.projectfloodlight.openflow.protocol.OFPortStatsReply;
+import org.projectfloodlight.openflow.protocol.OFPortStatsEntry;
+import org.projectfloodlight.openflow.protocol.OFPortDescStatsReply;
+import org.projectfloodlight.openflow.protocol.OFPortDesc;
+import org.projectfloodlight.openflow.protocol.OFTableFeatureProp;
+import org.projectfloodlight.openflow.protocol.OFTableFeaturePropApplyActions;
+import org.projectfloodlight.openflow.protocol.OFTableFeaturePropApplyActionsMiss;
+import org.projectfloodlight.openflow.protocol.OFTableFeaturePropApplySetfield;
+import org.projectfloodlight.openflow.protocol.OFTableFeaturePropApplySetfieldMiss;
+import org.projectfloodlight.openflow.protocol.OFTableFeaturePropExperimenter;
+import org.projectfloodlight.openflow.protocol.OFTableFeaturePropExperimenterMiss;
+import org.projectfloodlight.openflow.protocol.OFTableFeaturePropInstructions;
+import org.projectfloodlight.openflow.protocol.OFTableFeaturePropInstructionsMiss;
+import org.projectfloodlight.openflow.protocol.OFTableFeaturePropMatch;
+import org.projectfloodlight.openflow.protocol.OFTableFeaturePropNextTables;
+import org.projectfloodlight.openflow.protocol.OFTableFeaturePropNextTablesMiss;
+import org.projectfloodlight.openflow.protocol.OFTableFeaturePropWildcards;
+import org.projectfloodlight.openflow.protocol.OFTableFeaturePropWriteActions;
+import org.projectfloodlight.openflow.protocol.OFTableFeaturePropWriteActionsMiss;
+import org.projectfloodlight.openflow.protocol.OFTableFeaturePropWriteSetfield;
+import org.projectfloodlight.openflow.protocol.OFTableFeaturePropWriteSetfieldMiss;
+import org.projectfloodlight.openflow.protocol.OFTableFeatures;
+import org.projectfloodlight.openflow.protocol.OFTableFeaturesStatsReply;
+import org.projectfloodlight.openflow.protocol.OFTableStatsEntry;
+import org.projectfloodlight.openflow.protocol.OFTableStatsReply;
+import org.projectfloodlight.openflow.protocol.actionid.OFActionId;
+import org.projectfloodlight.openflow.protocol.instructionid.OFInstructionId;
+import org.projectfloodlight.openflow.protocol.meterband.OFMeterBand;
+import org.projectfloodlight.openflow.protocol.meterband.OFMeterBandDrop;
+import org.projectfloodlight.openflow.protocol.meterband.OFMeterBandDscpRemark;
+import org.projectfloodlight.openflow.protocol.meterband.OFMeterBandExperimenter;
+import org.projectfloodlight.openflow.protocol.ver13.OFFlowModFlagsSerializerVer13;
+import org.projectfloodlight.openflow.protocol.ver13.OFMeterBandTypeSerializerVer13;
+// Use Loxigen's serializer
+import org.projectfloodlight.openflow.protocol.ver13.OFPortFeaturesSerializerVer13;
+import org.projectfloodlight.openflow.protocol.ver13.OFStatsReplyFlagsSerializerVer13;
+import org.projectfloodlight.openflow.protocol.ver13.OFTableFeaturePropTypeSerializerVer13;
+import org.projectfloodlight.openflow.protocol.ver12.OFFlowModFlagsSerializerVer12;
+import org.projectfloodlight.openflow.protocol.ver12.OFPortConfigSerializerVer12;
+import org.projectfloodlight.openflow.protocol.ver12.OFPortFeaturesSerializerVer12;
+import org.projectfloodlight.openflow.protocol.ver12.OFPortStateSerializerVer12;
+import org.projectfloodlight.openflow.protocol.ver12.OFStatsReplyFlagsSerializerVer12;
+import org.projectfloodlight.openflow.protocol.ver11.OFFlowModFlagsSerializerVer11;
+import org.projectfloodlight.openflow.protocol.ver11.OFPortConfigSerializerVer11;
+import org.projectfloodlight.openflow.protocol.ver11.OFPortFeaturesSerializerVer11;
+import org.projectfloodlight.openflow.protocol.ver11.OFPortStateSerializerVer11;
+import org.projectfloodlight.openflow.protocol.ver11.OFStatsReplyFlagsSerializerVer11;
+import org.projectfloodlight.openflow.protocol.ver10.OFPortConfigSerializerVer10;
+import org.projectfloodlight.openflow.protocol.ver10.OFPortFeaturesSerializerVer10;
+import org.projectfloodlight.openflow.protocol.ver10.OFPortStateSerializerVer10;
+import org.projectfloodlight.openflow.protocol.ver10.OFStatsReplyFlagsSerializerVer10;
+import org.projectfloodlight.openflow.protocol.ver13.OFPortStateSerializerVer13;
+import org.projectfloodlight.openflow.protocol.ver13.OFPortConfigSerializerVer13;
+import org.projectfloodlight.openflow.protocol.ver14.OFFlowModFlagsSerializerVer14;
+import org.projectfloodlight.openflow.protocol.ver14.OFStatsReplyFlagsSerializerVer14;
+import org.projectfloodlight.openflow.protocol.OFAggregateStatsReply;
import org.projectfloodlight.openflow.protocol.OFVersion;
-import org.projectfloodlight.openflow.protocol.match.*;
-import org.projectfloodlight.openflow.protocol.oxm.*;
-import org.projectfloodlight.openflow.protocol.instruction.*;
-import org.projectfloodlight.openflow.protocol.action.*;
+import org.projectfloodlight.openflow.types.U32;
+import org.projectfloodlight.openflow.types.U8;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
- * Serialize a DPID as colon-separated hexadecimal
+ * Serialize any OFStatsReply or OFFeaturesReply in JSON
+ * wrapped by a StatsReply object.
+ *
+ * Use automatically by Jackson via JsonSerialize(using=StatsReplySerializer.class),
+ * or use the static functions within this class to serializer a specific OFStatType
+ * within another serializer.
+ *
+ * @author Ryan Izard, ryan.izard@bigswitch.com, rizard@g.clemson.edu
*/
public class StatsReplySerializer extends JsonSerializer {
+ protected static Logger logger = LoggerFactory.getLogger(StatsReplySerializer.class);
@SuppressWarnings("unchecked")
@Override
public void serialize(StatsReply reply, JsonGenerator jGen, SerializerProvider serializer) throws IOException, JsonProcessingException {
@@ -52,10 +128,13 @@ public void serialize(StatsReply reply, JsonGenerator jGen, SerializerProvider s
if (reply.getValues() == null) {
jGen.writeStartObject();
jGen.writeObjectFieldStart("ERROR");
- jGen.writeStringField("1)", "Invalid DPID and/or stats/features request, or");
- jGen.writeStringField("2)", "The switch might also be disconncted from the controller");
+ jGen.writeStringField(" ", "An error has occurred while proccesing your request,");
+ jGen.writeStringField(" *", "which might be due to one or more of the following:");
+ jGen.writeStringField(" * ", "-- An invalid DPID and/or stats/features request.");
+ jGen.writeStringField(" **", "-- The switch is not connected to the controller.");
+ jGen.writeStringField("* ", "-- The request specified is not supported by the switch's OpenFlow version.");
jGen.writeEndObject();
- jGen.writeObjectFieldStart("Valid OFStatsTypes are");
+ jGen.writeObjectFieldStart("Valid statistics and features strings are:");
jGen.writeStringField("1)", OFStatsTypeStrings.AGGREGATE);
jGen.writeStringField("2)", OFStatsTypeStrings.DESC);
jGen.writeStringField("3)", OFStatsTypeStrings.EXPERIMENTER);
@@ -66,434 +145,760 @@ public void serialize(StatsReply reply, JsonGenerator jGen, SerializerProvider s
jGen.writeStringField("8)", OFStatsTypeStrings.GROUP_FEATURES);
jGen.writeStringField("9)", OFStatsTypeStrings.METER);
jGen.writeStringField("A)", OFStatsTypeStrings.METER_CONFIG);
- jGen.writeStringField("B)", OFStatsTypeStrings.PORT);
- jGen.writeStringField("C)", OFStatsTypeStrings.PORT_DESC);
- jGen.writeStringField("D)", OFStatsTypeStrings.QUEUE);
- jGen.writeStringField("E)", OFStatsTypeStrings.TABLE);
- jGen.writeStringField("F)", OFStatsTypeStrings.TABLE_FEATURES);
+ jGen.writeStringField("B)", OFStatsTypeStrings.METER_FEATURES);
+ jGen.writeStringField("C)", OFStatsTypeStrings.PORT);
+ jGen.writeStringField("D)", OFStatsTypeStrings.PORT_DESC);
+ jGen.writeStringField("E)", OFStatsTypeStrings.QUEUE);
+ jGen.writeStringField("F)", OFStatsTypeStrings.TABLE);
+ jGen.writeStringField("G)", OFStatsTypeStrings.TABLE_FEATURES);
jGen.writeEndObject();
jGen.writeEndObject();
return;
}
-
+
jGen.configure(Feature.WRITE_NUMBERS_AS_STRINGS, true); // IMHO this just looks nicer and is easier to read if everything is quoted
jGen.writeStartObject();
- jGen.writeStringField("dpid", reply.getDatapathId().toString());
- switch (reply.getStatType()) {
- case PORT:
- // handle port
- break;
- case QUEUE:
- // handle queue
- break;
- case FLOW:
- // handle flow. Can safely cast to List.
- serializeFlowReply((List) reply.getValues(), jGen);
- break;
- case AGGREGATE:
- // handle aggregate
- break;
- case DESC:
- // handle desc
- break;
- case TABLE:
- // handle table
- break;
- case TABLE_FEATURES:
- // handle features
- break;
- // TODO need to handle new OF1.1+ stats reply types
- case EXPERIMENTER:
- break;
- case GROUP:
- break;
- case GROUP_DESC:
- break;
- case GROUP_FEATURES:
- break;
- case METER:
- break;
- case METER_CONFIG:
- break;
- case METER_FEATURES:
- break;
- case PORT_DESC:
- break;
- default:
- break;
- }
+
+ if (reply.getStatType() == null) { // must be an OFFeaturesReply. getValues() was already checked for null above.
+ serializeFeaturesReply((OFFeaturesReply) reply.getValues(), jGen);
+ } else {
+ switch (reply.getStatType()) {
+ case PORT:
+ serializePortReply((List) reply.getValues(), jGen);
+ break;
+ case QUEUE:
+ // handle queue
+ break;
+ case FLOW:
+ serializeFlowReply((List) reply.getValues(), jGen);
+ break;
+ case AGGREGATE:
+ serializeAggregateReply((List) reply.getValues(), jGen);
+ break;
+ case DESC:
+ serializeDescReply((List) reply.getValues(), jGen);
+ break;
+ case GROUP:
+ serializeGroupReply((List) reply.getValues(), jGen);
+ break;
+ case GROUP_DESC:
+ serializeGroupDescReply((List) reply.getValues(), jGen);
+ break;
+ case GROUP_FEATURES:
+ serializeGroupFeaturesReply((List) reply.getValues(), jGen);
+ break;
+ case METER:
+ serializeMeterReply((List) reply.getValues(), jGen);
+ break;
+ case METER_CONFIG:
+ serializeMeterConfigReply((List) reply.getValues(), jGen);
+ break;
+ case METER_FEATURES:
+ serializeMeterFeaturesReply((List) reply.getValues(), jGen);
+ break;
+ case TABLE:
+ serializeTableReply((List) reply.getValues(), jGen);
+ break;
+ case TABLE_FEATURES:
+ serializeTableFeaturesReply((List) reply.getValues(), jGen);
+ break;
+ case PORT_DESC:
+ serializePortDescReply((List) reply.getValues(), jGen);
+ break;
+ case EXPERIMENTER:
+ break;
+ default:
+ break;
+ }
+ }
jGen.writeEndObject();
}
+
+ public static void serializeFeaturesReply(OFFeaturesReply fr, JsonGenerator jGen) throws IOException, JsonProcessingException {
+ /* Common to All OF Versions */
+ jGen.writeStringField("capabilities", fr.getCapabilities().toString());
+ jGen.writeStringField("dpid", fr.getDatapathId().toString());
+ jGen.writeNumberField("buffers", fr.getNBuffers());
+ jGen.writeNumberField("tables", fr.getNTables());
+ jGen.writeStringField("version", fr.getVersion().toString());
+
+ if (fr.getVersion().compareTo(OFVersion.OF_13) < 0) { // OF1.3+ break this out into port_config
+ serializePortDesc(fr.getPorts(), jGen);
+ }
+ if (fr.getVersion().compareTo(OFVersion.OF_10) == 0) {
+ String actions = "[";
+ for (OFActionType action : fr.getActions()) {
+ actions = actions + action.toString() + ", ";
+ }
+ actions = actions.substring(0, actions.length() - 2); // remove ending space+comma
+ actions = actions + "]";
+ jGen.writeStringField("actions", actions);
+ }
+ }
+
+ /***
+ * Serializes the Group Statistics Reply
+ * @author Naveen
+ * @param groupReplies
+ * @param jGen
+ * @throws IOException
+ * @throws JsonProcessingException
+ */
+ public static void serializeGroupReply(List groupReplies, JsonGenerator jGen) throws IOException, JsonProcessingException{
+
+ OFGroupStatsReply groupReply = groupReplies.get(0); // we will get only one GroupReply and it will contains many OFGroupStatsEntry
+ jGen.writeStringField("version", groupReply.getVersion().toString()); //return the enum name
+ jGen.writeFieldName("group");
+ jGen.writeStartArray();
+ for(OFGroupStatsEntry entry : groupReply.getEntries()) {
+ jGen.writeStartObject();
+ jGen.writeStringField("groupNumber",entry.getGroup().toString());
+ jGen.writeNumberField("refCount", entry.getRefCount());
+ jGen.writeNumberField("packetCount", entry.getPacketCount().getValue());
+ jGen.writeNumberField("byteCount", entry.getByteCount().getValue());
+ jGen.writeFieldName("bucketCounters");
+ jGen.writeStartArray();
+ for(OFBucketCounter bCounter : entry.getBucketStats()) {
+ jGen.writeStartObject();
+ jGen.writeNumberField("packetCount", bCounter.getPacketCount().getValue());
+ jGen.writeNumberField("byteCount", bCounter.getByteCount().getValue());
+ jGen.writeEndObject();
+ }//end of for loop - BucketCounter
+ jGen.writeEndArray();
+ if (OFVersion.OF_13 == entry.getVersion()) {
+ jGen.writeNumberField("durationSec", entry.getDurationSec());
+ jGen.writeNumberField("durationNsec", entry.getDurationNsec());
+ }
+ jGen.writeEndObject();
+ }//end of for loop - groupStats
+ jGen.writeEndArray();
+ }
- public void serializeFlowReply(List flowReplies, JsonGenerator jGen) throws IOException, JsonProcessingException{
- int flowCount = 0;
+ /***
+ * Serializes Group Desc Reply
+ * @author Naveen
+ * @param groupDescReplies
+ * @param jGen
+ * @throws IOException
+ * @throws JsonProcessingException
+ */
+ public static void serializeGroupDescReply(List groupDescReplies, JsonGenerator jGen) throws IOException, JsonProcessingException{
+ OFGroupDescStatsReply groupDescReply = groupDescReplies.get(0);
+ jGen.writeStringField("version", groupDescReply.getVersion().toString()); //return the enum name
+ jGen.writeFieldName("groupDesc");
+ jGen.writeStartArray();
+ for(OFGroupDescStatsEntry entry : groupDescReply.getEntries()) {
+ jGen.writeStartObject();
+ jGen.writeStringField("groupType",entry.getGroupType().toString());
+ jGen.writeStringField("groupNumber",entry.getGroup().toString());
+ jGen.writeFieldName("buckets");
+ jGen.writeStartArray();
+ for(OFBucket buckets : entry.getBuckets()) {
+ jGen.writeStartObject();
+ jGen.writeNumberField("weight", buckets.getWeight());
+ jGen.writeNumberField("watchPortNumber", buckets.getWatchPort().getPortNumber());
+ jGen.writeStringField("watchGroup", buckets.getWatchGroup().toString());
+ OFActionListSerializer.serializeActions(jGen, buckets.getActions());
+ jGen.writeEndObject();
+ }//End of for loop - buckets
+ jGen.writeEndArray();//end of buckets
+ jGen.writeEndObject();//end of group Desc iteration
+ }//End of for loop - GroupDescStats
+ jGen.writeEndArray();//end of group Desc
+ }
+
+ /***
+ * Serializes Group Feature Reply
+ * @author Naveen
+ * @param groupFeaturesReplies
+ * @param jGen
+ * @throws IOException
+ * @throws JsonProcessingException
+ */
+ public static void serializeGroupFeaturesReply(List groupFeaturesReplies, JsonGenerator jGen) throws IOException, JsonProcessingException{
+
+ OFGroupFeaturesStatsReply groupFeaturesReply = groupFeaturesReplies.get(0);
+ jGen.writeStringField("version", groupFeaturesReply.getVersion().toString()); //return the enum name
+
+ jGen.writeFieldName("groupFeatures");
+ jGen.writeStartObject();
+ jGen.writeNumberField("capabilities",groupFeaturesReply.getCapabilities());
+ jGen.writeNumberField("maxGroupsAll",groupFeaturesReply.getMaxGroupsAll());
+ jGen.writeNumberField("maxGroupsSelect",groupFeaturesReply.getMaxGroupsSelect());
+ jGen.writeNumberField("maxGroupsIndirect",groupFeaturesReply.getMaxGroupsIndirect());
+ jGen.writeNumberField("maxGroupsFf",groupFeaturesReply.getMaxGroupsFf());
+ jGen.writeNumberField("actionsAll",groupFeaturesReply.getActionsAll());
+ jGen.writeNumberField("actionsSelect",groupFeaturesReply.getActionsSelect());
+ jGen.writeNumberField("actionsIndirect",groupFeaturesReply.getActionsIndirect());
+ jGen.writeNumberField("actionsFf",groupFeaturesReply.getActionsFf());
+
+ jGen.writeEndObject();//end of group Feature
+ }
+
+ /***
+ * Serializes the Meter Statistics Reply
+ * @author Naveen
+ * @param meterReplies
+ * @param jGen
+ * @throws IOException
+ * @throws JsonProcessingException
+ */
+ public static void serializeMeterReply(List meterReplies, JsonGenerator jGen) throws IOException, JsonProcessingException{
+ OFMeterStatsReply meterReply = meterReplies.get(0); // we will get only one meterReply and it will contains many OFMeterStatsEntry ?
+ jGen.writeStringField("version", meterReply.getVersion().toString()); //return the enum name
+ jGen.writeFieldName("meter");
+ jGen.writeStartArray();
+ for(OFMeterStats entry : meterReply.getEntries()) {
+ jGen.writeStartObject();
+ jGen.writeNumberField("meterId",entry.getMeterId());
+ jGen.writeNumberField("flowCount", entry.getFlowCount());
+ jGen.writeNumberField("packetInCount", entry.getPacketInCount().getValue());
+ jGen.writeNumberField("byteInCount", entry.getByteInCount().getValue());
+ jGen.writeFieldName("meterBandStats");
+ jGen.writeStartArray();
+ for(OFMeterBandStats bandStats : entry.getBandStats()) {
+ jGen.writeStartObject();
+ jGen.writeNumberField("packetBandCount", bandStats.getPacketBandCount().getValue());
+ jGen.writeNumberField("byteBandCount", bandStats.getByteBandCount().getValue());
+ jGen.writeEndObject();
+ }//End of for loop - bandStats
+ jGen.writeEndArray();
+
+ jGen.writeNumberField("durationSec", entry.getDurationSec());
+ jGen.writeNumberField("durationNsec", entry.getDurationNsec());
+ jGen.writeEndObject();
+ }//End of for loop - MeterStats
+ jGen.writeEndArray();
+ }
+
+ /***
+ * Serializes Meter Feature Reply
+ * @author Naveen
+ * @param meterFeaturesReplies
+ * @param jGen
+ * @throws IOException
+ * @throws JsonProcessingException
+ */
+ public static void serializeMeterFeaturesReply(List meterFeaturesReplies, JsonGenerator jGen) throws IOException, JsonProcessingException{
+ OFMeterFeaturesStatsReply meterFeaturesReply = meterFeaturesReplies.get(0);
+ jGen.writeStringField("version", meterFeaturesReply.getVersion().toString()); //return the enum name
+
+ OFMeterFeatures meterFeatures = meterFeaturesReply.getFeatures();
+ jGen.writeFieldName("meterFeatures");
+ jGen.writeStartObject();
+
+ jGen.writeNumberField("maxGroupsAll",meterFeatures.getMaxMeter());
+ jGen.writeNumberField("maxGroupsSelect",meterFeatures.getBandTypes());
+ jGen.writeNumberField("capabilities",meterFeatures.getCapabilities());
+ jGen.writeNumberField("maxGroupsIndirect",meterFeatures.getMaxBands());
+ jGen.writeNumberField("maxGroupsFf",meterFeatures.getMaxColor());
+
+ jGen.writeEndObject();//end of group Feature
+ }
+
+ /***
+ * Serializes Meter Config Reply
+ * @author Naveen
+ * @param meterConfigReplies
+ * @param jGen
+ * @throws IOException
+ * @throws JsonProcessingException
+ */
+ public static void serializeMeterConfigReply(List meterConfigReplies, JsonGenerator jGen) throws IOException, JsonProcessingException{
+ OFMeterConfigStatsReply meterConfigReply = meterConfigReplies.get(0);
+ jGen.writeStringField("version", meterConfigReply.getVersion().toString()); //return the enum name
+ jGen.writeFieldName("meterConfig");
+ jGen.writeStartArray();
+ for(OFMeterBand band : meterConfigReply.getEntries()) {
+ jGen.writeStartObject();
+ short type = (short)band.getType();
+ jGen.writeNumberField("bandType",type);
+
+ switch (type) {
+ case OFMeterBandTypeSerializerVer13.DROP_VAL:
+ OFMeterBandDrop bandDrop = (OFMeterBandDrop) band;
+ jGen.writeNumberField("rate", bandDrop.getRate());
+ jGen.writeNumberField("burstSize", bandDrop.getBurstSize());
+ break;
+
+ case OFMeterBandTypeSerializerVer13.DSCP_REMARK_VAL:
+ OFMeterBandDscpRemark bandDscp = (OFMeterBandDscpRemark) band;
+ jGen.writeNumberField("rate", bandDscp.getRate());
+ jGen.writeNumberField("burstSize", bandDscp.getBurstSize());
+ jGen.writeNumberField("precLevel", bandDscp.getPrecLevel());
+ break;
+
+ case OFMeterBandTypeSerializerVer13.EXPERIMENTER_VAL:
+ OFMeterBandExperimenter bandExp = (OFMeterBandExperimenter) band;
+ jGen.writeNumberField("rate", bandExp.getRate());
+ jGen.writeNumberField("burstSize", bandExp.getBurstSize());
+ jGen.writeNumberField("experimenter", bandExp.getExperimenter());
+ break;
+
+ default:
+ // shouldn't ever get here
+ break;
+ }//end of Switch Case
+
+ jGen.writeEndObject();
+ }//end of for loop
+ jGen.writeEndArray();
+ }
+
+ /***
+ * Serializes Table Statistics
+ * @author Naveen
+ * @param tableReplies
+ * @param jGen
+ * @throws IOException
+ * @throws JsonProcessingException
+ */
+ public static void serializeTableReply(List tableReplies, JsonGenerator jGen) throws IOException, JsonProcessingException{
+
+ OFTableStatsReply tableReply = tableReplies.get(0); // we will get only one tableReply and it will contains many OFTableStatsEntry ?
+ jGen.writeStringField("version", tableReply.getVersion().toString()); //return the enum name
+ jGen.writeFieldName("table");
+ jGen.writeStartArray();
+ for(OFTableStatsEntry entry : tableReply.getEntries()) {
+ jGen.writeStartObject();
+
+ //Fields common to all OF versions
+ //For OF 1.3, only these fields are applicable
+ jGen.writeStringField("tableId",entry.getTableId().toString());
+ jGen.writeNumberField("activeCount", entry.getActiveCount());
+ jGen.writeNumberField("lookUpCount", entry.getLookupCount().getValue());
+ jGen.writeNumberField("matchCount", entry.getMatchedCount().getValue());
+
+ //Fields Applicable only for specific Versions
+ switch (entry.getVersion()) {
+ case OF_12:
+ //Fields applicable only to OF 1.2
+ jGen.writeNumberField("writeSetFields", entry.getWriteSetfields().getValue());
+ jGen.writeNumberField("applySetFields", entry.getApplySetfields().getValue());
+ jGen.writeNumberField("metaDataMatch", entry.getMetadataMatch().getValue());
+ jGen.writeNumberField("metaDataWrite", entry.getMetadataWrite().getValue());
+ case OF_11:
+ //Fields applicable to OF 1.1 & 1.2
+ jGen.writeStringField("match", entry.getMatch().toString());
+ jGen.writeNumberField("instructions", entry.getInstructions());
+ jGen.writeNumberField("writeActions", entry.getWriteActions());
+ jGen.writeNumberField("applyActions", entry.getApplyActions());
+ jGen.writeNumberField("config", entry.getConfig());
+ case OF_10:
+ //Fields applicable to OF 1.0, 1.1 & 1.2
+ jGen.writeStringField("name",entry.getName());
+ jGen.writeNumberField("wildcards", entry.getWildcards());
+ jGen.writeNumberField("maxEntries", entry.getMaxEntries());
+ break;
+ default:
+ //no extra fields for OF_13
+ break;
+ }//End of switch case
+ jGen.writeEndObject();
+ }//End of for loop
+ jGen.writeEndArray();
+ }
+
+ /***
+ * Serializes Table Features Reply
+ * @author Naveen
+ * @param tableFeaturesReplies
+ * @param jGen
+ * @throws IOException
+ * @throws JsonProcessingException
+ */
+ public static void serializeTableFeaturesReply(List tableFeaturesReplies, JsonGenerator jGen) throws IOException, JsonProcessingException{
+
+ OFTableFeaturesStatsReply tableFeaturesReply = tableFeaturesReplies.get(0);
+ jGen.writeStringField("version", tableFeaturesReply.getVersion().toString()); //return the enum name
+
+ jGen.writeFieldName("tableFeatures");
+ jGen.writeStartArray();
+ for(OFTableFeatures tableFeature : tableFeaturesReply.getEntries()) {
+ jGen.writeStartObject();
+ jGen.writeNumberField("tableId", tableFeature.getTableId().getValue());
+ jGen.writeStringField("name", tableFeature.getName());
+ jGen.writeNumberField("metadataMatch", tableFeature.getMetadataMatch().getValue());
+ jGen.writeNumberField("metadataWrite", tableFeature.getMetadataWrite().getValue());
+ jGen.writeNumberField("config", tableFeature.getConfig());
+ jGen.writeNumberField("maxEntries", tableFeature.getMaxEntries());
+
+ jGen.writeFieldName("properties");
+ jGen.writeStartArray();
+ for (OFTableFeatureProp properties : tableFeature.getProperties()) {
+ jGen.writeStartObject();
+ short type = (short)properties.getType();
+ jGen.writeNumberField("tableFeaturePropType",type);
+
+ switch (type) {
+ case OFTableFeaturePropTypeSerializerVer13.INSTRUCTIONS_VAL:
+ OFTableFeaturePropInstructions propInstruct = (OFTableFeaturePropInstructions) properties;
+ jGen.writeFieldName("instructions");
+ jGen.writeStartArray();
+ for (OFInstructionId id : propInstruct.getInstructionIds()) {
+ jGen.writeStartObject();
+ jGen.writeString(id.getType().toString());
+ jGen.writeEndObject();
+ }
+ jGen.writeEndArray();
+ break;
+ case OFTableFeaturePropTypeSerializerVer13.INSTRUCTIONS_MISS_VAL:
+ OFTableFeaturePropInstructionsMiss propInstructMiss = (OFTableFeaturePropInstructionsMiss) properties;
+ jGen.writeFieldName("instructionsMiss");
+ jGen.writeStartArray();
+ for (OFInstructionId id : propInstructMiss.getInstructionIds()) {
+ jGen.writeStartObject();
+ jGen.writeString(id.getType().toString());
+ jGen.writeEndObject();
+ }
+ jGen.writeEndArray();
+ break;
+ case OFTableFeaturePropTypeSerializerVer13.NEXT_TABLES_VAL:
+ OFTableFeaturePropNextTables propNxtTables = (OFTableFeaturePropNextTables) properties;
+ jGen.writeFieldName("nextTables");
+ jGen.writeStartArray();
+ for (U8 id : propNxtTables.getNextTableIds()) {
+ jGen.writeStartObject();
+ jGen.writeNumber(id.getValue());
+ jGen.writeEndObject();
+ }
+ jGen.writeEndArray();
+ break;
+ case OFTableFeaturePropTypeSerializerVer13.NEXT_TABLES_MISS_VAL:
+ OFTableFeaturePropNextTablesMiss propNxtTablesMiss = (OFTableFeaturePropNextTablesMiss) properties;
+ jGen.writeFieldName("nextTablesMiss");
+ jGen.writeStartArray();
+ for (U8 id : propNxtTablesMiss.getNextTableIds()) {
+ jGen.writeStartObject();
+ jGen.writeNumber(id.getValue());
+ jGen.writeEndObject();
+ }
+ jGen.writeEndArray();
+ break;
+ case OFTableFeaturePropTypeSerializerVer13.WRITE_ACTIONS_VAL:
+ OFTableFeaturePropWriteActions propWrAct = (OFTableFeaturePropWriteActions) properties;
+ jGen.writeFieldName("writeActions");
+ jGen.writeStartArray();
+ for (OFActionId id : propWrAct.getActionIds()) {
+ jGen.writeStartObject();
+ jGen.writeString(id.getType().toString());
+ jGen.writeEndObject();
+ }
+ jGen.writeEndArray();
+ break;
+ case OFTableFeaturePropTypeSerializerVer13.WRITE_ACTIONS_MISS_VAL:
+ OFTableFeaturePropWriteActionsMiss propWrActMiss = (OFTableFeaturePropWriteActionsMiss) properties;
+ jGen.writeFieldName("writeActionsMiss");
+ jGen.writeStartArray();
+ for (OFActionId id : propWrActMiss.getActionIds()) {
+ jGen.writeStartObject();
+ jGen.writeString(id.getType().toString());
+ jGen.writeEndObject();
+ }
+ jGen.writeEndArray();
+ break;
+ case OFTableFeaturePropTypeSerializerVer13.APPLY_ACTIONS_VAL:
+ OFTableFeaturePropApplyActions propAppAct = (OFTableFeaturePropApplyActions) properties;
+ jGen.writeFieldName("applyActions");
+ jGen.writeStartArray();
+ for (OFActionId id : propAppAct.getActionIds()) {
+ jGen.writeStartObject();
+ jGen.writeString(id.getType().toString());
+ jGen.writeEndObject();
+ }
+ jGen.writeEndArray();
+ break;
+ case OFTableFeaturePropTypeSerializerVer13.APPLY_ACTIONS_MISS_VAL:
+ OFTableFeaturePropApplyActionsMiss propAppActMiss = (OFTableFeaturePropApplyActionsMiss) properties;
+ jGen.writeFieldName("applyActionsMiss");
+ jGen.writeStartArray();
+ for (OFActionId id : propAppActMiss.getActionIds()) {
+ jGen.writeStartObject();
+ jGen.writeString(id.getType().toString());
+ jGen.writeEndObject();
+ }
+ jGen.writeEndArray();
+ break;
+ case OFTableFeaturePropTypeSerializerVer13.MATCH_VAL:
+ OFTableFeaturePropMatch propMatch = (OFTableFeaturePropMatch) properties;
+ jGen.writeFieldName("match");
+ jGen.writeStartArray();
+ for (U32 id : propMatch.getOxmIds()) {
+ jGen.writeStartObject();
+ jGen.writeNumber(id.getValue());
+ jGen.writeEndObject();
+ }
+ jGen.writeEndArray();
+ break;
+ case OFTableFeaturePropTypeSerializerVer13.WILDCARDS_VAL:
+ OFTableFeaturePropWildcards propWildcards = (OFTableFeaturePropWildcards) properties;
+ jGen.writeFieldName("wildcards");
+ jGen.writeStartArray();
+ for (U32 id : propWildcards.getOxmIds()) {
+ jGen.writeStartObject();
+ jGen.writeNumber(id.getValue());
+ jGen.writeEndObject();
+ }
+ jGen.writeEndArray();
+ break;
+ case OFTableFeaturePropTypeSerializerVer13.WRITE_SETFIELD_VAL:
+ OFTableFeaturePropWriteSetfield propWrSetfield = (OFTableFeaturePropWriteSetfield) properties;
+ jGen.writeFieldName("writeSetfield");
+ jGen.writeStartArray();
+ for (U32 id : propWrSetfield.getOxmIds()) {
+ jGen.writeStartObject();
+ jGen.writeNumber(id.getValue());
+ jGen.writeEndObject();
+ }
+ jGen.writeEndArray();
+ break;
+ case OFTableFeaturePropTypeSerializerVer13.WRITE_SETFIELD_MISS_VAL:
+ OFTableFeaturePropWriteSetfieldMiss propWrSetfieldMiss = (OFTableFeaturePropWriteSetfieldMiss) properties;
+ jGen.writeFieldName("writeSetfieldMiss");
+ jGen.writeStartArray();
+ for (U32 id : propWrSetfieldMiss.getOxmIds()) {
+ jGen.writeStartObject();
+ jGen.writeNumber(id.getValue());
+ jGen.writeEndObject();
+ }
+ jGen.writeEndArray();
+ break;
+ case OFTableFeaturePropTypeSerializerVer13.APPLY_SETFIELD_VAL:
+ OFTableFeaturePropApplySetfield propAppSetfield = (OFTableFeaturePropApplySetfield) properties;
+ jGen.writeFieldName("applySetfield");
+ jGen.writeStartArray();
+ for (U32 id : propAppSetfield.getOxmIds()) {
+ jGen.writeStartObject();
+ jGen.writeNumber(id.getValue());
+ jGen.writeEndObject();
+ }
+ jGen.writeEndArray();
+ break;
+ case OFTableFeaturePropTypeSerializerVer13.APPLY_SETFIELD_MISS_VAL:
+ OFTableFeaturePropApplySetfieldMiss propAppSetfieldMiss = (OFTableFeaturePropApplySetfieldMiss) properties;
+ jGen.writeFieldName("applySetfieldMiss");
+ jGen.writeStartArray();
+ for (U32 id : propAppSetfieldMiss.getOxmIds()) {
+ jGen.writeStartObject();
+ jGen.writeNumber(id.getValue());
+ jGen.writeEndObject();
+ }
+ jGen.writeEndArray();
+ break;
+ case OFTableFeaturePropTypeSerializerVer13.EXPERIMENTER_VAL:
+ OFTableFeaturePropExperimenter propExp = (OFTableFeaturePropExperimenter) properties;
+ jGen.writeFieldName("experimenter");
+ jGen.writeStartObject();
+ jGen.writeNumberField("subType", propExp.getSubtype());
+ jGen.writeNumberField("experimenter", propExp.getExperimenter());
+ jGen.writeStringField("subType", propExp.getExperimenterData().toString());
+ jGen.writeEndObject();
+ break;
+ case OFTableFeaturePropTypeSerializerVer13.EXPERIMENTER_MISS_VAL:
+ OFTableFeaturePropExperimenterMiss propExpMiss = (OFTableFeaturePropExperimenterMiss) properties;
+ jGen.writeFieldName("experimenterMiss");
+ jGen.writeStartObject();
+ jGen.writeNumberField("subType", propExpMiss.getSubtype());
+ jGen.writeNumberField("experimenter", propExpMiss.getExperimenter());
+ jGen.writeStringField("subType", propExpMiss.getExperimenterData().toString());
+ jGen.writeEndObject();
+ break;
+ default:
+ // shouldn't ever get here
+ break;
+ }//end of Switch Case
+ jGen.writeEndObject();
+ }//end of for loop - properties
+ jGen.writeEndObject();
+ }//end of for loop - features
+ jGen.writeEndArray();
+ }
+
+
+ public static void serializePortReply(List portReplies, JsonGenerator jGen) throws IOException, JsonProcessingException{
+ OFPortStatsReply portReply = portReplies.get(0); // we will get only one PortReply and it will contains many OFPortStatsEntry ?
+ jGen.writeStringField("version", portReply.getVersion().toString()); //return the enum name
+ jGen.writeFieldName("port");
+ jGen.writeStartArray();
+ for(OFPortStatsEntry entry : portReply.getEntries()) {
+ jGen.writeStartObject();
+ jGen.writeStringField("portNumber",entry.getPortNo().toString());
+ jGen.writeNumberField("receivePackets", entry.getRxPackets().getValue());
+ jGen.writeNumberField("transmitPackets", entry.getTxPackets().getValue());
+ jGen.writeNumberField("receiveBytes", entry.getRxBytes().getValue());
+ jGen.writeNumberField("transmitBytes", entry.getTxBytes().getValue());
+ jGen.writeNumberField("receiveDropped", entry.getRxDropped().getValue());
+ jGen.writeNumberField("transmitDropped", entry.getTxDropped().getValue());
+ jGen.writeNumberField("receiveErrors", entry.getRxErrors().getValue());
+ jGen.writeNumberField("transmitErrors", entry.getTxErrors().getValue());
+ jGen.writeNumberField("receiveFrameErrors", entry.getRxFrameErr().getValue());
+ jGen.writeNumberField("receiveOverrunErrors", entry.getRxOverErr().getValue());
+ jGen.writeNumberField("receiveCRCErrors", entry.getRxCrcErr().getValue());
+ jGen.writeNumberField("collisions", entry.getCollisions().getValue());
+ if (OFVersion.OF_13 == entry.getVersion()) {
+ jGen.writeNumberField("durationSec", entry.getDurationSec());
+ jGen.writeNumberField("durationNsec", entry.getDurationNsec());
+ }
+ jGen.writeEndObject();
+ }
+ jGen.writeEndArray();
+ }
+
+ public static void serializeFlowReply(List flowReplies, JsonGenerator jGen) throws IOException, JsonProcessingException{
for (OFFlowStatsReply flowReply : flowReplies) { // for each flow stats reply
+ //Dose the switch will reply multiple OFFlowStatsReply ?
+ //Or we juse need to use the first item of the list.
List entries = flowReply.getEntries();
+ jGen.writeFieldName("flows");
+ jGen.writeStartArray();
for (OFFlowStatsEntry entry : entries) { // for each flow
+ jGen.writeStartObject();
// list flow stats/info
- jGen.writeObjectFieldStart("flow" + Integer.toString(flowCount++)); // need to have different object names or JSON parser might only show the last one
jGen.writeStringField("version", entry.getVersion().toString()); // return the enum name
jGen.writeNumberField("cookie", entry.getCookie().getValue());
- jGen.writeNumberField("table_id", entry.getTableId().getValue());
- jGen.writeNumberField("packet_count", entry.getPacketCount().getValue());
- jGen.writeNumberField("byte_count", entry.getByteCount().getValue());
- jGen.writeNumberField("duration_sec", entry.getDurationSec());
+ jGen.writeStringField("tableId", entry.getTableId().toString());
+ jGen.writeNumberField("packetCount", entry.getPacketCount().getValue());
+ jGen.writeNumberField("byteCount", entry.getByteCount().getValue());
+ jGen.writeNumberField("durationSeconds", entry.getDurationSec());
jGen.writeNumberField("priority", entry.getPriority());
- jGen.writeNumberField("idle_timeout_sec", entry.getIdleTimeout());
- jGen.writeNumberField("hard_timeout_sec", entry.getHardTimeout());
- jGen.writeNumberField("flags", entry.getFlags());
- // list flow matches
- jGen.writeObjectFieldStart("match");
- Iterator> mi = entry.getMatch().getMatchFields().iterator(); // get iter to any match field type
- Match m = entry.getMatch();
-
- while (mi.hasNext()) {
- MatchField mf = mi.next();
- switch (mf.id) {
- case IN_PORT:
- jGen.writeNumberField(MatchUtils.STR_IN_PORT, m.get(MatchField.IN_PORT).getPortNumber());
- break;
- case IN_PHY_PORT:
- jGen.writeNumberField(MatchUtils.STR_IN_PHYS_PORT, m.get(MatchField.IN_PHY_PORT).getPortNumber());
- break;
- case ARP_OP:
- jGen.writeNumberField(MatchUtils.STR_ARP_OPCODE, m.get(MatchField.ARP_OP).getOpcode());
- break;
- case ARP_SHA:
- jGen.writeStringField(MatchUtils.STR_ARP_SHA, m.get(MatchField.ARP_SHA).toString());
- break;
- case ARP_SPA:
- jGen.writeStringField(MatchUtils.STR_ARP_SPA, m.get(MatchField.ARP_SPA).toString());
- break;
- case ARP_THA:
- jGen.writeStringField(MatchUtils.STR_ARP_DHA, m.get(MatchField.ARP_THA).toString());
- break;
- case ARP_TPA:
- jGen.writeStringField(MatchUtils.STR_ARP_DPA, m.get(MatchField.ARP_TPA).toString());
- break;
- case ETH_TYPE:
- jGen.writeNumberField(MatchUtils.STR_DL_TYPE, m.get(MatchField.ETH_TYPE).getValue());
- break;
- case ETH_SRC:
- jGen.writeStringField(MatchUtils.STR_DL_SRC, m.get(MatchField.ETH_SRC).toString());
- break;
- case ETH_DST:
- jGen.writeStringField(MatchUtils.STR_DL_DST, m.get(MatchField.ETH_DST).toString());
- break;
- case VLAN_VID:
- jGen.writeNumberField(MatchUtils.STR_DL_VLAN, m.get(MatchField.VLAN_VID).getVlan());
- break;
- case VLAN_PCP:
- jGen.writeNumberField(MatchUtils.STR_DL_VLAN_PCP, m.get(MatchField.VLAN_PCP).getValue());
- break;
- case ICMPV4_TYPE:
- jGen.writeNumberField(MatchUtils.STR_ICMP_TYPE, m.get(MatchField.ICMPV4_TYPE).getType());
- break;
- case ICMPV4_CODE:
- jGen.writeNumberField(MatchUtils.STR_ICMP_CODE, m.get(MatchField.ICMPV4_CODE).getCode());
- break;
- case ICMPV6_TYPE:
- jGen.writeNumberField(MatchUtils.STR_ICMPV6_TYPE, m.get(MatchField.ICMPV6_TYPE).getValue());
- break;
- case ICMPV6_CODE:
- jGen.writeNumberField(MatchUtils.STR_ICMPV6_CODE, m.get(MatchField.ICMPV6_CODE).getValue());
- break;
- case IP_DSCP:
- jGen.writeNumberField(MatchUtils.STR_NW_DSCP, m.get(MatchField.IP_DSCP).getDscpValue());
- break;
- case IP_ECN:
- jGen.writeNumberField(MatchUtils.STR_NW_ECN, m.get(MatchField.IP_ECN).getEcnValue());
- break;
- case IP_PROTO:
- jGen.writeNumberField(MatchUtils.STR_NW_PROTO, m.get(MatchField.IP_PROTO).getIpProtocolNumber());
- break;
- case IPV4_SRC:
- jGen.writeStringField(MatchUtils.STR_NW_SRC, m.get(MatchField.IPV4_SRC).toString());
- break;
- case IPV4_DST:
- jGen.writeStringField(MatchUtils.STR_NW_DST, m.get(MatchField.IPV4_DST).toString());
- break;
- case IPV6_SRC:
- jGen.writeStringField(MatchUtils.STR_IPV6_SRC, m.get(MatchField.IPV6_SRC).toString());
- break;
- case IPV6_DST:
- jGen.writeStringField(MatchUtils.STR_IPV6_DST, m.get(MatchField.IPV6_DST).toString());
- break;
- case IPV6_FLABEL:
- jGen.writeNumberField(MatchUtils.STR_IPV6_FLOW_LABEL, m.get(MatchField.IPV6_FLABEL).getIPv6FlowLabelValue());
- break;
- case IPV6_ND_SLL:
- jGen.writeNumberField(MatchUtils.STR_IPV6_ND_SSL, m.get(MatchField.IPV6_ND_SLL).getLong());
- break;
- case IPV6_ND_TARGET:
- jGen.writeNumberField(MatchUtils.STR_IPV6_ND_TARGET, m.get(MatchField.IPV6_ND_TARGET).getZeroCompressStart());
- break;
- case IPV6_ND_TLL:
- jGen.writeNumberField(MatchUtils.STR_IPV6_ND_TTL, m.get(MatchField.IPV6_ND_TLL).getLong());
- break;
- case METADATA:
- jGen.writeNumberField(MatchUtils.STR_METADATA, m.get(MatchField.METADATA).getValue().getValue());
- break;
- case MPLS_LABEL:
- jGen.writeNumberField(MatchUtils.STR_MPLS_LABEL, m.get(MatchField.MPLS_LABEL).getValue());
- break;
- case MPLS_TC:
- jGen.writeNumberField(MatchUtils.STR_MPLS_TC, m.get(MatchField.MPLS_TC).getValue());
- break;
- case SCTP_SRC:
- jGen.writeNumberField(MatchUtils.STR_SCTP_SRC, m.get(MatchField.SCTP_SRC).getPort());
- break;
- case SCTP_DST:
- jGen.writeNumberField(MatchUtils.STR_SCTP_DST, m.get(MatchField.SCTP_DST).getPort());
- break;
- case TCP_SRC:
- jGen.writeNumberField(MatchUtils.STR_TCP_SRC, m.get(MatchField.TCP_SRC).getPort());
- break;
- case TCP_DST:
- jGen.writeNumberField(MatchUtils.STR_TCP_DST, m.get(MatchField.TCP_DST).getPort());
- break;
- case UDP_SRC:
- jGen.writeNumberField(MatchUtils.STR_UDP_SRC, m.get(MatchField.UDP_SRC).getPort());
- break;
- case UDP_DST:
- jGen.writeNumberField(MatchUtils.STR_UDP_DST, m.get(MatchField.UDP_DST).getPort());
- break;
- default:
- // either a BSN or unknown match type
- break;
- } // end switch of match type
- } // end while over non-wildcarded matches
-
- jGen.writeEndObject(); // end match
+ jGen.writeNumberField("idleTimeoutSec", entry.getIdleTimeout());
+ jGen.writeNumberField("hardTimeoutSec", entry.getHardTimeout());
+ switch (entry.getVersion()) {
+ case OF_10:
+ // flags not supported
+ break;
+ case OF_11:
+ jGen.writeNumberField("flags", OFFlowModFlagsSerializerVer11.toWireValue(entry.getFlags()));
+ break;
+ case OF_12:
+ jGen.writeNumberField("flags", OFFlowModFlagsSerializerVer12.toWireValue(entry.getFlags()));
+ break;
+ case OF_13:
+ jGen.writeNumberField("flags", OFFlowModFlagsSerializerVer13.toWireValue(entry.getFlags()));
+ break;
+ case OF_14:
+ jGen.writeNumberField("flags", OFFlowModFlagsSerializerVer14.toWireValue(entry.getFlags()));
+ break;
+ default:
+ logger.error("Could not decode OFVersion {}", entry.getVersion());
+ break;
+ }
+
+ MatchSerializer.serializeMatch(jGen, entry.getMatch());
// handle OF1.1+ instructions with actions within
if (entry.getVersion() == OFVersion.OF_10) {
- serializeActions(jGen, entry.getActions());
+ jGen.writeObjectFieldStart("actions");
+ OFActionListSerializer.serializeActions(jGen, entry.getActions());
+ jGen.writeEndObject();
} else {
- List instructions = entry.getInstructions();
- jGen.writeObjectFieldStart("instructions");
- if (instructions.isEmpty()) {
- jGen.writeStringField("none", "drop");
- } else {
- for (OFInstruction i : instructions) {
- switch (i.getType()) {
- case CLEAR_ACTIONS:
- jGen.writeObjectFieldStart(InstructionUtils.STR_CLEAR_ACTIONS);
- break;
- case WRITE_METADATA:
- jGen.writeStartObject();
- jGen.writeNumberField(InstructionUtils.STR_WRITE_METADATA, ((OFInstructionWriteMetadata)i).getMetadata().getValue());
- jGen.writeNumberField(InstructionUtils.STR_WRITE_METADATA + "_mask", ((OFInstructionWriteMetadata)i).getMetadataMask().getValue());
- break;
- case EXPERIMENTER:
- jGen.writeStartObject();
- jGen.writeNumberField(InstructionUtils.STR_EXPERIMENTER, ((OFInstructionExperimenter)i).getExperimenter());
- break;
- case GOTO_TABLE:
- jGen.writeStartObject();
- jGen.writeNumberField(InstructionUtils.STR_GOTO_TABLE, ((OFInstructionGotoTable)i).getTableId().getValue());
- break;
- case METER:
- jGen.writeStartObject();
- jGen.writeNumberField(InstructionUtils.STR_GOTO_METER, ((OFInstructionMeter)i).getMeterId());
- break;
- case APPLY_ACTIONS:
- jGen.writeObjectFieldStart(InstructionUtils.STR_APPLY_ACTIONS);
- serializeActions(jGen, ((OFInstructionApplyActions)i).getActions());
- break;
- case WRITE_ACTIONS:
- jGen.writeObjectFieldStart(InstructionUtils.STR_WRITE_ACTIONS);
- serializeActions(jGen, ((OFInstructionWriteActions)i).getActions());
- default:
- // shouldn't ever get here
- break;
- } // end switch on instruction
- jGen.writeEndObject(); // end specific instruction
- } // end for instructions
- jGen.writeEndObject();
- } // end process instructions (OF1.1+ only)
- } // end not-empty instructions (else)
+ OFInstructionListSerializer.serializeInstructionList(jGen, entry.getInstructions());
+ }
+
jGen.writeEndObject();
} // end for each OFFlowStatsReply entry
+ jGen.writeEndArray();
} // end for each OFStatsReply
} // end method
- /**
- * Write a JSON string given a list of OFAction. Supports OF1.0 - OF1.3.
- * This is the only place actions are serialized, for any OF version. Because
- * some OF version share actions, it makes sense to have them in one place.
- * @param jsonGenerator
- * @param actions
- * @throws IOException
- * @throws JsonProcessingException
- */
- public void serializeActions(JsonGenerator jsonGenerator, List actions) throws IOException, JsonProcessingException {
- //jsonGenerator.writeStartObject();
- if (actions.isEmpty()) {
- jsonGenerator.writeStringField("none", "drop");
+ public static void serializeDescReply(List descReplies, JsonGenerator jGen) throws IOException, JsonProcessingException{
+ OFDescStatsReply descReply = descReplies.get(0); // There is only one descReply from the switch
+ jGen.writeObjectFieldStart("desc");
+ jGen.writeStringField("version", descReply.getVersion().toString()); //return the enum name
+ jGen.writeStringField("manufacturerDescription", descReply.getMfrDesc());
+ jGen.writeStringField("hardwareDescription", descReply.getHwDesc());
+ jGen.writeStringField("softwareDescription", descReply.getSwDesc());
+ jGen.writeStringField("serialNumber", descReply.getSerialNum());
+ jGen.writeStringField("datapathDescription", descReply.getDpDesc());
+ jGen.writeEndObject(); // end match
+ }
+
+ public static void serializeAggregateReply(List aggregateReplies, JsonGenerator jGen) throws IOException, JsonProcessingException{
+ OFAggregateStatsReply aggregateReply = aggregateReplies.get(0); // There are only one aggregateReply from the switch
+ jGen.writeObjectFieldStart("aggregate");
+ jGen.writeStringField("version", aggregateReply.getVersion().toString()); //return the enum name
+ jGen.writeNumberField("flowCount", aggregateReply.getFlowCount());
+ jGen.writeNumberField("packetCount", aggregateReply.getPacketCount().getValue());
+ jGen.writeNumberField("byteCount", aggregateReply.getByteCount().getValue());
+ switch (aggregateReply.getVersion()) {
+ case OF_10:
+ jGen.writeNumberField("flags", OFStatsReplyFlagsSerializerVer10.toWireValue(aggregateReply.getFlags()));
+ break;
+ case OF_11:
+ jGen.writeNumberField("flags", OFStatsReplyFlagsSerializerVer11.toWireValue(aggregateReply.getFlags()));
+ break;
+ case OF_12:
+ jGen.writeNumberField("flags", OFStatsReplyFlagsSerializerVer12.toWireValue(aggregateReply.getFlags()));
+ break;
+ case OF_13:
+ jGen.writeNumberField("flags", OFStatsReplyFlagsSerializerVer13.toWireValue(aggregateReply.getFlags()));
+ break;
+ case OF_14:
+ jGen.writeNumberField("flags", OFStatsReplyFlagsSerializerVer14.toWireValue(aggregateReply.getFlags()));
+ break;
+ default:
+ break;
}
- for (OFAction a : actions) {
- switch (a.getType()) {
- case OUTPUT: //TODO @Ryan need to reference the predefined string constants for each of the actions/oxms
- jsonGenerator.writeNumberField(ActionUtils.STR_OUTPUT, ((OFActionOutput)a).getPort().getPortNumber());
- break;
- /* begin OF1.0 ONLY actions */
- case SET_VLAN_VID:
- jsonGenerator.writeNumberField(ActionUtils.STR_VLAN_SET_VID, ((OFActionSetVlanVid)a).getVlanVid().getVlan());
- break;
- case SET_VLAN_PCP:
- jsonGenerator.writeNumberField(ActionUtils.STR_VLAN_SET_PCP, ((OFActionSetVlanPcp)a).getVlanPcp().getValue());
- break;
- case SET_QUEUE:
- jsonGenerator.writeNumberField(ActionUtils.STR_QUEUE_SET, ((OFActionSetQueue)a).getQueueId());
- break;
- case SET_DL_SRC:
- jsonGenerator.writeStringField(ActionUtils.STR_DL_SRC_SET, ((OFActionSetDlSrc)a).getDlAddr().toString());
- break;
- case SET_DL_DST:
- jsonGenerator.writeStringField(ActionUtils.STR_DL_DST_SET, ((OFActionSetDlDst)a).getDlAddr().toString());
- break;
- case SET_NW_SRC:
- jsonGenerator.writeStringField(ActionUtils.STR_NW_SRC_SET, ((OFActionSetNwSrc)a).getNwAddr().toString());
- break;
- case SET_NW_DST:
- jsonGenerator.writeStringField(ActionUtils.STR_NW_DST_SET, ((OFActionSetNwDst)a).getNwAddr().toString());
- break;
- case SET_NW_TOS:
- jsonGenerator.writeNumberField(ActionUtils.STR_NW_TOS_SET, ((OFActionSetNwTos)a).getNwTos());
- break;
- case SET_TP_SRC:
- jsonGenerator.writeNumberField(ActionUtils.STR_TP_SRC_SET, ((OFActionSetTpSrc)a).getTpPort().getPort());
- break;
- case SET_TP_DST:
- jsonGenerator.writeNumberField(ActionUtils.STR_TP_DST_SET, ((OFActionSetTpDst)a).getTpPort().getPort());
- break;
- /* end OF1.0 ONLY actions; begin OF1.1+ actions */
- case ENQUEUE:
- jsonGenerator.writeNumberField(ActionUtils.STR_ENQUEUE, ((OFActionEnqueue)a).getPort().getPortNumber());
- break;
- case GROUP:
- jsonGenerator.writeNumberField(ActionUtils.STR_GROUP, ((OFActionGroup)a).getGroup().getGroupNumber());
- break;
- case STRIP_VLAN:
- jsonGenerator.writeString(ActionUtils.STR_VLAN_STRIP);
- break;
- case PUSH_VLAN:
- jsonGenerator.writeNumberField(ActionUtils.STR_VLAN_PUSH, ((OFActionPushVlan)a).getEthertype().getValue());
- break;
- case PUSH_MPLS:
- jsonGenerator.writeNumberField(ActionUtils.STR_MPLS_PUSH, ((OFActionPushMpls)a).getEthertype().getValue());
- break;
- case PUSH_PBB:
- jsonGenerator.writeNumberField(ActionUtils.STR_PBB_PUSH, ((OFActionPushPbb)a).getEthertype().getValue());
- break;
- case POP_VLAN:
- jsonGenerator.writeString(ActionUtils.STR_VLAN_POP);
- break;
- case POP_MPLS:
- jsonGenerator.writeNumberField(ActionUtils.STR_MPLS_POP, ((OFActionPopMpls)a).getEthertype().getValue());
- break;
- case POP_PBB:
- jsonGenerator.writeString(ActionUtils.STR_PBB_POP);
- break;
- case COPY_TTL_IN:
- jsonGenerator.writeString(ActionUtils.STR_TTL_IN_COPY);
- break;
- case COPY_TTL_OUT:
- jsonGenerator.writeString(ActionUtils.STR_TTL_OUT_COPY);
- break;
- case DEC_NW_TTL:
- jsonGenerator.writeString(ActionUtils.STR_NW_TTL_DEC);
- break;
- case DEC_MPLS_TTL:
- jsonGenerator.writeString(ActionUtils.STR_MPLS_TTL_DEC);
- break;
- case SET_MPLS_LABEL:
- jsonGenerator.writeNumberField(ActionUtils.STR_MPLS_LABEL_SET, ((OFActionSetMplsLabel)a).getMplsLabel());
- break;
- case SET_MPLS_TC:
- jsonGenerator.writeNumberField(ActionUtils.STR_MPLS_TC_SET, ((OFActionSetMplsTc)a).getMplsTc());
- break;
- case SET_MPLS_TTL:
- jsonGenerator.writeNumberField(ActionUtils.STR_MPLS_TTL_SET, ((OFActionSetMplsTtl)a).getMplsTtl());
+ jGen.writeEndObject(); // end match
+ }
+
+ public static void serializePortDescReply(List portDescReplies, JsonGenerator jGen) throws IOException, JsonProcessingException{
+ OFPortDescStatsReply portDescReply = portDescReplies.get(0); // we will get only one PortDescReply and it will contains many OFPortDescStatsEntry ?
+ jGen.writeStringField("version", portDescReply.getVersion().toString()); //return the enum name
+ serializePortDesc(portDescReply.getEntries(), jGen);
+ }
+
+ public static void serializePortDesc(List portDescList, JsonGenerator jGen) throws IOException, JsonProcessingException {
+ jGen.writeFieldName("portDesc");
+ jGen.writeStartArray();
+ for(OFPortDesc entry : portDescList) {
+ jGen.writeStartObject();
+ jGen.writeStringField("portNumber",entry.getPortNo().toString());
+ jGen.writeStringField("hardwareAddress", entry.getHwAddr().toString());
+ jGen.writeStringField("name", entry.getName());
+ switch(entry.getVersion()) {
+ case OF_10:
+ jGen.writeNumberField("config", OFPortConfigSerializerVer10.toWireValue(entry.getConfig()));
+ jGen.writeNumberField("state", OFPortStateSerializerVer10.toWireValue(entry.getState()));
+ jGen.writeNumberField("currentFeatures", OFPortFeaturesSerializerVer10.toWireValue(entry.getCurr()));
+ jGen.writeNumberField("advertisedFeatures", OFPortFeaturesSerializerVer10.toWireValue(entry.getAdvertised()));
+ jGen.writeNumberField("supportedFeatures", OFPortFeaturesSerializerVer10.toWireValue(entry.getSupported()));
+ jGen.writeNumberField("peerFeatures", OFPortFeaturesSerializerVer10.toWireValue(entry.getPeer()));
break;
- case SET_NW_ECN:
- jsonGenerator.writeNumberField(ActionUtils.STR_NW_ECN_SET, ((OFActionSetNwEcn)a).getNwEcn().getEcnValue());
+ case OF_11:
+ jGen.writeNumberField("config", OFPortConfigSerializerVer11.toWireValue(entry.getConfig()));
+ jGen.writeNumberField("state", OFPortStateSerializerVer11.toWireValue(entry.getState()));
+ jGen.writeNumberField("currentFeatures", OFPortFeaturesSerializerVer11.toWireValue(entry.getCurr()));
+ jGen.writeNumberField("advertisedFeatures", OFPortFeaturesSerializerVer11.toWireValue(entry.getAdvertised()));
+ jGen.writeNumberField("supportedFeatures", OFPortFeaturesSerializerVer11.toWireValue(entry.getSupported()));
+ jGen.writeNumberField("peerFeatures", OFPortFeaturesSerializerVer11.toWireValue(entry.getPeer()));
break;
- case SET_NW_TTL:
- jsonGenerator.writeNumberField(ActionUtils.STR_NW_TTL_SET, ((OFActionSetNwTtl)a).getNwTtl());
+ case OF_12:
+ jGen.writeNumberField("config", OFPortConfigSerializerVer12.toWireValue(entry.getConfig()));
+ jGen.writeNumberField("state", OFPortStateSerializerVer12.toWireValue(entry.getState()));
+ jGen.writeNumberField("currentFeatures", OFPortFeaturesSerializerVer12.toWireValue(entry.getCurr()));
+ jGen.writeNumberField("advertisedFeatures", OFPortFeaturesSerializerVer12.toWireValue(entry.getAdvertised()));
+ jGen.writeNumberField("supportedFeatures", OFPortFeaturesSerializerVer12.toWireValue(entry.getSupported()));
+ jGen.writeNumberField("peerFeatures", OFPortFeaturesSerializerVer12.toWireValue(entry.getPeer()));
break;
- case EXPERIMENTER:
- jsonGenerator.writeNumberField(ActionUtils.STR_EXPERIMENTER, ((OFActionExperimenter)a).getExperimenter());
+ case OF_13:
+ jGen.writeNumberField("config", OFPortConfigSerializerVer13.toWireValue(entry.getConfig()));
+ jGen.writeNumberField("state", OFPortStateSerializerVer13.toWireValue(entry.getState()));
+ jGen.writeNumberField("currentFeatures", OFPortFeaturesSerializerVer13.toWireValue(entry.getCurr()));
+ jGen.writeNumberField("advertisedFeatures", OFPortFeaturesSerializerVer13.toWireValue(entry.getAdvertised()));
+ jGen.writeNumberField("supportedFeatures", OFPortFeaturesSerializerVer13.toWireValue(entry.getSupported()));
+ jGen.writeNumberField("peerFeatures", OFPortFeaturesSerializerVer13.toWireValue(entry.getPeer()));
break;
- case SET_FIELD:
- if (((OFActionSetField)a).getField() instanceof OFOxmArpOp) {
- jsonGenerator.writeNumberField(MatchUtils.STR_ARP_OPCODE, ((OFOxmArpOp) ((OFActionSetField) a).getField()).getValue().getOpcode());
- } else if (((OFActionSetField)a).getField() instanceof OFOxmArpSha) {
- jsonGenerator.writeStringField(MatchUtils.STR_ARP_SHA, ((OFOxmArpSha) ((OFActionSetField) a).getField()).getValue().toString()); // macaddress formats string already
- } else if (((OFActionSetField)a).getField() instanceof OFOxmArpTha) {
- jsonGenerator.writeStringField(MatchUtils.STR_ARP_DHA, ((OFOxmArpTha) ((OFActionSetField) a).getField()).getValue().toString());
- } else if (((OFActionSetField)a).getField() instanceof OFOxmArpSpa) {
- jsonGenerator.writeStringField(MatchUtils.STR_ARP_SPA, ((OFOxmArpSpa) ((OFActionSetField) a).getField()).getValue().toString()); // ipaddress formats string already
- } else if (((OFActionSetField)a).getField() instanceof OFOxmArpTpa) {
- jsonGenerator.writeStringField(MatchUtils.STR_ARP_DPA, ((OFOxmArpTpa) ((OFActionSetField) a).getField()).getValue().toString());
- }
- /* DATA LAYER */
- else if (((OFActionSetField)a).getField() instanceof OFOxmEthType) {
- jsonGenerator.writeNumberField(MatchUtils.STR_DL_TYPE, ((OFOxmEthType) ((OFActionSetField) a).getField()).getValue().getValue());
- } else if (((OFActionSetField)a).getField() instanceof OFOxmEthSrc) {
- jsonGenerator.writeStringField(MatchUtils.STR_DL_SRC, ((OFOxmEthSrc) ((OFActionSetField) a).getField()).getValue().toString());
- } else if (((OFActionSetField)a).getField() instanceof OFOxmEthDst) {
- jsonGenerator.writeStringField(MatchUtils.STR_DL_DST, ((OFOxmEthDst) ((OFActionSetField) a).getField()).getValue().toString());
- } else if (((OFActionSetField)a).getField() instanceof OFOxmVlanVid) {
- jsonGenerator.writeNumberField(MatchUtils.STR_DL_VLAN, ((OFOxmVlanVid) ((OFActionSetField) a).getField()).getValue().getVlan());
- } else if (((OFActionSetField)a).getField() instanceof OFOxmVlanPcp) {
- }
- /* ICMP */
- else if (((OFActionSetField)a).getField() instanceof OFOxmIcmpv4Code) {
- jsonGenerator.writeNumberField(MatchUtils.STR_ICMP_CODE, ((OFOxmIcmpv4Code) ((OFActionSetField) a).getField()).getValue().getCode());
- } else if (((OFActionSetField)a).getField() instanceof OFOxmIcmpv4Type) {
- jsonGenerator.writeNumberField(MatchUtils.STR_ICMP_TYPE, ((OFOxmIcmpv4Type) ((OFActionSetField) a).getField()).getValue().getType());
- }
- /* NETWORK LAYER */
- else if (((OFActionSetField)a).getField() instanceof OFOxmIpProto) {
- jsonGenerator.writeNumberField(MatchUtils.STR_NW_PROTO, ((OFOxmIpProto) ((OFActionSetField) a).getField()).getValue().getIpProtocolNumber());
- } else if (((OFActionSetField)a).getField() instanceof OFOxmIpv4Src) {
- jsonGenerator.writeStringField(MatchUtils.STR_NW_SRC, ((OFOxmIpv4Src) ((OFActionSetField) a).getField()).getValue().toString());
- } else if (((OFActionSetField)a).getField() instanceof OFOxmIpv4Dst) {
- jsonGenerator.writeStringField(MatchUtils.STR_NW_DST, ((OFOxmIpv4Dst) ((OFActionSetField) a).getField()).getValue().toString());
- } else if (((OFActionSetField)a).getField() instanceof OFOxmIpEcn) {
- jsonGenerator.writeNumberField(MatchUtils.STR_NW_ECN, ((OFOxmIpEcn) ((OFActionSetField) a).getField()).getValue().getEcnValue());
- } else if (((OFActionSetField)a).getField() instanceof OFOxmIpDscp) {
- jsonGenerator.writeNumberField(MatchUtils.STR_NW_DSCP, ((OFOxmIpDscp) ((OFActionSetField) a).getField()).getValue().getDscpValue());
- }
- /* TRANSPORT LAYER, TCP, UDP, and SCTP */
- else if (((OFActionSetField)a).getField() instanceof OFOxmTcpSrc) {
- jsonGenerator.writeNumberField(MatchUtils.STR_TCP_SRC, ((OFOxmTcpSrc) ((OFActionSetField) a).getField()).getValue().getPort());
- } else if (((OFActionSetField)a).getField() instanceof OFOxmTcpDst) {
- jsonGenerator.writeNumberField(MatchUtils.STR_TCP_DST, ((OFOxmTcpDst) ((OFActionSetField) a).getField()).getValue().getPort());
- } else if (((OFActionSetField)a).getField() instanceof OFOxmUdpSrc) {
- jsonGenerator.writeNumberField(MatchUtils.STR_UDP_SRC, ((OFOxmUdpSrc) ((OFActionSetField) a).getField()).getValue().getPort());
- } else if (((OFActionSetField)a).getField() instanceof OFOxmUdpDst) {
- jsonGenerator.writeNumberField(MatchUtils.STR_UDP_DST, ((OFOxmUdpDst) ((OFActionSetField) a).getField()).getValue().getPort());
- } else if (((OFActionSetField)a).getField() instanceof OFOxmSctpSrc) {
- jsonGenerator.writeNumberField(MatchUtils.STR_SCTP_SRC, ((OFOxmSctpSrc) ((OFActionSetField) a).getField()).getValue().getPort());
- } else if (((OFActionSetField)a).getField() instanceof OFOxmSctpDst) {
- jsonGenerator.writeNumberField(MatchUtils.STR_SCTP_DST, ((OFOxmSctpDst) ((OFActionSetField) a).getField()).getValue().getPort());
- }
- /* MPLS */
- else if (((OFActionSetField)a).getField() instanceof OFOxmMplsLabel) {
- jsonGenerator.writeNumberField(MatchUtils.STR_MPLS_LABEL, ((OFOxmMplsLabel) ((OFActionSetField) a).getField()).getValue().getValue());
- } else if (((OFActionSetField)a).getField() instanceof OFOxmMplsTc) {
- jsonGenerator.writeNumberField(MatchUtils.STR_MPLS_TC, ((OFOxmMplsTc) ((OFActionSetField) a).getField()).getValue().getValue());
- } // MPLS_BOS not implemented in loxi
- /* METADATA */
- else if (((OFActionSetField)a).getField() instanceof OFOxmMetadata) {
- jsonGenerator.writeNumberField(MatchUtils.STR_METADATA, ((OFOxmMetadata) ((OFActionSetField) a).getField()).getValue().getValue().getValue());
- } else {
- // need to get a logger in here somehow log.error("Could not decode Set-Field action field: {}", ((OFActionSetField) a));
- }
- } // end switch over action type
- } // end for over all actions
- } // end method
+ case OF_14:
+ // TODO
+ logger.error("OF1.4 OFPortDesc serializer not implemented");
+ }
+ if (OFVersion.OF_10 != entry.getVersion()) {
+ jGen.writeNumberField("currSpeed",entry.getCurrSpeed());
+ jGen.writeNumberField("maxSpeed",entry.getMaxSpeed());
+ }
+ jGen.writeEndObject();
+ }
+ jGen.writeEndArray();
+ }
}
diff --git a/src/main/java/net/floodlightcontroller/debugcounter/CounterNode.java b/src/main/java/net/floodlightcontroller/debugcounter/CounterNode.java
index 751e2c793c..1f3c87aaef 100644
--- a/src/main/java/net/floodlightcontroller/debugcounter/CounterNode.java
+++ b/src/main/java/net/floodlightcontroller/debugcounter/CounterNode.java
@@ -180,8 +180,8 @@ CounterNode remove(List hierarchyElements) {
if (cur != null) {
removed = cur.children.remove(keyToRemove);
}
- //TODO @Ryan this will remove the CounterNode from IDebugCounterService, but if any
- // other modules still have a refernence to the IDebugCounter within the CounterNode
+ // TODO This will remove the CounterNode from IDebugCounterService, but if any
+ // other modules still have a reference to the IDebugCounter within the CounterNode
// we just removed, they might mistakenly query the "dead" counter.
return removed;
@@ -243,7 +243,7 @@ DebugCounterImpl addCounter(@Nonnull DebugCounterImpl counter) {
} else {
CounterNode newNode = new CounterNode(path, counter);
parent.children.put(newCounterName, newNode);
- return null; //TODO @Ryan this SHOULD technically return null. Hopefully this wont break anything....
+ return null;
}
}
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/SwitchPort.java b/src/main/java/net/floodlightcontroller/devicemanager/SwitchPort.java
index 8648e89011..abede26af4 100644
--- a/src/main/java/net/floodlightcontroller/devicemanager/SwitchPort.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/SwitchPort.java
@@ -128,8 +128,8 @@ public boolean equals(Object obj) {
if (getClass() != obj.getClass()) return false;
SwitchPort other = (SwitchPort) obj;
if (errorStatus != other.errorStatus) return false;
- if (port != other.port) return false;
- if (switchDPID != other.switchDPID) return false;
+ if (!port.equals(other.port)) return false;
+ if (!switchDPID.equals(other.switchDPID)) return false;
return true;
}
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/internal/AttachmentPoint.java b/src/main/java/net/floodlightcontroller/devicemanager/internal/AttachmentPoint.java
index da7490f1ef..1845ffe8c4 100644
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/AttachmentPoint.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/AttachmentPoint.java
@@ -88,36 +88,36 @@ public void setLastSeen(Date lastSeen) {
this.lastSeen = lastSeen;
}
- /**
- * Hash is generated using only switch and port
- */
@Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + port.getPortNumber();
- result = prime * result + (int) (sw.getLong() ^ (sw.getLong() >>> 32));
- return result;
- }
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((port == null) ? 0 : port.hashCode());
+ result = prime * result + ((sw == null) ? 0 : sw.hashCode());
+ return result;
+ }
- /**
- * Compares only the switch and port
- */
@Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- AttachmentPoint other = (AttachmentPoint) obj;
- if (port.getPortNumber() != other.port.getPortNumber())
- return false;
- if (sw.getLong() != other.sw.getLong())
- return false;
- return true;
- }
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ AttachmentPoint other = (AttachmentPoint) obj;
+ if (port == null) {
+ if (other.port != null)
+ return false;
+ } else if (!port.equals(other.port))
+ return false;
+ if (sw == null) {
+ if (other.sw != null)
+ return false;
+ } else if (!sw.equals(other.sw))
+ return false;
+ return true;
+ }
@Override
public String toString() {
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/internal/Device.java b/src/main/java/net/floodlightcontroller/devicemanager/internal/Device.java
index 5b663e3246..d751e6fead 100755
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/Device.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/Device.java
@@ -676,10 +676,10 @@ public IPv4Address[] getIPv4Addresses() {
public VlanVid[] getSwitchPortVlanIds(SwitchPort swp) {
TreeSet vals = new TreeSet();
for (Entity e : entities) {
- if (e.switchDPID == swp.getSwitchDPID()
- && e.switchPort == swp.getPort()) {
+ if (e.switchDPID.equals(swp.getSwitchDPID())
+ && e.switchPort.equals(swp.getPort())) {
if (e.getVlan() == null)
- vals.add(VlanVid.ofVlan(-1)); //TODO @Ryan is this the correct way to represent an untagged vlan?
+ vals.add(VlanVid.ofVlan(-1)); //TODO Update all -1 VLANs (untagged) to the new VlanVid.ZERO
else
vals.add(e.getVlan());
}
@@ -733,23 +733,33 @@ protected int entityIndex(Entity entity) {
// ******
@Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + Arrays.hashCode(entities);
- return result;
- }
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result
+ + ((deviceKey == null) ? 0 : deviceKey.hashCode());
+ result = prime * result + Arrays.hashCode(entities);
+ return result;
+ }
@Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null) return false;
- if (getClass() != obj.getClass()) return false;
- Device other = (Device) obj;
- if (!deviceKey.equals(other.deviceKey)) return false;
- if (!Arrays.equals(entities, other.entities)) return false;
- return true;
- }
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ Device other = (Device) obj;
+ if (deviceKey == null) {
+ if (other.deviceKey != null)
+ return false;
+ } else if (!deviceKey.equals(other.deviceKey))
+ return false;
+ if (!Arrays.equals(entities, other.entities))
+ return false;
+ return true;
+ }
@Override
public String toString() {
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceIterator.java b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceIterator.java
index 7d4d0c35a9..4c7c4a4b15 100644
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceIterator.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceIterator.java
@@ -96,18 +96,9 @@ protected boolean matches(Device value) {
if (!searchableVlanList.contains(vlan)) {
return false;
}
- /*TODO @Ryan Does the above replace the below?
- * Maybe should change the return of Device to be List/ArrayList instead
- if (Arrays.binarySearch(vlans.vlans, vlan) < 0)
- return false;
- */
}
if (ipv4Address != null) {
IPv4Address[] ipv4Addresses = value.getIPv4Addresses();
- /*TODO @Ryan same here...
- if (Arrays.binarySearch(ipv4Addresses, ipv4Address) < 0)
- return false;
- */
List searchableIPv4AddrList = Arrays.asList(ipv4Addresses);
if (!searchableIPv4AddrList.contains(ipv4Address)) {
return false;
@@ -120,11 +111,11 @@ protected boolean matches(Device value) {
match = false;
for (SwitchPort sp : sps) {
if (switchDPID != null) {
- if (switchDPID.getLong() != sp.getSwitchDPID().getLong())
+ if (!switchDPID.equals(sp.getSwitchDPID()))
return false;
}
if (switchPort != null) {
- if (switchPort.getPortNumber() != sp.getPort().getPortNumber())
+ if (!switchPort.equals(sp.getPort()))
return false;
}
match = true;
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
index 63aad5e3eb..7f9c023042 100755
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
@@ -30,7 +30,6 @@
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import java.util.ListIterator;
import java.util.Map;
import java.util.Queue;
import java.util.Set;
@@ -71,10 +70,6 @@
import net.floodlightcontroller.devicemanager.SwitchPort;
import net.floodlightcontroller.devicemanager.internal.DeviceSyncRepresentation.SyncEntity;
import net.floodlightcontroller.devicemanager.web.DeviceRoutable;
-import net.floodlightcontroller.flowcache.IFlowReconcileEngineService;
-import net.floodlightcontroller.flowcache.IFlowReconcileListener;
-import net.floodlightcontroller.flowcache.IFlowReconcileService;
-import net.floodlightcontroller.flowcache.OFMatchReconcile;
import net.floodlightcontroller.linkdiscovery.ILinkDiscovery.LDUpdate;
import net.floodlightcontroller.packet.ARP;
import net.floodlightcontroller.packet.DHCP;
@@ -89,7 +84,6 @@
import net.floodlightcontroller.topology.ITopologyListener;
import net.floodlightcontroller.topology.ITopologyService;
import net.floodlightcontroller.util.MultiIterator;
-import net.floodlightcontroller.util.OFMatchWithSwDpid;
import static net.floodlightcontroller.devicemanager.internal.
DeviceManagerImpl.DeviceUpdate.Change.*;
@@ -100,7 +94,6 @@
import org.projectfloodlight.openflow.types.IPv4Address;
import org.projectfloodlight.openflow.types.MacAddress;
import org.projectfloodlight.openflow.types.OFPort;
-import org.projectfloodlight.openflow.types.OFVlanVidMatch;
import org.projectfloodlight.openflow.types.VlanVid;
import org.projectfloodlight.openflow.protocol.OFType;
import org.projectfloodlight.openflow.protocol.match.MatchField;
@@ -120,15 +113,13 @@
* within the network.
* @author readams
*/
-public class DeviceManagerImpl implements IDeviceService, IOFMessageListener, ITopologyListener, IFloodlightModule, IEntityClassListener, IFlowReconcileListener, IInfoProvider {
+public class DeviceManagerImpl implements IDeviceService, IOFMessageListener, ITopologyListener, IFloodlightModule, IEntityClassListener, IInfoProvider {
protected static Logger logger = LoggerFactory.getLogger(DeviceManagerImpl.class);
protected IFloodlightProviderService floodlightProvider;
protected ITopologyService topology;
protected IStorageSourceService storageSource;
protected IRestApiService restApi;
protected IThreadPoolService threadPool;
- protected IFlowReconcileService flowReconcileMgr;
- protected IFlowReconcileEngineService flowReconcileEngine;
protected IDebugCounterService debugCounters;
private ISyncService syncService;
private IStoreClient storeClient;
@@ -774,70 +765,6 @@ public Command receive(IOFSwitch sw, OFMessage msg,
return Command.CONTINUE;
}
- // ***************
- // IFlowReconcileListener
- // ***************
- @Override
- public Command reconcileFlows(ArrayList ofmRcList) {
- ListIterator iter = ofmRcList.listIterator();
- while (iter.hasNext()) {
- OFMatchReconcile ofm = iter.next();
-
- // Remove the STOPPed flow.
- if (Command.STOP == reconcileFlow(ofm)) {
- iter.remove();
- }
- }
-
- if (ofmRcList.size() > 0) {
- return Command.CONTINUE;
- } else {
- return Command.STOP;
- }
- }
-
- protected Command reconcileFlow(OFMatchReconcile ofm) {
- cntReconcileRequest.increment();
- // Extract source entity information
- Entity srcEntity =
- getEntityFromFlowMod(ofm.ofmWithSwDpid, true);
- if (srcEntity == null) {
- cntReconcileNoSource.increment();
- return Command.STOP;
- }
-
- // Find the device by source entity
- Device srcDevice = findDeviceByEntity(srcEntity);
- if (srcDevice == null) {
- cntReconcileNoSource.increment();
- return Command.STOP;
- }
- // Store the source device in the context
- fcStore.put(ofm.cntx, CONTEXT_SRC_DEVICE, srcDevice);
-
- // Find the device matching the destination from the entity
- // classes of the source.
- Entity dstEntity = getEntityFromFlowMod(ofm.ofmWithSwDpid, false);
- Device dstDevice = null;
- if (dstEntity != null) {
- dstDevice = findDestByEntity(srcDevice.getEntityClass(), dstEntity);
- if (dstDevice != null)
- fcStore.put(ofm.cntx, CONTEXT_DST_DEVICE, dstDevice);
- else
- cntReconcileNoDest.increment();
- } else {
- cntReconcileNoDest.increment();
- }
- if (logger.isTraceEnabled()) {
- logger.trace("Reconciling flow: match={}, srcEntity={}, srcDev={}, "
- + "dstEntity={}, dstDev={}",
- new Object[] {ofm.ofmWithSwDpid.getMatch(),
- srcEntity, srcDevice,
- dstEntity, dstDevice } );
- }
- return Command.CONTINUE;
- }
-
// *****************
// IFloodlightModule
// *****************
@@ -871,7 +798,6 @@ public Collection> getModuleDependencies() {
l.add(ITopologyService.class);
l.add(IRestApiService.class);
l.add(IThreadPoolService.class);
- l.add(IFlowReconcileService.class);
l.add(IEntityClassifierService.class);
l.add(ISyncService.class);
return l;
@@ -895,8 +821,6 @@ public void init(FloodlightModuleContext fmc) throws FloodlightModuleException {
fmc.getServiceImpl(ITopologyService.class);
this.restApi = fmc.getServiceImpl(IRestApiService.class);
this.threadPool = fmc.getServiceImpl(IThreadPoolService.class);
- this.flowReconcileMgr = fmc.getServiceImpl(IFlowReconcileService.class);
- this.flowReconcileEngine = fmc.getServiceImpl(IFlowReconcileEngineService.class);
this.entityClassifier = fmc.getServiceImpl(IEntityClassifierService.class);
this.debugCounters = fmc.getServiceImpl(IDebugCounterService.class);
this.debugEventService = fmc.getServiceImpl(IDebugEventService.class);
@@ -938,7 +862,6 @@ public void startUp(FloodlightModuleContext fmc)
floodlightProvider.addHAListener(this.haListenerDelegate);
if (topology != null)
topology.addListener(this);
- flowReconcileMgr.addFlowReconcileListener(this);
entityClassifier.addListener(this);
ScheduledExecutorService ses = threadPool.getScheduledExecutor();
@@ -1139,8 +1062,6 @@ public boolean isCallbackOrderingPostreq(HAListenerTypeMarker type,
@Override
public void transitionToStandby() {
DeviceManagerImpl.this.isMaster = false;
- //TODO @Ryan is there a goToStandby()?
- //DeviceManagerImpl.this.deviceSyncManager.goToSlave();
}
}
@@ -1151,9 +1072,9 @@ public void transitionToStandby() {
protected Command processPacketInMessage(IOFSwitch sw, OFPacketIn pi, FloodlightContext cntx) {
Ethernet eth = IFloodlightProviderService.bcStore.get(cntx,IFloodlightProviderService.CONTEXT_PI_PAYLOAD);
-
+ OFPort inPort = (pi.getVersion().compareTo(OFVersion.OF_12) < 0 ? pi.getInPort() : pi.getMatch().get(MatchField.IN_PORT));
// Extract source entity information
- Entity srcEntity = getSourceEntityFromPacket(eth, sw.getId(), (pi.getVersion().compareTo(OFVersion.OF_13) < 0 ? pi.getInPort() : pi.getMatch().get(MatchField.IN_PORT)));
+ Entity srcEntity = getSourceEntityFromPacket(eth, sw.getId(), inPort);
if (srcEntity == null) {
cntInvalidSource.increment();
return Command.STOP;
@@ -1165,7 +1086,7 @@ protected Command processPacketInMessage(IOFSwitch sw, OFPacketIn pi, Floodlight
// the IP to MAC mapping of the VRRP IP address. The source
// entity will not have that information. Hence, a separate call
// to learn devices in such cases.
- learnDeviceFromArpResponseData(eth, sw.getId(), (pi.getVersion().compareTo(OFVersion.OF_13) < 0 ? pi.getInPort() : pi.getMatch().get(MatchField.IN_PORT)));
+ learnDeviceFromArpResponseData(eth, sw.getId(), inPort);
// Learn/lookup device information
Device srcDevice = learnDeviceByEntity(srcEntity);
@@ -1198,7 +1119,7 @@ protected Command processPacketInMessage(IOFSwitch sw, OFPacketIn pi, Floodlight
if (logger.isTraceEnabled()) {
logger.trace("Received PI: {} on switch {}, port {} *** eth={}" +
" *** srcDev={} *** dstDev={} *** ",
- new Object[] { pi, sw.getId().toString(), (pi.getVersion().compareTo(OFVersion.OF_13) < 0 ? pi.getInPort() : pi.getMatch().get(MatchField.IN_PORT)), eth,
+ new Object[] { pi, sw.getId().toString(), inPort, eth,
srcDevice, dstDevice });
}
@@ -1364,58 +1285,6 @@ protected Entity getDestEntityFromPacket(Ethernet eth) {
null);
}
- /**
- * Parse an entity from an OFMatchWithSwDpid.
- * @param ofmWithSwDpid
- * @return the entity from the packet
- */
- private Entity getEntityFromFlowMod(OFMatchWithSwDpid ofmWithSwDpid,
- boolean isSource) {
- MacAddress dlAddr = ofmWithSwDpid.getMatch().get(MatchField.ETH_SRC);
- IPv4Address nwSrc = ofmWithSwDpid.getMatch().get(MatchField.IPV4_SRC);
- if (!isSource) {
- dlAddr = ofmWithSwDpid.getMatch().get(MatchField.ETH_DST);
- nwSrc = ofmWithSwDpid.getMatch().get(MatchField.IPV4_DST);
- }
-
- // Ignore broadcast/multicast source
- if (dlAddr.isBroadcast() || dlAddr.isMulticast())
- return null;
-
- DatapathId swDpid = DatapathId.NONE;
- OFPort inPort = OFPort.ZERO;
-
- if (isSource) {
- swDpid = ofmWithSwDpid.getDpid();
- inPort = ofmWithSwDpid.getMatch().get(MatchField.IN_PORT);
- }
-
- /**for the new flow cache design, the flow mods retrived are not always
- * from the source, learn AP should be disabled --meiyang*/
- boolean learnap = false;
- /**
- * if (swDpid == null ||
- inPort == null ||
- !isValidAttachmentPoint(swDpid, inPort)) {
- // If this is an internal port or we otherwise don't want
- // to learn on these ports. In the future, we should
- // handle this case by labeling flows with something that
- // will give us the entity class. For now, we'll do our
- // best assuming attachment point information isn't used
- // as a key field.
- learnap = false;
- }
- */
-
- OFVlanVidMatch vlan = ofmWithSwDpid.getMatch().get(MatchField.VLAN_VID);
- return new Entity(dlAddr,
- ((vlan.getVlan() >= 0) ? vlan.getVlanVid() : null),
- ((nwSrc.getInt() != 0) ? nwSrc : null),
- (learnap ? swDpid : null),
- (learnap ? inPort : null),
- new Date());
- }
-
/**
* Look up a {@link Device} based on the provided {@link Entity}. We first
* check the primary index. If we do not find an entry there we classify
@@ -2482,10 +2351,10 @@ private void consolidateStore() {
for(SyncEntity se: storedDevice.getEntities()) {
try {
// Do we have a device for this entity??
- IDevice d = findDevice(se.macAddress, se.vlan,
- se.ipv4Address,
- se.switchDPID,
- se.switchPort);
+ IDevice d = findDevice(MacAddress.of(se.macAddress), VlanVid.ofVlan(se.vlan),
+ IPv4Address.of(se.ipv4Address),
+ DatapathId.of(se.switchDPID),
+ OFPort.of(se.switchPort));
if (d != null) {
found = true;
break;
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceSyncRepresentation.java b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceSyncRepresentation.java
index b1c395d4c9..82fb832e5d 100644
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceSyncRepresentation.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceSyncRepresentation.java
@@ -21,15 +21,15 @@
public class DeviceSyncRepresentation {
public static class SyncEntity implements Comparable {
@JsonProperty
- public MacAddress macAddress;
+ public long macAddress;
@JsonProperty
- public IPv4Address ipv4Address;
+ public int ipv4Address;
@JsonProperty
- public VlanVid vlan;
+ public short vlan;
@JsonProperty
- public DatapathId switchDPID;
+ public long switchDPID;
@JsonProperty
- public OFPort switchPort;
+ public int switchPort;
@JsonProperty
public Date lastSeenTimestamp;
@JsonProperty
@@ -40,11 +40,11 @@ public SyncEntity() {
}
public SyncEntity(Entity e) {
- this.macAddress = e.getMacAddress();
- this.ipv4Address = e.getIpv4Address();
- this.vlan = e.getVlan();
- this.switchDPID = e.getSwitchDPID();
- this.switchPort = e.getSwitchPort();
+ this.macAddress = (e.getMacAddress() != null ? e.getMacAddress().getLong() : 0);
+ this.ipv4Address = (e.getIpv4Address() != null ? e.getIpv4Address().getInt() : 0);
+ this.vlan = (e.getVlan() != null ? e.getVlan().getVlan() : -1);
+ this.switchDPID = (e.getSwitchDPID() != null ? e.getSwitchDPID().getLong() : 0);
+ this.switchPort = (e.getSwitchPort() != null ? e.getSwitchPort().getPortNumber() : 0);
if (e.getLastSeenTimestamp() == null)
this.lastSeenTimestamp = null;
else
@@ -56,8 +56,12 @@ public SyncEntity(Entity e) {
}
public Entity asEntity() {
- Entity e = new Entity(macAddress, vlan, ipv4Address, switchDPID,
- switchPort, lastSeenTimestamp);
+ Entity e = new Entity(macAddress == 0 ? null : MacAddress.of(macAddress),
+ vlan == -1 ? null : VlanVid.ofVlan(vlan),
+ ipv4Address == 0 ? null : IPv4Address.of(ipv4Address),
+ switchDPID == 0 ? null : DatapathId.of(switchDPID),
+ switchPort == 0 ? null : OFPort.of(switchPort),
+ lastSeenTimestamp);
e.setActiveSince(activeSince);
return e;
}
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/internal/Entity.java b/src/main/java/net/floodlightcontroller/devicemanager/internal/Entity.java
index 6598ee0c74..79c0199fea 100644
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/Entity.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/Entity.java
@@ -98,8 +98,6 @@ public class Entity implements Comparable {
*/
protected Date activeSince;
- private int hashCode = 0;
-
// ************
// Constructors
// ************
@@ -157,7 +155,7 @@ public OFPort getSwitchPort() {
@JsonIgnore
public boolean hasSwitchPort() {
- return (switchDPID != null && switchPort != null);
+ return (switchDPID != null && !switchDPID.equals(DatapathId.NONE) && switchPort != null && !switchPort.equals(OFPort.ZERO));
}
public Date getLastSeenTimestamp() {
@@ -185,43 +183,57 @@ public void setActiveSince(Date activeSince) {
}
@Override
- public int hashCode() {
- if (hashCode != 0) return hashCode;
- final int prime = 31;
- hashCode = 1;
- hashCode = prime * hashCode
- + ((ipv4Address == null) ? 0 : ipv4Address.hashCode());
- hashCode = prime * hashCode + (int) (macAddress.getLong() ^ (macAddress.getLong() >>> 32));
- hashCode = prime * hashCode
- + ((switchDPID == null) ? 0 : switchDPID.hashCode());
- hashCode = prime * hashCode
- + ((switchPort == null) ? 0 : switchPort.hashCode());
- hashCode = prime * hashCode + ((vlan == null) ? 0 : vlan.hashCode());
- return hashCode;
- }
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result
+ + ((ipv4Address == null) ? 0 : ipv4Address.hashCode());
+ result = prime * result
+ + ((macAddress == null) ? 0 : macAddress.hashCode());
+ result = prime * result
+ + ((switchDPID == null) ? 0 : switchDPID.hashCode());
+ result = prime * result
+ + ((switchPort == null) ? 0 : switchPort.hashCode());
+ result = prime * result + ((vlan == null) ? 0 : vlan.hashCode());
+ return result;
+ }
@Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null) return false;
- if (getClass() != obj.getClass()) return false;
- Entity other = (Entity) obj;
- if (hashCode() != other.hashCode()) return false;
- if (ipv4Address == null) {
- if (other.ipv4Address != null) return false;
- } else if (!ipv4Address.equals(other.ipv4Address)) return false;
- if (!macAddress.equals(other.macAddress)) return false;
- if (switchDPID == null) {
- if (other.switchDPID != null) return false;
- } else if (!switchDPID.equals(other.switchDPID)) return false;
- if (switchPort == null) {
- if (other.switchPort != null) return false;
- } else if (!switchPort.equals(other.switchPort)) return false;
- if (vlan == null) {
- if (other.vlan != null) return false;
- } else if (!vlan.equals(other.vlan)) return false;
- return true;
- }
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ Entity other = (Entity) obj;
+ if (ipv4Address == null) {
+ if (other.ipv4Address != null)
+ return false;
+ } else if (!ipv4Address.equals(other.ipv4Address))
+ return false;
+ if (macAddress == null) {
+ if (other.macAddress != null)
+ return false;
+ } else if (!macAddress.equals(other.macAddress))
+ return false;
+ if (switchDPID == null) {
+ if (other.switchDPID != null)
+ return false;
+ } else if (!switchDPID.equals(other.switchDPID))
+ return false;
+ if (switchPort == null) {
+ if (other.switchPort != null)
+ return false;
+ } else if (!switchPort.equals(other.switchPort))
+ return false;
+ if (vlan == null) {
+ if (other.vlan != null)
+ return false;
+ } else if (!vlan.equals(other.vlan))
+ return false;
+ return true;
+ }
diff --git a/src/main/java/net/floodlightcontroller/firewall/AllowDropPair.java b/src/main/java/net/floodlightcontroller/firewall/AllowDropPair.java
index 719e067b96..e769fadfb8 100644
--- a/src/main/java/net/floodlightcontroller/firewall/AllowDropPair.java
+++ b/src/main/java/net/floodlightcontroller/firewall/AllowDropPair.java
@@ -17,6 +17,7 @@
package net.floodlightcontroller.firewall;
+import org.projectfloodlight.openflow.protocol.OFFactory;
import org.projectfloodlight.openflow.protocol.match.Match;
@@ -25,4 +26,12 @@ public class AllowDropPair {
//public int drop = OFMatch.OFPFW_ALL;
public Match.Builder allow;
public Match.Builder drop;
+
+ @SuppressWarnings("unused")
+ private AllowDropPair() {};
+
+ public AllowDropPair(OFFactory factory) {
+ allow = factory.buildMatch();
+ drop = factory.buildMatch();
+ }
}
diff --git a/src/main/java/net/floodlightcontroller/firewall/Firewall.java b/src/main/java/net/floodlightcontroller/firewall/Firewall.java
index e95a7d4e47..3a78c9d1eb 100644
--- a/src/main/java/net/floodlightcontroller/firewall/Firewall.java
+++ b/src/main/java/net/floodlightcontroller/firewall/Firewall.java
@@ -27,8 +27,12 @@
import org.projectfloodlight.openflow.protocol.OFMessage;
import org.projectfloodlight.openflow.protocol.OFPacketIn;
import org.projectfloodlight.openflow.protocol.OFType;
+import org.projectfloodlight.openflow.protocol.OFVersion;
+import org.projectfloodlight.openflow.protocol.match.Match;
+import org.projectfloodlight.openflow.protocol.match.MatchField;
import org.projectfloodlight.openflow.types.DatapathId;
import org.projectfloodlight.openflow.types.EthType;
+import org.projectfloodlight.openflow.types.IPv4Address;
import org.projectfloodlight.openflow.types.IPv4AddressWithMask;
import org.projectfloodlight.openflow.types.IpProtocol;
import org.projectfloodlight.openflow.types.MacAddress;
@@ -49,12 +53,15 @@
import net.floodlightcontroller.packet.Ethernet;
import net.floodlightcontroller.packet.IPv4;
+import net.floodlightcontroller.packet.TCP;
+import net.floodlightcontroller.packet.UDP;
import net.floodlightcontroller.restserver.IRestApiService;
import net.floodlightcontroller.routing.IRoutingDecision;
import net.floodlightcontroller.routing.RoutingDecision;
import net.floodlightcontroller.storage.IResultSet;
import net.floodlightcontroller.storage.IStorageSourceService;
import net.floodlightcontroller.storage.StorageException;
+import net.floodlightcontroller.util.MatchUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -65,6 +72,7 @@
*
* @author Amer Tahir
* @edited KC Wang
+ * @edited Ryan Izard
*/
public class Firewall implements IFirewallService, IOFMessageListener,
IFloodlightModule {
@@ -77,7 +85,7 @@ public class Firewall implements IFirewallService, IOFMessageListener,
protected List rules; // protected by synchronized
protected boolean enabled;
- protected int subnet_mask = IPv4.toIPv4Address("255.255.255.0");
+ protected IPv4Address subnet_mask = IPv4Address.of("255.255.255.0");
// constant strings for storage/parsing
public static final String TABLE_NAME = "controller_firewallrules";
@@ -204,13 +212,13 @@ protected ArrayList readRulesFromStorage() {
} else if (key.equals(COLUMN_DL_TYPE)) {
r.dl_type = EthType.of(Integer.parseInt((String) row.get(COLUMN_DL_TYPE)));
} else if (key.equals(COLUMN_NW_SRC_PREFIX)) {
- r.nw_src_prefix_and_mask = IPv4AddressWithMask.of(Integer.parseInt((String) row.get(COLUMN_NW_SRC_PREFIX)), r.nw_src_prefix_and_mask.getMask().getInt());
+ r.nw_src_prefix_and_mask = IPv4AddressWithMask.of(IPv4Address.of(Integer.parseInt((String) row.get(COLUMN_NW_SRC_PREFIX))), r.nw_src_prefix_and_mask.getMask());
} else if (key.equals(COLUMN_NW_SRC_MASKBITS)) {
- r.nw_src_prefix_and_mask = IPv4AddressWithMask.of(r.nw_src_prefix_and_mask.getValue().getInt(), Integer.parseInt((String) row.get(COLUMN_NW_SRC_MASKBITS)));
+ r.nw_src_prefix_and_mask = IPv4AddressWithMask.of(r.nw_src_prefix_and_mask.getValue(), IPv4Address.of(Integer.parseInt((String) row.get(COLUMN_NW_SRC_MASKBITS))));
} else if (key.equals(COLUMN_NW_DST_PREFIX)) {
- r.nw_dst_prefix_and_mask = IPv4AddressWithMask.of(Integer.parseInt((String) row.get(COLUMN_NW_DST_PREFIX)), r.nw_dst_prefix_and_mask.getMask().getInt());
+ r.nw_dst_prefix_and_mask = IPv4AddressWithMask.of(IPv4Address.of(Integer.parseInt((String) row.get(COLUMN_NW_DST_PREFIX))), r.nw_dst_prefix_and_mask.getMask());
} else if (key.equals(COLUMN_NW_DST_MASKBITS)) {
- r.nw_dst_prefix_and_mask = IPv4AddressWithMask.of(r.nw_dst_prefix_and_mask.getValue().getInt(), Integer.parseInt((String) row.get(COLUMN_NW_DST_MASKBITS)));
+ r.nw_dst_prefix_and_mask = IPv4AddressWithMask.of(r.nw_dst_prefix_and_mask.getValue(), IPv4Address.of(Integer.parseInt((String) row.get(COLUMN_NW_DST_MASKBITS))));
} else if (key.equals(COLUMN_NW_PROTO)) {
r.nw_proto = IpProtocol.of(Short.parseShort((String) row.get(COLUMN_NW_PROTO)));
} else if (key.equals(COLUMN_TP_SRC)) {
@@ -346,14 +354,14 @@ public List> getStorageRules() {
@Override
public String getSubnetMask() {
- return IPv4.fromIPv4Address(this.subnet_mask);
+ return this.subnet_mask.toString();
}
@Override
public void setSubnetMask(String newMask) {
if (newMask.trim().isEmpty())
return;
- this.subnet_mask = IPv4.toIPv4Address(newMask.trim());
+ this.subnet_mask = IPv4Address.of(newMask.trim());
}
@Override
@@ -455,7 +463,7 @@ public synchronized void deleteRule(int ruleid) {
protected RuleMatchPair matchWithRule(IOFSwitch sw, OFPacketIn pi, FloodlightContext cntx) {
FirewallRule matched_rule = null;
Ethernet eth = IFloodlightProviderService.bcStore.get(cntx, IFloodlightProviderService.CONTEXT_PI_PAYLOAD);
- AllowDropPair adp = new AllowDropPair();
+ AllowDropPair adp = new AllowDropPair(sw.getOFFactory());
synchronized (rules) {
Iterator iter = this.rules.iterator();
@@ -467,8 +475,7 @@ protected RuleMatchPair matchWithRule(IOFSwitch sw, OFPacketIn pi, FloodlightCon
// check if rule matches
// AllowDropPair adp's allow and drop matches will modified with what matches
- // TODO @Ryan might need to re-init adp each time (look into later)
- if (rule.matchesThisPacket(sw.getId(), pi.getInPort(), eth, adp) == true) {
+ if (rule.matchesThisPacket(sw.getId(), (pi.getVersion().compareTo(OFVersion.OF_12) < 0 ? pi.getInPort() : pi.getMatch().get(MatchField.IN_PORT)), eth, adp) == true) {
matched_rule = rule;
break;
}
@@ -478,7 +485,38 @@ protected RuleMatchPair matchWithRule(IOFSwitch sw, OFPacketIn pi, FloodlightCon
// make a pair of rule and wildcards, then return it
RuleMatchPair rmp = new RuleMatchPair();
rmp.rule = matched_rule;
- if (matched_rule == null || matched_rule.action == FirewallRule.FirewallAction.DROP) {
+ if (matched_rule == null) {
+ /*
+ * No rule was found, so drop the packet with as specific
+ * of a drop rule as possible as not to interfere with other
+ * firewall rules.
+ */
+ Match.Builder mb = MatchUtils.createRetentiveBuilder(pi.getMatch()); // capture the ingress port
+ mb.setExact(MatchField.ETH_SRC, eth.getSourceMACAddress())
+ .setExact(MatchField.ETH_DST, eth.getDestinationMACAddress())
+ .setExact(MatchField.ETH_TYPE, EthType.of(eth.getEtherType()));
+
+ if (mb.get(MatchField.ETH_TYPE).equals(EthType.IPv4)) {
+ IPv4 ipv4 = (IPv4) eth.getPayload();
+ mb.setExact(MatchField.IPV4_SRC, ipv4.getSourceAddress())
+ .setExact(MatchField.IPV4_DST, ipv4.getDestinationAddress())
+ .setExact(MatchField.IP_PROTO, ipv4.getProtocol());
+
+ if (mb.get(MatchField.IP_PROTO).equals(IpProtocol.TCP)) {
+ TCP tcp = (TCP) ipv4.getPayload();
+ mb.setExact(MatchField.TCP_SRC, tcp.getSourcePort())
+ .setExact(MatchField.TCP_DST, tcp.getDestinationPort());
+ } else if (mb.get(MatchField.IP_PROTO).equals(IpProtocol.UDP)) {
+ UDP udp = (UDP) ipv4.getPayload();
+ mb.setExact(MatchField.UDP_SRC, udp.getSourcePort())
+ .setExact(MatchField.UDP_DST, udp.getDestinationPort());
+ } else {
+ // could be ICMP, which will be taken care of via IPv4 src/dst + ip proto
+ }
+ }
+ rmp.match = mb.build();
+ //rmp.match = adp.drop.build(); This inserted a "drop all" rule if no match was found (not what we want to do...)
+ } else if (matched_rule.action == FirewallRule.FirewallAction.DROP) {
rmp.match = adp.drop.build();
} else {
rmp.match = adp.allow.build();
@@ -494,22 +532,23 @@ protected RuleMatchPair matchWithRule(IOFSwitch sw, OFPacketIn pi, FloodlightCon
* the IP address to check
* @return true if it is a broadcast address, false otherwise
*/
- protected boolean IPIsBroadcast(int IPAddress) {
+ protected boolean isIPBroadcast(IPv4Address ip) {
// inverted subnet mask
- int inv_subnet_mask = ~this.subnet_mask;
- return ((IPAddress & inv_subnet_mask) == inv_subnet_mask);
+ IPv4Address inv_subnet_mask = subnet_mask.not();
+ return ip.and(inv_subnet_mask).equals(inv_subnet_mask);
}
public Command processPacketInMessage(IOFSwitch sw, OFPacketIn pi, IRoutingDecision decision, FloodlightContext cntx) {
Ethernet eth = IFloodlightProviderService.bcStore.get(cntx, IFloodlightProviderService.CONTEXT_PI_PAYLOAD);
-
+ OFPort inPort = (pi.getVersion().compareTo(OFVersion.OF_12) < 0 ? pi.getInPort() : pi.getMatch().get(MatchField.IN_PORT));
+
// Allowing L2 broadcast + ARP broadcast request (also deny malformed
// broadcasts -> L2 broadcast + L3 unicast)
if (eth.isBroadcast() == true) {
boolean allowBroadcast = true;
- // the case to determine if we have L2 broadcast + L3 unicast
+ // the case to determine if we have L2 broadcast + L3 unicast (L3 broadcast default set to /24 or 255.255.255.0)
// don't allow this broadcast packet if such is the case (malformed packet)
- if ((eth.getPayload() instanceof IPv4) && (((IPv4) eth.getPayload()).getDestinationAddress().isBroadcast() == false)) {
+ if ((eth.getPayload() instanceof IPv4) && !isIPBroadcast(((IPv4) eth.getPayload()).getDestinationAddress())) {
allowBroadcast = false;
}
if (allowBroadcast == true) {
@@ -517,7 +556,7 @@ public Command processPacketInMessage(IOFSwitch sw, OFPacketIn pi, IRoutingDecis
logger.trace("Allowing broadcast traffic for PacketIn={}", pi);
}
- decision = new RoutingDecision(sw.getId(), pi.getInPort(),
+ decision = new RoutingDecision(sw.getId(), inPort,
IDeviceService.fcStore.get(cntx, IDeviceService.CONTEXT_SRC_DEVICE),
IRoutingDecision.RoutingAction.MULTICAST);
decision.addToContext(cntx);
@@ -526,7 +565,7 @@ public Command processPacketInMessage(IOFSwitch sw, OFPacketIn pi, IRoutingDecis
logger.trace("Blocking malformed broadcast traffic for PacketIn={}", pi);
}
- decision = new RoutingDecision(sw.getId(), pi.getInPort(),
+ decision = new RoutingDecision(sw.getId(), inPort,
IDeviceService.fcStore.get(cntx, IDeviceService.CONTEXT_SRC_DEVICE),
IRoutingDecision.RoutingAction.DROP);
decision.addToContext(cntx);
@@ -552,7 +591,7 @@ public Command processPacketInMessage(IOFSwitch sw, OFPacketIn pi, IRoutingDecis
// Drop the packet if we don't have a rule allowing or dropping it or if we explicitly drop it
if (rule == null || rule.action == FirewallRule.FirewallAction.DROP) {
- decision = new RoutingDecision(sw.getId(), pi.getInPort(),
+ decision = new RoutingDecision(sw.getId(), inPort,
IDeviceService.fcStore.get(cntx, IDeviceService.CONTEXT_SRC_DEVICE),
IRoutingDecision.RoutingAction.DROP);
decision.setMatch(rmp.match);
@@ -566,7 +605,7 @@ public Command processPacketInMessage(IOFSwitch sw, OFPacketIn pi, IRoutingDecis
}
// Found a rule and the rule is not a drop, so allow the packet
} else {
- decision = new RoutingDecision(sw.getId(), pi.getInPort(),
+ decision = new RoutingDecision(sw.getId(), inPort,
IDeviceService.fcStore.get(cntx, IDeviceService.CONTEXT_SRC_DEVICE),
IRoutingDecision.RoutingAction.FORWARD_OR_FLOOD);
decision.setMatch(rmp.match);
diff --git a/src/main/java/net/floodlightcontroller/firewall/FirewallResource.java b/src/main/java/net/floodlightcontroller/firewall/FirewallResource.java
index 03f9baef2c..773a450e12 100644
--- a/src/main/java/net/floodlightcontroller/firewall/FirewallResource.java
+++ b/src/main/java/net/floodlightcontroller/firewall/FirewallResource.java
@@ -69,7 +69,7 @@ public Object handleRequest() {
// REST API set local subnet mask -- this only makes sense for one subnet
// will remove later
if (op.equalsIgnoreCase("subnet-mask")) {
- return firewall.getSubnetMask();
+ return "{\"subnet-mask\":\"" + firewall.getSubnetMask() + "\"}";
}
// no known options found
diff --git a/src/main/java/net/floodlightcontroller/firewall/FirewallRule.java b/src/main/java/net/floodlightcontroller/firewall/FirewallRule.java
index b32d9c10ac..441c4305c3 100644
--- a/src/main/java/net/floodlightcontroller/firewall/FirewallRule.java
+++ b/src/main/java/net/floodlightcontroller/firewall/FirewallRule.java
@@ -22,7 +22,6 @@
import org.projectfloodlight.openflow.protocol.match.MatchField;
import org.projectfloodlight.openflow.types.DatapathId;
import org.projectfloodlight.openflow.types.EthType;
-import org.projectfloodlight.openflow.types.IPv4Address;
import org.projectfloodlight.openflow.types.IPv4AddressWithMask;
import org.projectfloodlight.openflow.types.IpProtocol;
import org.projectfloodlight.openflow.types.MacAddress;
@@ -37,7 +36,95 @@
@JsonSerialize(using=FirewallRuleSerializer.class)
public class FirewallRule implements Comparable {
- public int ruleid;
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ FirewallRule other = (FirewallRule) obj;
+ if (action != other.action)
+ return false;
+ if (any_dl_dst != other.any_dl_dst)
+ return false;
+ if (any_dl_src != other.any_dl_src)
+ return false;
+ if (any_dl_type != other.any_dl_type)
+ return false;
+ if (any_dpid != other.any_dpid)
+ return false;
+ if (any_in_port != other.any_in_port)
+ return false;
+ if (any_nw_dst != other.any_nw_dst)
+ return false;
+ if (any_nw_proto != other.any_nw_proto)
+ return false;
+ if (any_nw_src != other.any_nw_src)
+ return false;
+ if (any_tp_dst != other.any_tp_dst)
+ return false;
+ if (any_tp_src != other.any_tp_src)
+ return false;
+ if (dl_dst == null) {
+ if (other.dl_dst != null)
+ return false;
+ } else if (!dl_dst.equals(other.dl_dst))
+ return false;
+ if (dl_src == null) {
+ if (other.dl_src != null)
+ return false;
+ } else if (!dl_src.equals(other.dl_src))
+ return false;
+ if (dl_type == null) {
+ if (other.dl_type != null)
+ return false;
+ } else if (!dl_type.equals(other.dl_type))
+ return false;
+ if (dpid == null) {
+ if (other.dpid != null)
+ return false;
+ } else if (!dpid.equals(other.dpid))
+ return false;
+ if (in_port == null) {
+ if (other.in_port != null)
+ return false;
+ } else if (!in_port.equals(other.in_port))
+ return false;
+ if (nw_dst_prefix_and_mask == null) {
+ if (other.nw_dst_prefix_and_mask != null)
+ return false;
+ } else if (!nw_dst_prefix_and_mask.equals(other.nw_dst_prefix_and_mask))
+ return false;
+ if (nw_proto == null) {
+ if (other.nw_proto != null)
+ return false;
+ } else if (!nw_proto.equals(other.nw_proto))
+ return false;
+ if (nw_src_prefix_and_mask == null) {
+ if (other.nw_src_prefix_and_mask != null)
+ return false;
+ } else if (!nw_src_prefix_and_mask.equals(other.nw_src_prefix_and_mask))
+ return false;
+ if (priority != other.priority)
+ return false;
+ if (ruleid != other.ruleid)
+ return false;
+ if (tp_dst == null) {
+ if (other.tp_dst != null)
+ return false;
+ } else if (!tp_dst.equals(other.tp_dst))
+ return false;
+ if (tp_src == null) {
+ if (other.tp_src != null)
+ return false;
+ } else if (!tp_src.equals(other.tp_src))
+ return false;
+ return true;
+ }
+
+ public int ruleid;
public DatapathId dpid;
public OFPort in_port;
@@ -81,18 +168,16 @@ public enum FirewallAction {
* The default rule is to match on anything.
*/
public FirewallRule() {
- this.in_port = OFPort.ZERO;
+ this.dpid = DatapathId.NONE;
+ this.in_port = OFPort.ANY;
this.dl_src = MacAddress.NONE;
- this.nw_src_prefix_and_mask = IPv4AddressWithMask.NONE;
- //this.nw_src_maskbits = 0;
this.dl_dst = MacAddress.NONE;
+ this.dl_type = EthType.NONE;
+ this.nw_src_prefix_and_mask = IPv4AddressWithMask.NONE;
+ this.nw_dst_prefix_and_mask = IPv4AddressWithMask.NONE;
this.nw_proto = IpProtocol.NONE;
this.tp_src = TransportPort.NONE;
this.tp_dst = TransportPort.NONE;
- this.dl_dst = MacAddress.NONE;
- this.nw_dst_prefix_and_mask = IPv4AddressWithMask.NONE;
- //this.nw_dst_maskbits = 0;
- this.dpid = DatapathId.NONE;
this.any_dpid = true;
this.any_in_port = true;
this.any_dl_src = true;
@@ -208,10 +293,14 @@ public boolean matchesThisPacket(DatapathId switchDpid, OFPort inPort, Ethernet
return false;
if (action == FirewallRule.FirewallAction.DROP) {
//wildcards.drop &= ~OFMatch.OFPFW_IN_PORT;
- adp.drop.setExact(MatchField.IN_PORT, this.in_port);
+ if (!OFPort.ANY.equals(this.in_port)) {
+ adp.drop.setExact(MatchField.IN_PORT, this.in_port);
+ }
} else {
//wildcards.allow &= ~OFMatch.OFPFW_IN_PORT;
- adp.allow.setExact(MatchField.IN_PORT, this.in_port);
+ if (!OFPort.ANY.equals(this.in_port)) {
+ adp.allow.setExact(MatchField.IN_PORT, this.in_port);
+ }
}
// mac address (src and dst) match?
@@ -219,20 +308,28 @@ public boolean matchesThisPacket(DatapathId switchDpid, OFPort inPort, Ethernet
return false;
if (action == FirewallRule.FirewallAction.DROP) {
//wildcards.drop &= ~OFMatch.OFPFW_DL_SRC;
- adp.drop.setExact(MatchField.ETH_SRC, this.dl_src);
+ if (!MacAddress.NONE.equals(this.dl_src)) {
+ adp.drop.setExact(MatchField.ETH_SRC, this.dl_src);
+ }
} else {
//wildcards.allow &= ~OFMatch.OFPFW_DL_SRC;
- adp.allow.setExact(MatchField.ETH_SRC, this.dl_src);
+ if (!MacAddress.NONE.equals(this.dl_src)) {
+ adp.allow.setExact(MatchField.ETH_SRC, this.dl_src);
+ }
}
if (any_dl_dst == false && !dl_dst.equals(packet.getDestinationMACAddress()))
return false;
if (action == FirewallRule.FirewallAction.DROP) {
//wildcards.drop &= ~OFMatch.OFPFW_DL_DST;
- adp.drop.setExact(MatchField.ETH_DST, this.dl_dst);
+ if (!MacAddress.NONE.equals(this.dl_dst)) {
+ adp.drop.setExact(MatchField.ETH_DST, this.dl_dst);
+ }
} else {
//wildcards.allow &= ~OFMatch.OFPFW_DL_DST;
- adp.allow.setExact(MatchField.ETH_DST, this.dl_dst);
+ if (!MacAddress.NONE.equals(this.dl_dst)) {
+ adp.allow.setExact(MatchField.ETH_DST, this.dl_dst);
+ }
}
// dl_type check: ARP, IP
@@ -246,10 +343,14 @@ public boolean matchesThisPacket(DatapathId switchDpid, OFPort inPort, Ethernet
else {
if (action == FirewallRule.FirewallAction.DROP) {
//wildcards.drop &= ~OFMatch.OFPFW_DL_TYPE;
- adp.drop.setExact(MatchField.ETH_TYPE, this.dl_type);
+ if (!EthType.NONE.equals(this.dl_type)) {
+ adp.drop.setExact(MatchField.ETH_TYPE, this.dl_type);
+ }
} else {
//wildcards.allow &= ~OFMatch.OFPFW_DL_TYPE;
- adp.allow.setExact(MatchField.ETH_TYPE, this.dl_type);
+ if (!EthType.NONE.equals(this.dl_type)) {
+ adp.allow.setExact(MatchField.ETH_TYPE, this.dl_type);
+ }
}
}
} else if (dl_type.equals(EthType.IPv4)) {
@@ -258,37 +359,49 @@ public boolean matchesThisPacket(DatapathId switchDpid, OFPort inPort, Ethernet
else {
if (action == FirewallRule.FirewallAction.DROP) {
//wildcards.drop &= ~OFMatch.OFPFW_NW_PROTO;
- adp.drop.setExact(MatchField.IP_PROTO, this.nw_proto);
+ if (!IpProtocol.NONE.equals(this.nw_proto)) {
+ adp.drop.setExact(MatchField.IP_PROTO, this.nw_proto);
+ }
} else {
//wildcards.allow &= ~OFMatch.OFPFW_NW_PROTO;
- adp.allow.setExact(MatchField.IP_PROTO, this.nw_proto);
+ if (!IpProtocol.NONE.equals(this.nw_proto)) {
+ adp.allow.setExact(MatchField.IP_PROTO, this.nw_proto);
+ }
}
// IP packets, proceed with ip address check
pkt_ip = (IPv4) pkt;
// IP addresses (src and dst) match?
- if (any_nw_src == false && this.matchIPAddress(nw_src_prefix_and_mask.getValue().getInt(), nw_src_prefix_and_mask.getMask().getInt(), pkt_ip.getSourceAddress()) == false)
+ if (any_nw_src == false && !nw_src_prefix_and_mask.matches(pkt_ip.getSourceAddress()))
return false;
if (action == FirewallRule.FirewallAction.DROP) {
//wildcards.drop &= ~OFMatch.OFPFW_NW_SRC_ALL;
//wildcards.drop |= (nw_src_maskbits << OFMatch.OFPFW_NW_SRC_SHIFT);
- adp.drop.setMasked(MatchField.IPV4_SRC, nw_src_prefix_and_mask);
+ if (!IPv4AddressWithMask.NONE.equals(this.nw_src_prefix_and_mask)) {
+ adp.drop.setMasked(MatchField.IPV4_SRC, nw_src_prefix_and_mask);
+ }
} else {
//wildcards.allow &= ~OFMatch.OFPFW_NW_SRC_ALL;
//wildcards.allow |= (nw_src_maskbits << OFMatch.OFPFW_NW_SRC_SHIFT);
- adp.allow.setMasked(MatchField.IPV4_SRC, nw_src_prefix_and_mask);
+ if (!IPv4AddressWithMask.NONE.equals(this.nw_src_prefix_and_mask)) {
+ adp.allow.setMasked(MatchField.IPV4_SRC, nw_src_prefix_and_mask);
+ }
}
- if (any_nw_dst == false && this.matchIPAddress(nw_dst_prefix_and_mask.getValue().getInt(), nw_dst_prefix_and_mask.getMask().getInt(), pkt_ip.getDestinationAddress()) == false)
+ if (any_nw_dst == false && !nw_dst_prefix_and_mask.matches(pkt_ip.getDestinationAddress()))
return false;
if (action == FirewallRule.FirewallAction.DROP) {
//wildcards.drop &= ~OFMatch.OFPFW_NW_DST_ALL;
//wildcards.drop |= (nw_dst_maskbits << OFMatch.OFPFW_NW_DST_SHIFT);
- adp.drop.setMasked(MatchField.IPV4_DST, nw_dst_prefix_and_mask);
+ if (!IPv4AddressWithMask.NONE.equals(this.nw_dst_prefix_and_mask)) {
+ adp.drop.setMasked(MatchField.IPV4_DST, nw_dst_prefix_and_mask);
+ }
} else {
//wildcards.allow &= ~OFMatch.OFPFW_NW_DST_ALL;
//wildcards.allow |= (nw_dst_maskbits << OFMatch.OFPFW_NW_DST_SHIFT);
- adp.allow.setMasked(MatchField.IPV4_DST, nw_dst_prefix_and_mask);
+ if (!IPv4AddressWithMask.NONE.equals(this.nw_dst_prefix_and_mask)) {
+ adp.allow.setMasked(MatchField.IPV4_DST, nw_dst_prefix_and_mask);
+ }
}
// nw_proto check
@@ -318,10 +431,14 @@ public boolean matchesThisPacket(DatapathId switchDpid, OFPort inPort, Ethernet
}
if (action == FirewallRule.FirewallAction.DROP) {
//wildcards.drop &= ~OFMatch.OFPFW_NW_PROTO;
- adp.drop.setExact(MatchField.IP_PROTO, this.nw_proto);
+ if (!IpProtocol.NONE.equals(this.nw_proto)) {
+ adp.drop.setExact(MatchField.IP_PROTO, this.nw_proto);
+ }
} else {
//wildcards.allow &= ~OFMatch.OFPFW_NW_PROTO;
- adp.allow.setExact(MatchField.IP_PROTO, this.nw_proto);
+ if (!IpProtocol.NONE.equals(this.nw_proto)) {
+ adp.allow.setExact(MatchField.IP_PROTO, this.nw_proto);
+ }
}
// TCP/UDP source and destination ports match?
@@ -333,16 +450,24 @@ public boolean matchesThisPacket(DatapathId switchDpid, OFPort inPort, Ethernet
if (action == FirewallRule.FirewallAction.DROP) {
//wildcards.drop &= ~OFMatch.OFPFW_TP_SRC;
if (pkt_tcp != null) {
- adp.drop.setExact(MatchField.TCP_SRC, this.tp_src);
+ if (!TransportPort.NONE.equals(this.tp_src)) {
+ adp.drop.setExact(MatchField.TCP_SRC, this.tp_src);
+ }
} else {
- adp.drop.setExact(MatchField.UDP_SRC, this.tp_src);
+ if (!TransportPort.NONE.equals(this.tp_src)) {
+ adp.drop.setExact(MatchField.UDP_SRC, this.tp_src);
+ }
}
} else {
//wildcards.allow &= ~OFMatch.OFPFW_TP_SRC;
if (pkt_tcp != null) {
- adp.allow.setExact(MatchField.TCP_SRC, this.tp_src);
+ if (!TransportPort.NONE.equals(this.tp_src)) {
+ adp.allow.setExact(MatchField.TCP_SRC, this.tp_src);
+ }
} else {
- adp.allow.setExact(MatchField.UDP_SRC, this.tp_src);
+ if (!TransportPort.NONE.equals(this.tp_src)) {
+ adp.allow.setExact(MatchField.UDP_SRC, this.tp_src);
+ }
}
}
@@ -353,16 +478,24 @@ public boolean matchesThisPacket(DatapathId switchDpid, OFPort inPort, Ethernet
if (action == FirewallRule.FirewallAction.DROP) {
//wildcards.drop &= ~OFMatch.OFPFW_TP_DST;
if (pkt_tcp != null) {
- adp.drop.setExact(MatchField.TCP_DST, this.tp_dst);
+ if (!TransportPort.NONE.equals(this.tp_dst)) {
+ adp.drop.setExact(MatchField.TCP_DST, this.tp_dst);
+ }
} else {
- adp.drop.setExact(MatchField.UDP_DST, this.tp_dst);
+ if (!TransportPort.NONE.equals(this.tp_dst)) {
+ adp.drop.setExact(MatchField.UDP_DST, this.tp_dst);
+ }
}
} else {
//wildcards.allow &= ~OFMatch.OFPFW_TP_DST;
if (pkt_tcp != null) {
- adp.allow.setExact(MatchField.TCP_DST, this.tp_dst);
+ if (!TransportPort.NONE.equals(this.tp_dst)) {
+ adp.allow.setExact(MatchField.TCP_DST, this.tp_dst);
+ }
} else {
- adp.allow.setExact(MatchField.UDP_DST, this.tp_dst);
+ if (!TransportPort.NONE.equals(this.tp_dst)) {
+ adp.allow.setExact(MatchField.UDP_DST, this.tp_dst);
+ }
}
}
}
@@ -376,81 +509,54 @@ public boolean matchesThisPacket(DatapathId switchDpid, OFPort inPort, Ethernet
}
if (action == FirewallRule.FirewallAction.DROP) {
//wildcards.drop &= ~OFMatch.OFPFW_DL_TYPE;
- adp.drop.setExact(MatchField.ETH_TYPE, this.dl_type);
+ if (!EthType.NONE.equals(this.dl_type)) {
+ adp.drop.setExact(MatchField.ETH_TYPE, this.dl_type);
+ }
} else {
//wildcards.allow &= ~OFMatch.OFPFW_DL_TYPE;
- adp.allow.setExact(MatchField.ETH_TYPE, this.dl_type);
+ if (!EthType.NONE.equals(this.dl_type)) {
+ adp.allow.setExact(MatchField.ETH_TYPE, this.dl_type);
+ }
}
// all applicable checks passed
return true;
}
- /**
- * Determines if rule's CIDR address matches IP address of the packet
- *
- * @param rulePrefix
- * prefix part of the CIDR address
- * @param ruleBits
- * the size of mask of the CIDR address
- * @param packetAddress
- * the IP address of the incoming packet to match with
- * @return true if CIDR address matches the packet's IP address, false
- * otherwise
- */
- protected boolean matchIPAddress(int rulePrefix, int ruleBits, IPv4Address packetAddress) {
- boolean matched = true;
-
- int rule_iprng = 32 - ruleBits;
- int rule_ipint = rulePrefix;
- int pkt_ipint = packetAddress.getInt();
- // if there's a subnet range (bits to be wildcarded > 0)
- if (rule_iprng > 0) {
- // right shift bits to remove rule_iprng of LSB that are to be
- // wildcarded
- rule_ipint = rule_ipint >> rule_iprng;
- pkt_ipint = pkt_ipint >> rule_iprng;
- // now left shift to return to normal range, except that the
- // rule_iprng number of LSB
- // are now zeroed
- rule_ipint = rule_ipint << rule_iprng;
- pkt_ipint = pkt_ipint << rule_iprng;
- }
- // check if we have a match
- if (rule_ipint != pkt_ipint)
- matched = false;
-
- return matched;
- }
-
@Override
- public int hashCode() {
- final int prime = 2521;
- int result = super.hashCode();
- result = prime * result + (int) dpid.getLong();
- result = prime * result + in_port.getPortNumber();
- result = prime * result + (int) dl_src.getLong();
- result = prime * result + (int) dl_dst.getLong();
- result = prime * result + dl_type.getValue();
- result = prime * result + nw_src_prefix_and_mask.getValue().getInt();
- result = prime * result + nw_src_prefix_and_mask.getMask().getInt();
- result = prime * result + nw_dst_prefix_and_mask.getValue().getInt();
- result = prime * result + nw_dst_prefix_and_mask.getMask().getInt();
- result = prime * result + nw_proto.getIpProtocolNumber();
- result = prime * result + tp_src.getPort();
- result = prime * result + tp_dst.getPort();
- result = prime * result + action.ordinal();
- result = prime * result + priority;
- result = prime * result + (new Boolean(any_dpid)).hashCode();
- result = prime * result + (new Boolean(any_in_port)).hashCode();
- result = prime * result + (new Boolean(any_dl_src)).hashCode();
- result = prime * result + (new Boolean(any_dl_dst)).hashCode();
- result = prime * result + (new Boolean(any_dl_type)).hashCode();
- result = prime * result + (new Boolean(any_nw_src)).hashCode();
- result = prime * result + (new Boolean(any_nw_dst)).hashCode();
- result = prime * result + (new Boolean(any_nw_proto)).hashCode();
- result = prime * result + (new Boolean(any_tp_src)).hashCode();
- result = prime * result + (new Boolean(any_tp_dst)).hashCode();
- return result;
- }
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((action == null) ? 0 : action.hashCode());
+ result = prime * result + (any_dl_dst ? 1231 : 1237);
+ result = prime * result + (any_dl_src ? 1231 : 1237);
+ result = prime * result + (any_dl_type ? 1231 : 1237);
+ result = prime * result + (any_dpid ? 1231 : 1237);
+ result = prime * result + (any_in_port ? 1231 : 1237);
+ result = prime * result + (any_nw_dst ? 1231 : 1237);
+ result = prime * result + (any_nw_proto ? 1231 : 1237);
+ result = prime * result + (any_nw_src ? 1231 : 1237);
+ result = prime * result + (any_tp_dst ? 1231 : 1237);
+ result = prime * result + (any_tp_src ? 1231 : 1237);
+ result = prime * result + ((dl_dst == null) ? 0 : dl_dst.hashCode());
+ result = prime * result + ((dl_src == null) ? 0 : dl_src.hashCode());
+ result = prime * result + ((dl_type == null) ? 0 : dl_type.hashCode());
+ result = prime * result + ((dpid == null) ? 0 : dpid.hashCode());
+ result = prime * result + ((in_port == null) ? 0 : in_port.hashCode());
+ result = prime
+ * result
+ + ((nw_dst_prefix_and_mask == null) ? 0
+ : nw_dst_prefix_and_mask.hashCode());
+ result = prime * result
+ + ((nw_proto == null) ? 0 : nw_proto.hashCode());
+ result = prime
+ * result
+ + ((nw_src_prefix_and_mask == null) ? 0
+ : nw_src_prefix_and_mask.hashCode());
+ result = prime * result + priority;
+ result = prime * result + ruleid;
+ result = prime * result + ((tp_dst == null) ? 0 : tp_dst.hashCode());
+ result = prime * result + ((tp_src == null) ? 0 : tp_src.hashCode());
+ return result;
+ }
}
diff --git a/src/main/java/net/floodlightcontroller/firewall/FirewallRulesResource.java b/src/main/java/net/floodlightcontroller/firewall/FirewallRulesResource.java
index 90c3d13a2d..d90fa90a42 100644
--- a/src/main/java/net/floodlightcontroller/firewall/FirewallRulesResource.java
+++ b/src/main/java/net/floodlightcontroller/firewall/FirewallRulesResource.java
@@ -40,275 +40,289 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.floodlightcontroller.packet.IPv4;
public class FirewallRulesResource extends ServerResource {
- protected static Logger log = LoggerFactory.getLogger(FirewallRulesResource.class);
-
- @Get("json")
- public List retrieve() {
- IFirewallService firewall =
- (IFirewallService)getContext().getAttributes().
- get(IFirewallService.class.getCanonicalName());
-
- return firewall.getRules();
- }
-
- /**
- * Takes a Firewall Rule string in JSON format and parses it into
- * our firewall rule data structure, then adds it to the firewall.
- * @param fmJson The Firewall rule entry in JSON format.
- * @return A string status message
- */
- @Post
- public String store(String fmJson) {
- IFirewallService firewall =
- (IFirewallService)getContext().getAttributes().
- get(IFirewallService.class.getCanonicalName());
-
- FirewallRule rule;
- try {
- rule = jsonToFirewallRule(fmJson);
- } catch (IOException e) {
- log.error("Error parsing firewall rule: " + fmJson, e);
- return "{\"status\" : \"Error! Could not parse firewall rule, see log for details.\"}";
- }
- String status = null;
- if (checkRuleExists(rule, firewall.getRules())) {
- status = "Error! A similar firewall rule already exists.";
- log.error(status);
- return ("{\"status\" : \"" + status + "\"}");
- } else {
- // add rule to firewall
- firewall.addRule(rule);
- status = "Rule added";
- return ("{\"status\" : \"" + status + "\", \"rule-id\" : \""+ Integer.toString(rule.ruleid) + "\"}");
- }
- }
-
- /**
- * Takes a Firewall Rule string in JSON format and parses it into
- * our firewall rule data structure, then deletes it from the firewall.
- * @param fmJson The Firewall rule entry in JSON format.
- * @return A string status message
- */
-
- @Delete
- public String remove(String fmJson) {
- IFirewallService firewall =
- (IFirewallService)getContext().getAttributes().
- get(IFirewallService.class.getCanonicalName());
-
- FirewallRule rule;
- try {
- rule = jsonToFirewallRule(fmJson);
- } catch (IOException e) {
- log.error("Error parsing firewall rule: " + fmJson, e);
- return "{\"status\" : \"Error! Could not parse firewall rule, see log for details.\"}";
- }
- String status = null;
- boolean exists = false;
- Iterator iter = firewall.getRules().iterator();
- while (iter.hasNext()) {
- FirewallRule r = iter.next();
- if (r.ruleid == rule.ruleid) {
- exists = true;
- break;
- }
- }
- if (!exists) {
- status = "Error! Can't delete, a rule with this ID doesn't exist.";
- log.error(status);
- } else {
- // delete rule from firewall
- firewall.deleteRule(rule.ruleid);
- status = "Rule deleted";
- }
- return ("{\"status\" : \"" + status + "\"}");
- }
-
- /**
- * Turns a JSON formatted Firewall Rule string into a FirewallRule instance
- * @param fmJson The JSON formatted static firewall rule
- * @return The FirewallRule instance
- * @throws IOException If there was an error parsing the JSON
- */
-
- public static FirewallRule jsonToFirewallRule(String fmJson) throws IOException {
- FirewallRule rule = new FirewallRule();
- MappingJsonFactory f = new MappingJsonFactory();
- JsonParser jp;
-
- try {
- jp = f.createJsonParser(fmJson);
- } catch (JsonParseException e) {
- throw new IOException(e);
- }
-
- jp.nextToken();
- if (jp.getCurrentToken() != JsonToken.START_OBJECT) {
- throw new IOException("Expected START_OBJECT");
- }
-
- while (jp.nextToken() != JsonToken.END_OBJECT) {
- if (jp.getCurrentToken() != JsonToken.FIELD_NAME) {
- throw new IOException("Expected FIELD_NAME");
- }
-
- String n = jp.getCurrentName();
- jp.nextToken();
- if (jp.getText().equals(""))
- continue;
-
- String tmp;
-
- // This is currently only applicable for remove(). In store(), ruleid takes a random number
- if (n == "ruleid") {
- rule.ruleid = Integer.parseInt(jp.getText());
- }
-
- // This assumes user having dpid info for involved switches
- else if (n == "switchid") {
- tmp = jp.getText();
- if (tmp.equalsIgnoreCase("-1") == false) {
- // user inputs hex format dpid
- rule.dpid = DatapathId.of(tmp);
- rule.any_dpid = false;
- }
- }
-
- else if (n == "src-inport") {
- rule.in_port = OFPort.of(Integer.parseInt(jp.getText()));
- rule.any_in_port = false;
- }
-
- else if (n == "src-mac") {
- tmp = jp.getText();
- if (tmp.equalsIgnoreCase("ANY") == false) {
- rule.any_dl_src = false;
- rule.dl_src = MacAddress.of(tmp);
- }
- }
-
- else if (n == "dst-mac") {
- tmp = jp.getText();
- if (tmp.equalsIgnoreCase("ANY") == false) {
- rule.any_dl_dst = false;
- rule.dl_dst = MacAddress.of(tmp);
- }
- }
-
- else if (n == "dl-type") {
- tmp = jp.getText();
- if (tmp.equalsIgnoreCase("ARP")) {
- rule.any_dl_type = false;
- rule.dl_type = EthType.ARP;
- }
- if (tmp.equalsIgnoreCase("IPv4")) {
- rule.any_dl_type = false;
- rule.dl_type = EthType.IPv4;
- }
- }
-
- else if (n == "src-ip") {
- tmp = jp.getText();
- if (tmp.equalsIgnoreCase("ANY") == false) {
- rule.any_nw_src = false;
- rule.any_dl_type = false;
- rule.dl_type = EthType.IPv4;
- rule.nw_src_prefix_and_mask = IPv4AddressWithMask.of(tmp);
- }
- }
-
- else if (n == "dst-ip") {
- tmp = jp.getText();
- if (tmp.equalsIgnoreCase("ANY") == false) {
- rule.any_nw_dst = false;
- rule.any_dl_type = false;
- rule.dl_type = EthType.IPv4;
- rule.nw_dst_prefix_and_mask = IPv4AddressWithMask.of(tmp);
- }
- }
-
- else if (n == "nw-proto") {
- tmp = jp.getText();
- if (tmp.equalsIgnoreCase("TCP")) {
- rule.any_nw_proto = false;
- rule.nw_proto = IpProtocol.TCP;
- rule.any_dl_type = false;
- rule.dl_type = EthType.IPv4;
- } else if (tmp.equalsIgnoreCase("UDP")) {
- rule.any_nw_proto = false;
- rule.nw_proto = IpProtocol.UDP;
- rule.any_dl_type = false;
- rule.dl_type = EthType.IPv4;
- } else if (tmp.equalsIgnoreCase("ICMP")) {
- rule.any_nw_proto = false;
- rule.nw_proto = IpProtocol.ICMP;
- rule.any_dl_type = false;
- rule.dl_type = EthType.IPv4;
- }
- }
-
- else if (n == "tp-src") {
- rule.any_tp_src = false;
- rule.tp_src = TransportPort.of(Integer.parseInt(jp.getText()));
- }
-
- else if (n == "tp-dst") {
- rule.any_tp_dst = false;
- rule.tp_dst = TransportPort.of(Integer.parseInt(jp.getText()));
- }
-
- else if (n == "priority") {
- rule.priority = Integer.parseInt(jp.getText());
- }
-
- else if (n == "action") {
- if (jp.getText().equalsIgnoreCase("allow") == true) {
- rule.action = FirewallRule.FirewallAction.ALLOW;
- } else if (jp.getText().equalsIgnoreCase("deny") == true) {
- rule.action = FirewallRule.FirewallAction.DROP;
- }
- }
- }
-
- return rule;
- }
-
- public static int[] IPCIDRToPrefixBits(String cidr) {
- int ret[] = new int[2];
-
- // as IP can also be a prefix rather than an absolute address
- // split it over "/" to get the bit range
- String[] parts = cidr.split("/");
- String cidr_prefix = parts[0].trim();
- int cidr_bits = 0;
- if (parts.length == 2) {
- try {
- cidr_bits = Integer.parseInt(parts[1].trim());
- } catch (Exception exp) {
- cidr_bits = 32;
- }
- }
- ret[0] = IPv4.toIPv4Address(cidr_prefix);
- ret[1] = cidr_bits;
-
- return ret;
- }
-
- public static boolean checkRuleExists(FirewallRule rule, List rules) {
- Iterator iter = rules.iterator();
- while (iter.hasNext()) {
- FirewallRule r = iter.next();
-
- // check if we find a similar rule
- if (rule.isSameAs(r)) {
- return true;
- }
- }
-
- // no rule matched, so it doesn't exist in the rules
- return false;
- }
+ protected static Logger log = LoggerFactory.getLogger(FirewallRulesResource.class);
+
+ @Get("json")
+ public List retrieve() {
+ IFirewallService firewall =
+ (IFirewallService)getContext().getAttributes().
+ get(IFirewallService.class.getCanonicalName());
+
+ return firewall.getRules();
+ }
+
+ /**
+ * Takes a Firewall Rule string in JSON format and parses it into
+ * our firewall rule data structure, then adds it to the firewall.
+ * @param fmJson The Firewall rule entry in JSON format.
+ * @return A string status message
+ */
+ @Post
+ public String store(String fmJson) {
+ IFirewallService firewall =
+ (IFirewallService)getContext().getAttributes().
+ get(IFirewallService.class.getCanonicalName());
+
+ FirewallRule rule = jsonToFirewallRule(fmJson);
+ if (rule == null) {
+ return "{\"status\" : \"Error! Could not parse firewall rule, see log for details.\"}";
+ }
+ String status = null;
+ if (checkRuleExists(rule, firewall.getRules())) {
+ status = "Error! A similar firewall rule already exists.";
+ log.error(status);
+ return ("{\"status\" : \"" + status + "\"}");
+ } else {
+ // add rule to firewall
+ firewall.addRule(rule);
+ status = "Rule added";
+ return ("{\"status\" : \"" + status + "\", \"rule-id\" : \""+ Integer.toString(rule.ruleid) + "\"}");
+ }
+ }
+
+ /**
+ * Takes a Firewall Rule string in JSON format and parses it into
+ * our firewall rule data structure, then deletes it from the firewall.
+ * @param fmJson The Firewall rule entry in JSON format.
+ * @return A string status message
+ */
+
+ @Delete
+ public String remove(String fmJson) {
+ IFirewallService firewall =
+ (IFirewallService)getContext().getAttributes().
+ get(IFirewallService.class.getCanonicalName());
+
+ FirewallRule rule = jsonToFirewallRule(fmJson);
+ if (rule == null) {
+ //TODO compose the error with a json formatter
+ return "{\"status\" : \"Error! Could not parse firewall rule, see log for details.\"}";
+ }
+
+ String status = null;
+ boolean exists = false;
+ Iterator iter = firewall.getRules().iterator();
+ while (iter.hasNext()) {
+ FirewallRule r = iter.next();
+ if (r.ruleid == rule.ruleid) {
+ exists = true;
+ break;
+ }
+ }
+ if (!exists) {
+ status = "Error! Can't delete, a rule with this ID doesn't exist.";
+ log.error(status);
+ } else {
+ // delete rule from firewall
+ firewall.deleteRule(rule.ruleid);
+ status = "Rule deleted";
+ }
+ return ("{\"status\" : \"" + status + "\"}");
+ }
+
+ /**
+ * Turns a JSON formatted Firewall Rule string into a FirewallRule instance
+ * @param fmJson The JSON formatted static firewall rule
+ * @return The FirewallRule instance
+ * @throws IOException If there was an error parsing the JSON
+ */
+
+ public static FirewallRule jsonToFirewallRule(String fmJson) {
+ FirewallRule rule = new FirewallRule();
+ MappingJsonFactory f = new MappingJsonFactory();
+ JsonParser jp;
+ try {
+ try {
+ jp = f.createJsonParser(fmJson);
+ } catch (JsonParseException e) {
+ throw new IOException(e);
+ }
+
+ jp.nextToken();
+ if (jp.getCurrentToken() != JsonToken.START_OBJECT) {
+ throw new IOException("Expected START_OBJECT");
+ }
+
+ while (jp.nextToken() != JsonToken.END_OBJECT) {
+ if (jp.getCurrentToken() != JsonToken.FIELD_NAME) {
+ throw new IOException("Expected FIELD_NAME");
+ }
+
+ String n = jp.getCurrentName();
+ jp.nextToken();
+ if (jp.getText().equals("")) {
+ continue;
+ }
+
+ // This is currently only applicable for remove(). In store(), ruleid takes a random number
+ if (n.equalsIgnoreCase("ruleid")) {
+ try {
+ rule.ruleid = Integer.parseInt(jp.getText());
+ } catch (IllegalArgumentException e) {
+ log.error("Unable to parse rule ID: {}", jp.getText());
+ }
+ }
+
+ // This assumes user having dpid info for involved switches
+ else if (n.equalsIgnoreCase("switchid")) {
+ rule.any_dpid = false;
+ try {
+ rule.dpid = DatapathId.of(jp.getText());
+ } catch (NumberFormatException e) {
+ log.error("Unable to parse switch DPID: {}", jp.getText());
+ //TODO should return some error message via HTTP message
+ }
+ }
+
+ else if (n.equalsIgnoreCase("src-inport")) {
+ rule.any_in_port = false;
+ try {
+ rule.in_port = OFPort.of(Integer.parseInt(jp.getText()));
+ } catch (NumberFormatException e) {
+ log.error("Unable to parse ingress port: {}", jp.getText());
+ //TODO should return some error message via HTTP message
+ }
+ }
+
+ else if (n.equalsIgnoreCase("src-mac")) {
+ if (!jp.getText().equalsIgnoreCase("ANY")) {
+ rule.any_dl_src = false;
+ try {
+ rule.dl_src = MacAddress.of(jp.getText());
+ } catch (IllegalArgumentException e) {
+ log.error("Unable to parse source MAC: {}", jp.getText());
+ //TODO should return some error message via HTTP message
+ }
+ }
+ }
+
+ else if (n.equalsIgnoreCase("dst-mac")) {
+ if (!jp.getText().equalsIgnoreCase("ANY")) {
+ rule.any_dl_dst = false;
+ try {
+ rule.dl_dst = MacAddress.of(jp.getText());
+ } catch (IllegalArgumentException e) {
+ log.error("Unable to parse destination MAC: {}", jp.getText());
+ //TODO should return some error message via HTTP message
+ }
+ }
+ }
+
+ else if (n.equalsIgnoreCase("dl-type")) {
+ if (jp.getText().equalsIgnoreCase("ARP")) {
+ rule.any_dl_type = false;
+ rule.dl_type = EthType.ARP;
+ } else if (jp.getText().equalsIgnoreCase("IPv4")) {
+ rule.any_dl_type = false;
+ rule.dl_type = EthType.IPv4;
+ }
+ }
+
+ else if (n.equalsIgnoreCase("src-ip")) {
+ if (!jp.getText().equalsIgnoreCase("ANY")) {
+ rule.any_nw_src = false;
+ rule.any_dl_type = false;
+ rule.dl_type = EthType.IPv4;
+ try {
+ rule.nw_src_prefix_and_mask = IPv4AddressWithMask.of(jp.getText());
+ } catch (IllegalArgumentException e) {
+ log.error("Unable to parse source IP: {}", jp.getText());
+ //TODO should return some error message via HTTP message
+ }
+ }
+ }
+
+ else if (n.equalsIgnoreCase("dst-ip")) {
+ if (!jp.getText().equalsIgnoreCase("ANY")) {
+ rule.any_nw_dst = false;
+ rule.any_dl_type = false;
+ rule.dl_type = EthType.IPv4;
+ try {
+ rule.nw_dst_prefix_and_mask = IPv4AddressWithMask.of(jp.getText());
+ } catch (IllegalArgumentException e) {
+ log.error("Unable to parse destination IP: {}", jp.getText());
+ //TODO should return some error message via HTTP message
+ }
+ }
+ }
+
+ else if (n.equalsIgnoreCase("nw-proto")) {
+ if (jp.getText().equalsIgnoreCase("TCP")) {
+ rule.any_nw_proto = false;
+ rule.nw_proto = IpProtocol.TCP;
+ rule.any_dl_type = false;
+ rule.dl_type = EthType.IPv4;
+ } else if (jp.getText().equalsIgnoreCase("UDP")) {
+ rule.any_nw_proto = false;
+ rule.nw_proto = IpProtocol.UDP;
+ rule.any_dl_type = false;
+ rule.dl_type = EthType.IPv4;
+ } else if (jp.getText().equalsIgnoreCase("ICMP")) {
+ rule.any_nw_proto = false;
+ rule.nw_proto = IpProtocol.ICMP;
+ rule.any_dl_type = false;
+ rule.dl_type = EthType.IPv4;
+ }
+ }
+
+ else if (n.equalsIgnoreCase("tp-src")) {
+ rule.any_tp_src = false;
+ try {
+ rule.tp_src = TransportPort.of(Integer.parseInt(jp.getText()));
+ } catch (IllegalArgumentException e) {
+ log.error("Unable to parse source transport port: {}", jp.getText());
+ //TODO should return some error message via HTTP message
+ }
+ }
+
+ else if (n.equalsIgnoreCase("tp-dst")) {
+ rule.any_tp_dst = false;
+ try {
+ rule.tp_dst = TransportPort.of(Integer.parseInt(jp.getText()));
+ } catch (IllegalArgumentException e) {
+ log.error("Unable to parse destination transport port: {}", jp.getText());
+ //TODO should return some error message via HTTP message
+ }
+ }
+
+ else if (n.equalsIgnoreCase("priority")) {
+ try {
+ rule.priority = Integer.parseInt(jp.getText());
+ } catch (IllegalArgumentException e) {
+ log.error("Unable to parse priority: {}", jp.getText());
+ //TODO should return some error message via HTTP message
+ }
+ }
+
+ else if (n.equalsIgnoreCase("action")) {
+ if (jp.getText().equalsIgnoreCase("allow") || jp.getText().equalsIgnoreCase("accept")) {
+ rule.action = FirewallRule.FirewallAction.ALLOW;
+ } else if (jp.getText().equalsIgnoreCase("deny") || jp.getText().equalsIgnoreCase("drop")) {
+ rule.action = FirewallRule.FirewallAction.DROP;
+ }
+ }
+ }
+ } catch (IOException e) {
+ log.error("Unable to parse JSON string: {}", e);
+ }
+
+ return rule;
+ }
+
+ public static boolean checkRuleExists(FirewallRule rule, List rules) {
+ Iterator iter = rules.iterator();
+ while (iter.hasNext()) {
+ FirewallRule r = iter.next();
+
+ // check if we find a similar rule
+ if (rule.isSameAs(r)) {
+ return true;
+ }
+ }
+
+ // no rule matched, so it doesn't exist in the rules
+ return false;
+ }
}
diff --git a/src/main/java/net/floodlightcontroller/flowcache/FRQueryBvsAcl.java b/src/main/java/net/floodlightcontroller/flowcache/FRQueryBvsAcl.java
index a9370956cc..dff53248c4 100644
--- a/src/main/java/net/floodlightcontroller/flowcache/FRQueryBvsAcl.java
+++ b/src/main/java/net/floodlightcontroller/flowcache/FRQueryBvsAcl.java
@@ -19,6 +19,7 @@
/**
* The Class for FlowReconcileQuery for BVS config ACL application change .
*/
+@Deprecated
public class FRQueryBvsAcl extends FlowReconcileQuery {
/* The BVS name. */
public String bvsName;
diff --git a/src/main/java/net/floodlightcontroller/flowcache/FRQueryBvsMatchMac.java b/src/main/java/net/floodlightcontroller/flowcache/FRQueryBvsMatchMac.java
index 60fab0d760..7444b4e8b6 100644
--- a/src/main/java/net/floodlightcontroller/flowcache/FRQueryBvsMatchMac.java
+++ b/src/main/java/net/floodlightcontroller/flowcache/FRQueryBvsMatchMac.java
@@ -21,6 +21,7 @@
/**
* The Class for FlowReconcileQuery for link down event.
*/
+@Deprecated
public class FRQueryBvsMatchMac extends FlowReconcileQuery {
/*the match mac*/
public String mac;
diff --git a/src/main/java/net/floodlightcontroller/flowcache/FRQueryBvsMatchSubnet.java b/src/main/java/net/floodlightcontroller/flowcache/FRQueryBvsMatchSubnet.java
index cdb9168f10..5a7d6283b6 100644
--- a/src/main/java/net/floodlightcontroller/flowcache/FRQueryBvsMatchSubnet.java
+++ b/src/main/java/net/floodlightcontroller/flowcache/FRQueryBvsMatchSubnet.java
@@ -19,6 +19,7 @@
/**
* The Class for FlowReconcileQuery for BVS config interface match IP subnet .
*/
+@Deprecated
public class FRQueryBvsMatchSubnet extends FlowReconcileQuery {
/*match ip subnet*/
public String ipSubnet;
diff --git a/src/main/java/net/floodlightcontroller/flowcache/FRQueryBvsMatchSwitchPort.java b/src/main/java/net/floodlightcontroller/flowcache/FRQueryBvsMatchSwitchPort.java
index 933b9324a8..025644b4c4 100644
--- a/src/main/java/net/floodlightcontroller/flowcache/FRQueryBvsMatchSwitchPort.java
+++ b/src/main/java/net/floodlightcontroller/flowcache/FRQueryBvsMatchSwitchPort.java
@@ -22,6 +22,7 @@
/**
* The Class for FlowReconcileQuery for BVS config interface match switch port.
*/
+@Deprecated
public class FRQueryBvsMatchSwitchPort extends FlowReconcileQuery {
/*switch DPID*/
public DatapathId swId;
diff --git a/src/main/java/net/floodlightcontroller/flowcache/FRQueryBvsMatchTag.java b/src/main/java/net/floodlightcontroller/flowcache/FRQueryBvsMatchTag.java
index ba7b90da4d..da17ebeb5f 100644
--- a/src/main/java/net/floodlightcontroller/flowcache/FRQueryBvsMatchTag.java
+++ b/src/main/java/net/floodlightcontroller/flowcache/FRQueryBvsMatchTag.java
@@ -21,6 +21,7 @@
/**
* The Class for FlowReconcileQuery for BVS config interface match tag.
*/
+@Deprecated
public class FRQueryBvsMatchTag extends FlowReconcileQuery {
public List tag;
diff --git a/src/main/java/net/floodlightcontroller/flowcache/FRQueryBvsMatchVlan.java b/src/main/java/net/floodlightcontroller/flowcache/FRQueryBvsMatchVlan.java
index 732e64abb2..47f96ac840 100644
--- a/src/main/java/net/floodlightcontroller/flowcache/FRQueryBvsMatchVlan.java
+++ b/src/main/java/net/floodlightcontroller/flowcache/FRQueryBvsMatchVlan.java
@@ -21,6 +21,7 @@
/**
* The Class for FlowReconcileQuery for BVS config interface match VLAN.
*/
+@Deprecated
public class FRQueryBvsMatchVlan extends FlowReconcileQuery {
/* The match vlan IDs. */
public List vlans;
diff --git a/src/main/java/net/floodlightcontroller/flowcache/FRQueryBvsPriority.java b/src/main/java/net/floodlightcontroller/flowcache/FRQueryBvsPriority.java
index 836dbcf2ef..b778e42ba7 100644
--- a/src/main/java/net/floodlightcontroller/flowcache/FRQueryBvsPriority.java
+++ b/src/main/java/net/floodlightcontroller/flowcache/FRQueryBvsPriority.java
@@ -19,6 +19,7 @@
/**
* The Class for FlowReconcileQuery for BVS config priority change .
*/
+@Deprecated
public class FRQueryBvsPriority extends FlowReconcileQuery {
/*BVS priority change*/
public int lowP; //lower priority
diff --git a/src/main/java/net/floodlightcontroller/flowcache/FRQueryDevicePropertyChanged.java b/src/main/java/net/floodlightcontroller/flowcache/FRQueryDevicePropertyChanged.java
index 64b9d2aaea..2c2017bc9a 100644
--- a/src/main/java/net/floodlightcontroller/flowcache/FRQueryDevicePropertyChanged.java
+++ b/src/main/java/net/floodlightcontroller/flowcache/FRQueryDevicePropertyChanged.java
@@ -21,6 +21,7 @@
/**
* The Class for FlowReconcileQuery for device property changed event.
*/
+@Deprecated
public class FRQueryDevicePropertyChanged extends FlowReconcileQuery {
public IDevice device;
public FRQueryDevicePropertyChanged() {
diff --git a/src/main/java/net/floodlightcontroller/flowcache/FRQueryVRSArpChange.java b/src/main/java/net/floodlightcontroller/flowcache/FRQueryVRSArpChange.java
index 8a48fa5a6b..e93cf0853f 100644
--- a/src/main/java/net/floodlightcontroller/flowcache/FRQueryVRSArpChange.java
+++ b/src/main/java/net/floodlightcontroller/flowcache/FRQueryVRSArpChange.java
@@ -18,6 +18,7 @@
/**
* The Class for FlowReconcileQuery for VRS routing rule change event .
*/
+@Deprecated
public class FRQueryVRSArpChange extends FlowReconcileQuery {
/* The list of impacted bvs names. */
public String tenant;
diff --git a/src/main/java/net/floodlightcontroller/flowcache/FRQueryVRSRuleChange.java b/src/main/java/net/floodlightcontroller/flowcache/FRQueryVRSRuleChange.java
index 59f4c29486..0fc81a6eb0 100644
--- a/src/main/java/net/floodlightcontroller/flowcache/FRQueryVRSRuleChange.java
+++ b/src/main/java/net/floodlightcontroller/flowcache/FRQueryVRSRuleChange.java
@@ -21,6 +21,7 @@
/**
* The Class for FlowReconcileQuery for VRS routing rule change event .
*/
+@Deprecated
public class FRQueryVRSRuleChange extends FlowReconcileQuery {
/* The list of impacted bvs names. */
public Set bvsNames;
diff --git a/src/main/java/net/floodlightcontroller/flowcache/FlowReconcileManager.java b/src/main/java/net/floodlightcontroller/flowcache/FlowReconcileManager.java
index b1f608c360..5948c2491b 100644
--- a/src/main/java/net/floodlightcontroller/flowcache/FlowReconcileManager.java
+++ b/src/main/java/net/floodlightcontroller/flowcache/FlowReconcileManager.java
@@ -46,7 +46,7 @@
import org.projectfloodlight.openflow.protocol.OFType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
+@Deprecated
public class FlowReconcileManager implements IFloodlightModule, IFlowReconcileService {
/** The logger. */
private static Logger logger = LoggerFactory.getLogger(FlowReconcileManager.class);
diff --git a/src/main/java/net/floodlightcontroller/flowcache/FlowReconcileQuery.java b/src/main/java/net/floodlightcontroller/flowcache/FlowReconcileQuery.java
index 538e01d873..2235e181ae 100644
--- a/src/main/java/net/floodlightcontroller/flowcache/FlowReconcileQuery.java
+++ b/src/main/java/net/floodlightcontroller/flowcache/FlowReconcileQuery.java
@@ -29,6 +29,7 @@
/**
* The base Class for FlowReconcileQuery.
*/
+@Deprecated
public class FlowReconcileQuery {
public ReconcileQueryEvType evType;
public EventPriority evPriority;
diff --git a/src/main/java/net/floodlightcontroller/flowcache/FlowReconcileQueryDeviceMove.java b/src/main/java/net/floodlightcontroller/flowcache/FlowReconcileQueryDeviceMove.java
index 27134c6844..8b6d2b7c3b 100644
--- a/src/main/java/net/floodlightcontroller/flowcache/FlowReconcileQueryDeviceMove.java
+++ b/src/main/java/net/floodlightcontroller/flowcache/FlowReconcileQueryDeviceMove.java
@@ -24,6 +24,7 @@
/**
* The Class for FlowReconcileQuery for device move event.
*/
+@Deprecated
public class FlowReconcileQueryDeviceMove extends FlowReconcileQuery {
/* The moved device. */
public IDevice deviceMoved;
diff --git a/src/main/java/net/floodlightcontroller/flowcache/FlowReconcileQueryPortDown.java b/src/main/java/net/floodlightcontroller/flowcache/FlowReconcileQueryPortDown.java
index 65361e6e99..2169424919 100644
--- a/src/main/java/net/floodlightcontroller/flowcache/FlowReconcileQueryPortDown.java
+++ b/src/main/java/net/floodlightcontroller/flowcache/FlowReconcileQueryPortDown.java
@@ -22,6 +22,7 @@
/**
* The Class for FlowReconcileQuery for link down event.
*/
+@Deprecated
public class FlowReconcileQueryPortDown extends FlowReconcileQuery {
/*down port switch DPID*/
public DatapathId swId;
diff --git a/src/main/java/net/floodlightcontroller/flowcache/IFlowReconcileEngineService.java b/src/main/java/net/floodlightcontroller/flowcache/IFlowReconcileEngineService.java
index 4887555c9b..2e92e62ede 100644
--- a/src/main/java/net/floodlightcontroller/flowcache/IFlowReconcileEngineService.java
+++ b/src/main/java/net/floodlightcontroller/flowcache/IFlowReconcileEngineService.java
@@ -30,6 +30,7 @@
*
* @author MeiYang
*/
+@Deprecated
public interface IFlowReconcileEngineService extends IFloodlightService {
/**
* A FloodlightContextStore object that can be used to interact with the
diff --git a/src/main/java/net/floodlightcontroller/flowcache/IFlowReconcileListener.java b/src/main/java/net/floodlightcontroller/flowcache/IFlowReconcileListener.java
index 3fee84743a..8ec83ae088 100644
--- a/src/main/java/net/floodlightcontroller/flowcache/IFlowReconcileListener.java
+++ b/src/main/java/net/floodlightcontroller/flowcache/IFlowReconcileListener.java
@@ -19,6 +19,7 @@
import java.util.ArrayList;
import net.floodlightcontroller.core.IListener;
+
import org.projectfloodlight.openflow.protocol.OFType;
/**
@@ -26,6 +27,7 @@
*
* @author subrata
*/
+@Deprecated
public interface IFlowReconcileListener extends IListener {
/**
* Given an input OFMatch, this method applies the policy of the reconciler
diff --git a/src/main/java/net/floodlightcontroller/flowcache/IFlowReconcileService.java b/src/main/java/net/floodlightcontroller/flowcache/IFlowReconcileService.java
index ea36e197c2..54b136adfd 100644
--- a/src/main/java/net/floodlightcontroller/flowcache/IFlowReconcileService.java
+++ b/src/main/java/net/floodlightcontroller/flowcache/IFlowReconcileService.java
@@ -25,6 +25,7 @@
import net.floodlightcontroller.core.module.IFloodlightService;
import net.floodlightcontroller.flowcache.PriorityPendingQueue.EventPriority;
+@Deprecated
public interface IFlowReconcileService extends IFloodlightService {
/**
* Add a flow reconcile listener
diff --git a/src/main/java/net/floodlightcontroller/flowcache/OFMatchReconcile.java b/src/main/java/net/floodlightcontroller/flowcache/OFMatchReconcile.java
index 2f81dc6ad7..a1de4fa30c 100644
--- a/src/main/java/net/floodlightcontroller/flowcache/OFMatchReconcile.java
+++ b/src/main/java/net/floodlightcontroller/flowcache/OFMatchReconcile.java
@@ -24,6 +24,7 @@
/**
* OFMatchReconcile class to indicate result of a flow-reconciliation.
*/
+@Deprecated
public class OFMatchReconcile {
/**
diff --git a/src/main/java/net/floodlightcontroller/flowcache/PendingSwRespKey.java b/src/main/java/net/floodlightcontroller/flowcache/PendingSwRespKey.java
index 31e7a1f3a2..7f82dcf784 100644
--- a/src/main/java/net/floodlightcontroller/flowcache/PendingSwRespKey.java
+++ b/src/main/java/net/floodlightcontroller/flowcache/PendingSwRespKey.java
@@ -16,6 +16,7 @@
package net.floodlightcontroller.flowcache;
+@Deprecated
public class PendingSwRespKey {
long swDpid;
int transId;
diff --git a/src/main/java/net/floodlightcontroller/flowcache/PortDownReconciliation.java b/src/main/java/net/floodlightcontroller/flowcache/PortDownReconciliation.java
index 55e408d88e..73da272ee5 100644
--- a/src/main/java/net/floodlightcontroller/flowcache/PortDownReconciliation.java
+++ b/src/main/java/net/floodlightcontroller/flowcache/PortDownReconciliation.java
@@ -67,6 +67,7 @@
* @author Jason Parraga
*/
+@Deprecated
public class PortDownReconciliation implements IFloodlightModule,
ITopologyListener, IFlowReconcileListener {
protected static Logger log = LoggerFactory.getLogger(PortDownReconciliation.class);
@@ -294,7 +295,7 @@ public List getFlows(IOFSwitch sw, OFPort outPort) {
OFFlowStatsRequest req = sw.getOFFactory().buildFlowStatsRequest()
.setMatch(sw.getOFFactory().buildMatch().build())
.setOutPort(outPort)
- .setTableId(TableId.ALL) //TODO @Ryan I suppose 0xFF is all tables, maybe not though...
+ .setTableId(TableId.ALL)
.build();
try {
@@ -393,9 +394,9 @@ public void deleteInvalidFlows(IOFSwitch sw, Map> invalidOut
&& entry.getMatch().get(MatchField.ETH_SRC).equals(match.get(MatchField.ETH_SRC))
&& entry.getMatch().get(MatchField.ETH_TYPE).equals(match.get(MatchField.ETH_TYPE))
&& entry.getMatch().get(MatchField.VLAN_VID).equals(match.get(MatchField.VLAN_VID))
- && entry.getMatch().get(MatchField.IPV4_DST).equals(match.get(MatchField.IPV4_DST)) //TODO @Ryan mask lengths built into the MatchField for IPV4, I think
+ && entry.getMatch().get(MatchField.IPV4_DST).equals(match.get(MatchField.IPV4_DST))
&& entry.getMatch().get(MatchField.IP_PROTO).equals(match.get(MatchField.IP_PROTO))
- && entry.getMatch().get(MatchField.IPV4_SRC).equals(match.get(MatchField.IPV4_SRC)) // same here I think
+ && entry.getMatch().get(MatchField.IPV4_SRC).equals(match.get(MatchField.IPV4_SRC))
&& entry.getMatch().get(MatchField.IP_DSCP).equals(match.get(MatchField.IP_DSCP)) // dscp and ecn replace tos
&& entry.getMatch().get(MatchField.IP_ECN).equals(match.get(MatchField.IP_ECN))) {
diff --git a/src/main/java/net/floodlightcontroller/flowcache/PriorityPendingQueue.java b/src/main/java/net/floodlightcontroller/flowcache/PriorityPendingQueue.java
index 5f90a24e50..15f216e3ae 100644
--- a/src/main/java/net/floodlightcontroller/flowcache/PriorityPendingQueue.java
+++ b/src/main/java/net/floodlightcontroller/flowcache/PriorityPendingQueue.java
@@ -23,6 +23,7 @@
* @author meiyang
*
*/
+@Deprecated
public class PriorityPendingQueue {
private LinkedBlockingQueue highPriorityQueue;
private LinkedBlockingQueue mediumPriorityQueue;
diff --git a/src/main/java/net/floodlightcontroller/forwarding/Forwarding.java b/src/main/java/net/floodlightcontroller/forwarding/Forwarding.java
index abf899c9ca..107ee80163 100644
--- a/src/main/java/net/floodlightcontroller/forwarding/Forwarding.java
+++ b/src/main/java/net/floodlightcontroller/forwarding/Forwarding.java
@@ -42,6 +42,8 @@
import net.floodlightcontroller.debugcounter.IDebugCounterService;
import net.floodlightcontroller.packet.Ethernet;
import net.floodlightcontroller.packet.IPv4;
+import net.floodlightcontroller.packet.TCP;
+import net.floodlightcontroller.packet.UDP;
import net.floodlightcontroller.routing.ForwardingBase;
import net.floodlightcontroller.routing.IRoutingDecision;
import net.floodlightcontroller.routing.IRoutingService;
@@ -58,6 +60,7 @@
import org.projectfloodlight.openflow.types.DatapathId;
import org.projectfloodlight.openflow.types.EthType;
import org.projectfloodlight.openflow.types.IPv4Address;
+import org.projectfloodlight.openflow.types.IpProtocol;
import org.projectfloodlight.openflow.types.MacAddress;
import org.projectfloodlight.openflow.types.OFBufferId;
import org.projectfloodlight.openflow.types.OFPort;
@@ -72,9 +75,6 @@
public class Forwarding extends ForwardingBase implements IFloodlightModule {
protected static Logger log = LoggerFactory.getLogger(Forwarding.class);
- protected static int DEFAULT_HARD_TIMEOUT = 0; // not final b/c could be configured from config file
- protected static int DEFAULT_IDLE_TIMEOUT = 5;
-
@Override
@LogMessageDoc(level="ERROR",
message="Unexpected decision made for this packet-in={}",
@@ -133,10 +133,10 @@ protected void doDropFlow(IOFSwitch sw, OFPacketIn pi, IRoutingDecision decision
// initialize match structure and populate it based on the packet in's match
Match.Builder mb = null;
if (decision.getMatch() != null) {
- /* TODO @Ryan This routing decision should be a match object with all appropriate fields set,
+ /* This routing decision should be a match object with all appropriate fields set,
* not just masked. If it's a decision that matches the packet we received, then simply setting
* the masks to the new match will create the same match in the end. We can just use the routing
- * match object instead (right?).
+ * match object instead.
*
* The Firewall is currently the only module/service that sets routing decisions in the context
* store (or instantiates any for that matter). It's disabled by default, so as-is a decision's
@@ -152,18 +152,19 @@ protected void doDropFlow(IOFSwitch sw, OFPacketIn pi, IRoutingDecision decision
U64 cookie = AppCookie.makeCookie(FORWARDING_APP_ID, 0);
fmb.setCookie(cookie)
- .setHardTimeout(DEFAULT_HARD_TIMEOUT)
- .setIdleTimeout(DEFAULT_IDLE_TIMEOUT)
+ .setHardTimeout(FLOWMOD_DEFAULT_HARD_TIMEOUT)
+ .setIdleTimeout(FLOWMOD_DEFAULT_IDLE_TIMEOUT)
.setBufferId(OFBufferId.NO_BUFFER)
.setMatch(mb.build())
- .setActions(actions); // empty list
+ .setActions(actions) // empty list
+ .setPriority(FLOWMOD_DEFAULT_PRIORITY);
try {
if (log.isDebugEnabled()) {
log.debug("write drop flow-mod sw={} match={} flow-mod={}",
new Object[] { sw, mb.build(), fmb.build() });
}
- boolean dampened = messageDamper.write(sw, fmb.build(), cntx);
+ boolean dampened = messageDamper.write(sw, fmb.build());
log.debug("OFMessage dampened: {}", dampened);
} catch (IOException e) {
log.error("Failure writing drop flow mod", e);
@@ -171,7 +172,7 @@ protected void doDropFlow(IOFSwitch sw, OFPacketIn pi, IRoutingDecision decision
}
protected void doForwardFlow(IOFSwitch sw, OFPacketIn pi, FloodlightContext cntx, boolean requestFlowRemovedNotifn) {
- OFPort inPort = (pi.getVersion().compareTo(OFVersion.OF_13) < 0 ? pi.getInPort() : pi.getMatch().get(MatchField.IN_PORT));
+ OFPort inPort = (pi.getVersion().compareTo(OFVersion.OF_12) < 0 ? pi.getInPort() : pi.getMatch().get(MatchField.IN_PORT));
// Check if we have the location of the destination
IDevice dstDevice = IDeviceService.fcStore.get(cntx, IDeviceService.CONTEXT_DST_DEVICE);
@@ -185,7 +186,7 @@ protected void doForwardFlow(IOFSwitch sw, OFPacketIn pi, FloodlightContext cntx
}
if (srcIsland == null) {
log.debug("No openflow island found for source {}/{}",
- sw.getId().toString(), (pi.getVersion().compareTo(OFVersion.OF_13) < 0 ? pi.getInPort() : pi.getMatch().get(MatchField.IN_PORT)));
+ sw.getId().toString(), inPort);
return;
}
@@ -198,7 +199,7 @@ protected void doForwardFlow(IOFSwitch sw, OFPacketIn pi, FloodlightContext cntx
DatapathId dstIsland = topologyService.getL2DomainId(dstSwDpid);
if ((dstIsland != null) && dstIsland.equals(srcIsland)) {
on_same_island = true;
- if ((sw.getId().equals(dstSwDpid)) && ((pi.getVersion().compareTo(OFVersion.OF_13) < 0 ? pi.getInPort() : pi.getMatch().get(MatchField.IN_PORT)).equals(dstDap.getPort()))) {
+ if (sw.getId().equals(dstSwDpid) && inPort.equals(dstDap.getPort())) {
on_same_if = true;
}
break;
@@ -219,7 +220,7 @@ protected void doForwardFlow(IOFSwitch sw, OFPacketIn pi, FloodlightContext cntx
if (log.isTraceEnabled()) {
log.trace("Both source and destination are on the same " +
"switch/port {}/{}, Action = NOP",
- sw.toString(), (pi.getVersion().compareTo(OFVersion.OF_13) < 0 ? pi.getInPort() : pi.getMatch().get(MatchField.IN_PORT)));
+ sw.toString(), inPort);
}
return;
}
@@ -279,6 +280,7 @@ protected void doForwardFlow(IOFSwitch sw, OFPacketIn pi, FloodlightContext cntx
// A retentive builder will remember all MatchFields of the parent the builder was generated from
// With a normal builder, all parent MatchFields will be lost if any MatchFields are added, mod, del
+ // TODO (This is a bug in Loxigen and the retentive builder is a workaround.)
Match.Builder mb = sw.getOFFactory().buildMatch();
mb.setExact(MatchField.IN_PORT, inPort)
.setExact(MatchField.ETH_SRC, srcMac)
@@ -288,6 +290,8 @@ protected void doForwardFlow(IOFSwitch sw, OFPacketIn pi, FloodlightContext cntx
mb.setExact(MatchField.VLAN_VID, OFVlanVidMatch.ofVlanVid(vlan));
}
+ // TODO Detect switch type and match to create hardware-implemented flow
+ // TODO Set option in config file to support specific or MAC-only matches
if (eth.getEtherType() == Ethernet.TYPE_IPv4) {
IPv4 ip = (IPv4) eth.getPayload();
IPv4Address srcIp = ip.getSourceAddress();
@@ -295,9 +299,21 @@ protected void doForwardFlow(IOFSwitch sw, OFPacketIn pi, FloodlightContext cntx
mb.setExact(MatchField.IPV4_SRC, srcIp)
.setExact(MatchField.IPV4_DST, dstIp)
.setExact(MatchField.ETH_TYPE, EthType.IPv4);
+
+ if (ip.getProtocol().equals(IpProtocol.TCP)) {
+ TCP tcp = (TCP) ip.getPayload();
+ mb.setExact(MatchField.IP_PROTO, IpProtocol.TCP)
+ .setExact(MatchField.TCP_SRC, tcp.getSourcePort())
+ .setExact(MatchField.TCP_DST, tcp.getDestinationPort());
+ } else if (ip.getProtocol().equals(IpProtocol.UDP)) {
+ UDP udp = (UDP) ip.getPayload();
+ mb.setExact(MatchField.IP_PROTO, IpProtocol.UDP)
+ .setExact(MatchField.UDP_SRC, udp.getSourcePort())
+ .setExact(MatchField.UDP_DST, udp.getDestinationPort());
+ }
} else if (eth.getEtherType() == Ethernet.TYPE_ARP) {
mb.setExact(MatchField.ETH_TYPE, EthType.ARP);
- } //TODO @Ryan should probably include other ethertypes
+ }
routeMatch = mb.build();
}
@@ -336,11 +352,12 @@ protected void doForwardFlow(IOFSwitch sw, OFPacketIn pi, FloodlightContext cntx
"out message to the switch",
recommendation=LogMessageDoc.CHECK_SWITCH)
protected void doFlood(IOFSwitch sw, OFPacketIn pi, FloodlightContext cntx) {
- if (topologyService.isIncomingBroadcastAllowed(sw.getId(), (pi.getVersion().compareTo(OFVersion.OF_13) < 0 ? pi.getInPort() : pi.getMatch().get(MatchField.IN_PORT))) == false) {
+ OFPort inPort = (pi.getVersion().compareTo(OFVersion.OF_12) < 0 ? pi.getInPort() : pi.getMatch().get(MatchField.IN_PORT));
+ if (topologyService.isIncomingBroadcastAllowed(sw.getId(), inPort) == false) {
if (log.isTraceEnabled()) {
log.trace("doFlood, drop broadcast packet, pi={}, " +
"from a blocked port, srcSwitch=[{},{}], linkInfo={}",
- new Object[] {pi, sw.getId(), (pi.getVersion().compareTo(OFVersion.OF_13) < 0 ? pi.getInPort() : pi.getMatch().get(MatchField.IN_PORT))});
+ new Object[] {pi, sw.getId(), inPort});
}
return;
}
@@ -357,7 +374,7 @@ protected void doFlood(IOFSwitch sw, OFPacketIn pi, FloodlightContext cntx) {
// set buffer-id, in-port and packet-data based on packet-in
pob.setBufferId(OFBufferId.NO_BUFFER);
- pob.setInPort((pi.getVersion().compareTo(OFVersion.OF_13) < 0 ? pi.getInPort() : pi.getMatch().get(MatchField.IN_PORT)));
+ pob.setInPort(inPort);
pob.setData(pi.getData());
try {
@@ -365,7 +382,7 @@ protected void doFlood(IOFSwitch sw, OFPacketIn pi, FloodlightContext cntx) {
log.trace("Writing flood PacketOut switch={} packet-in={} packet-out={}",
new Object[] {sw, pi, pob.build()});
}
- messageDamper.write(sw, pob.build(), cntx);
+ messageDamper.write(sw, pob.build());
} catch (IOException e) {
log.error("Failure writing PacketOut switch={} packet-in={} packet-out={}",
new Object[] {sw, pi, pob.build()}, e);
@@ -430,21 +447,25 @@ public void init(FloodlightModuleContext context) throws FloodlightModuleExcepti
Map configParameters = context.getConfigParams(this);
String tmp = configParameters.get("hard-timeout");
if (tmp != null) {
- DEFAULT_HARD_TIMEOUT = Integer.parseInt(tmp);
- log.info("Default hard timeout set to {}.", DEFAULT_HARD_TIMEOUT);
+ FLOWMOD_DEFAULT_HARD_TIMEOUT = Integer.parseInt(tmp);
+ log.info("Default hard timeout set to {}.", FLOWMOD_DEFAULT_HARD_TIMEOUT);
} else {
- log.info("Default hard timeout not configured. Using {}.", DEFAULT_HARD_TIMEOUT);
+ log.info("Default hard timeout not configured. Using {}.", FLOWMOD_DEFAULT_HARD_TIMEOUT);
}
tmp = configParameters.get("idle-timeout");
if (tmp != null) {
- DEFAULT_IDLE_TIMEOUT = Integer.parseInt(tmp);
- log.info("Default idle timeout set to {}.", DEFAULT_IDLE_TIMEOUT);
+ FLOWMOD_DEFAULT_IDLE_TIMEOUT = Integer.parseInt(tmp);
+ log.info("Default idle timeout set to {}.", FLOWMOD_DEFAULT_IDLE_TIMEOUT);
} else {
- log.info("Default idle timeout not configured. Using {}.", DEFAULT_IDLE_TIMEOUT);
+ log.info("Default idle timeout not configured. Using {}.", FLOWMOD_DEFAULT_IDLE_TIMEOUT);
+ }
+ tmp = configParameters.get("priority");
+ if (tmp != null) {
+ FLOWMOD_DEFAULT_PRIORITY = Integer.parseInt(tmp);
+ log.info("Default priority set to {}.", FLOWMOD_DEFAULT_PRIORITY);
+ } else {
+ log.info("Default priority not configured. Using {}.", FLOWMOD_DEFAULT_PRIORITY);
}
-
-
-
}
@Override
diff --git a/src/main/java/net/floodlightcontroller/hub/Hub.java b/src/main/java/net/floodlightcontroller/hub/Hub.java
index ed5efe236d..5504e589eb 100644
--- a/src/main/java/net/floodlightcontroller/hub/Hub.java
+++ b/src/main/java/net/floodlightcontroller/hub/Hub.java
@@ -66,7 +66,7 @@ public String getName() {
public Command receive(IOFSwitch sw, OFMessage msg, FloodlightContext cntx) {
OFMessage outMessage;
- HubType ht = HubType.USE_FLOW_MOD;
+ HubType ht = HubType.USE_PACKET_OUT;
switch (ht) {
case USE_FLOW_MOD:
outMessage = createHubFlowMod(sw, msg);
@@ -84,7 +84,6 @@ public Command receive(IOFSwitch sw, OFMessage msg, FloodlightContext cntx) {
private OFMessage createHubFlowMod(IOFSwitch sw, OFMessage msg) {
OFPacketIn pi = (OFPacketIn) msg;
OFFlowAdd.Builder fmb = sw.getOFFactory().buildFlowAdd();
-
fmb.setBufferId(pi.getBufferId())
.setXid(pi.getXid());
@@ -99,7 +98,7 @@ private OFMessage createHubFlowMod(IOFSwitch sw, OFMessage msg) {
private OFMessage createHubPacketOut(IOFSwitch sw, OFMessage msg) {
OFPacketIn pi = (OFPacketIn) msg;
OFPacketOut.Builder pob = sw.getOFFactory().buildPacketOut();
- pob.setBufferId(pi.getBufferId()).setXid(pi.getXid()).setInPort((pi.getVersion().compareTo(OFVersion.OF_13) < 0 ? pi.getInPort() : pi.getMatch().get(MatchField.IN_PORT)));
+ pob.setBufferId(pi.getBufferId()).setXid(pi.getXid()).setInPort((pi.getVersion().compareTo(OFVersion.OF_12) < 0 ? pi.getInPort() : pi.getMatch().get(MatchField.IN_PORT)));
// set actions
OFActionOutput.Builder actionBuilder = sw.getOFFactory().actions().buildOutput();
diff --git a/src/main/java/net/floodlightcontroller/learningswitch/LearningSwitch.java b/src/main/java/net/floodlightcontroller/learningswitch/LearningSwitch.java
index 7e347294c3..b2169e1964 100644
--- a/src/main/java/net/floodlightcontroller/learningswitch/LearningSwitch.java
+++ b/src/main/java/net/floodlightcontroller/learningswitch/LearningSwitch.java
@@ -48,7 +48,9 @@
import net.floodlightcontroller.core.module.IFloodlightModule;
import net.floodlightcontroller.core.module.IFloodlightService;
import net.floodlightcontroller.core.types.MacVlanPair;
+import net.floodlightcontroller.debugcounter.IDebugCounter;
import net.floodlightcontroller.debugcounter.IDebugCounterService;
+import net.floodlightcontroller.debugcounter.IDebugCounterService.MetaData;
import net.floodlightcontroller.restserver.IRestApiService;
import org.projectfloodlight.openflow.protocol.OFFlowMod;
@@ -61,6 +63,7 @@
import org.projectfloodlight.openflow.protocol.OFPacketIn;
import org.projectfloodlight.openflow.protocol.OFPacketOut;
import org.projectfloodlight.openflow.protocol.OFType;
+import org.projectfloodlight.openflow.protocol.OFVersion;
import org.projectfloodlight.openflow.protocol.action.OFAction;
import org.projectfloodlight.openflow.types.IpProtocol;
import org.projectfloodlight.openflow.types.MacAddress;
@@ -79,8 +82,12 @@ public class LearningSwitch
// Module dependencies
protected IFloodlightProviderService floodlightProviderService;
- protected IDebugCounterService debugCounterService;
protected IRestApiService restApiService;
+
+ protected IDebugCounterService debugCounterService;
+ private IDebugCounter counterFlowMod;
+ private IDebugCounter counterPacketOut;
+
// Stores the learned state for each switch
protected Map> macVlanToSwitchPortMap;
@@ -166,7 +173,7 @@ protected void removeFromPortMap(IOFSwitch sw, MacAddress mac, VlanVid vlan) {
*/
public OFPort getFromPortMap(IOFSwitch sw, MacAddress mac, VlanVid vlan) {
if (vlan == VlanVid.FULL_MASK) {
- vlan = VlanVid.FULL_MASK;
+ vlan = VlanVid.ofVlan(0);
}
Map swMap = macVlanToSwitchPortMap.get(sw);
if (swMap != null) {
@@ -237,7 +244,7 @@ private void writeFlowMod(IOFSwitch sw, OFFlowModCommand command, OFBufferId buf
if (command == OFFlowModCommand.DELETE) {
fmb = sw.getOFFactory().buildFlowDelete();
} else {
- fmb = sw.getOFFactory().buildFlowModify();
+ fmb = sw.getOFFactory().buildFlowAdd();
}
fmb.setMatch(match);
fmb.setCookie((U64.of(LearningSwitch.LEARNING_SWITCH_COOKIE)));
@@ -245,7 +252,7 @@ private void writeFlowMod(IOFSwitch sw, OFFlowModCommand command, OFBufferId buf
fmb.setHardTimeout(LearningSwitch.FLOWMOD_DEFAULT_HARD_TIMEOUT);
fmb.setPriority(LearningSwitch.FLOWMOD_PRIORITY);
fmb.setBufferId(bufferId);
- fmb.setOutPort((command == OFFlowModCommand.DELETE) ? outPort : OFPort.ANY);
+ fmb.setOutPort((command == OFFlowModCommand.DELETE) ? OFPort.ANY : outPort);
Set sfmf = new HashSet();
if (command != OFFlowModCommand.DELETE) {
sfmf.add(OFFlowModFlags.SEND_FLOW_REM);
@@ -262,7 +269,7 @@ private void writeFlowMod(IOFSwitch sw, OFFlowModCommand command, OFBufferId buf
// type/len are set because it is OFActionOutput,
// and port, max_len are arguments to this constructor
List al = new ArrayList();
- al.add(sw.getOFFactory().actions().buildOutput().setPort(outPort).build());
+ al.add(sw.getOFFactory().actions().buildOutput().setPort(outPort).setMaxLen(Integer.MAX_VALUE).build());
fmb.setActions(al);
if (log.isTraceEnabled()) {
@@ -270,7 +277,7 @@ private void writeFlowMod(IOFSwitch sw, OFFlowModCommand command, OFBufferId buf
new Object[]{ sw, (command == OFFlowModCommand.DELETE) ? "deleting" : "adding", fmb.build() });
}
- //TODO @Ryan counterStore.updatePktOutFMCounterStoreLocal(sw, fmb.build());
+ counterFlowMod.increment();
// and write it out
sw.write(fmb.build());
@@ -290,11 +297,13 @@ private void pushPacket(IOFSwitch sw, Match match, OFPacketIn pi, OFPort outport
if (pi == null) {
return;
}
+
+ OFPort inPort = (pi.getVersion().compareTo(OFVersion.OF_12) < 0 ? pi.getInPort() : pi.getMatch().get(MatchField.IN_PORT));
// The assumption here is (sw) is the switch that generated the
// packet-in. If the input port is the same as output port, then
// the packet-out should be ignored.
- if (pi.getInPort().equals(outport)) {
+ if (inPort.equals(outport)) {
if (log.isDebugEnabled()) {
log.debug("Attempting to do packet-out to the same " +
"interface as packet-in. Dropping packet. " +
@@ -313,7 +322,7 @@ private void pushPacket(IOFSwitch sw, Match match, OFPacketIn pi, OFPort outport
// set actions
List actions = new ArrayList();
- actions.add(sw.getOFFactory().actions().buildOutput().setPort(outport).build());
+ actions.add(sw.getOFFactory().actions().buildOutput().setPort(outport).setMaxLen(Integer.MAX_VALUE).build());
pob.setActions(actions);
@@ -327,7 +336,7 @@ private void pushPacket(IOFSwitch sw, Match match, OFPacketIn pi, OFPort outport
pob.setBufferId(pi.getBufferId());
}
- pob.setInPort(pi.getInPort());
+ pob.setInPort(inPort);
// If the buffer id is none or the switch doesn's support buffering
// we send the data with the packet out
@@ -336,7 +345,7 @@ private void pushPacket(IOFSwitch sw, Match match, OFPacketIn pi, OFPort outport
pob.setData(packetData);
}
- //TODO @Ryan counterStore.updatePktOutFMCounterStoreLocal(sw, pob.build());
+ counterPacketOut.increment();
sw.write(pob.build());
}
@@ -360,11 +369,11 @@ private void writePacketOutForPacketIn(IOFSwitch sw, OFPacketIn packetInMessage,
// Set buffer_id, in_port, actions_len
pob.setBufferId(packetInMessage.getBufferId());
- pob.setInPort(packetInMessage.getInPort());
+ pob.setInPort(packetInMessage.getVersion().compareTo(OFVersion.OF_12) < 0 ? packetInMessage.getInPort() : packetInMessage.getMatch().get(MatchField.IN_PORT));
// set actions
List actions = new ArrayList(1);
- actions.add(sw.getOFFactory().actions().buildOutput().setPort(egressPort).build());
+ actions.add(sw.getOFFactory().actions().buildOutput().setPort(egressPort).setMaxLen(Integer.MAX_VALUE).build());
pob.setActions(actions);
// set data - only if buffer_id == -1
@@ -374,7 +383,7 @@ private void writePacketOutForPacketIn(IOFSwitch sw, OFPacketIn packetInMessage,
}
// and write it out
- //TODO @Ryan counterStore.updatePktOutFMCounterStoreLocal(sw, pob.build());
+ counterPacketOut.increment();
sw.write(pob.build());
}
@@ -390,10 +399,22 @@ private void writePacketOutForPacketIn(IOFSwitch sw, OFPacketIn packetInMessage,
*/
private Command processPacketInMessage(IOFSwitch sw, OFPacketIn pi, FloodlightContext cntx) {
// Read in packet data headers by using OFMatch
- Match.Builder mb = pi.getMatch().createBuilder();
- MacAddress sourceMac = mb.get(MatchField.ETH_SRC);
- MacAddress destMac = mb.get(MatchField.ETH_DST);
- OFVlanVidMatch vlan = mb.get(MatchField.VLAN_VID);
+ Match m = pi.getMatch();
+ OFPort inPort = (pi.getVersion().compareTo(OFVersion.OF_12) < 0 ? pi.getInPort() : pi.getMatch().get(MatchField.IN_PORT));
+ MacAddress sourceMac = m.get(MatchField.ETH_SRC);
+ MacAddress destMac = m.get(MatchField.ETH_DST);
+ OFVlanVidMatch vlan = m.get(MatchField.VLAN_VID);
+
+ if (sourceMac == null) {
+ sourceMac = MacAddress.NONE;
+ }
+ if (destMac == null) {
+ destMac = MacAddress.NONE;
+ }
+ if (vlan == null) {
+ vlan = OFVlanVidMatch.UNTAGGED;
+ }
+
if ((destMac.getLong() & 0xfffffffffff0L) == 0x0180c2000000L) {
if (log.isTraceEnabled()) {
log.trace("ignoring packet addressed to 802.1D/Q reserved addr: switch {} vlan {} dest MAC {}",
@@ -403,7 +424,7 @@ private Command processPacketInMessage(IOFSwitch sw, OFPacketIn pi, FloodlightCo
}
if ((sourceMac.getLong() & 0x010000000000L) == 0) {
// If source MAC is a unicast address, learn the port for this MAC/VLAN
- this.addToPortMap(sw, sourceMac, vlan.getVlanVid(), pi.getInPort());
+ this.addToPortMap(sw, sourceMac, vlan.getVlanVid(), inPort);
}
// Now output flow-mod and/or packet
@@ -415,7 +436,7 @@ private Command processPacketInMessage(IOFSwitch sw, OFPacketIn pi, FloodlightCo
// from port map whenever a flow expires, so you would still see
// a lot of floods.
this.writePacketOutForPacketIn(sw, pi, OFPort.FLOOD);
- } else if (outPort.equals(mb.get(MatchField.IN_PORT))) {
+ } else if (outPort.equals(inPort)) {
log.trace("ignoring packet that arrived on same port as learned destination:"
+ " switch {} vlan {} dest MAC {} port {}",
new Object[]{ sw, vlan, destMac.toString(), outPort.getPortNumber() });
@@ -430,29 +451,34 @@ private Command processPacketInMessage(IOFSwitch sw, OFPacketIn pi, FloodlightCo
// FIXME: current HP switches ignore DL_SRC and DL_DST fields, so we have to match on
// NW_SRC and NW_DST as well
// We write FlowMods with Buffer ID none then explicitly PacketOut the buffered packet
- this.pushPacket(sw, mb.build(), pi, outPort);
- this.writeFlowMod(sw, OFFlowModCommand.ADD, OFBufferId.NO_BUFFER, mb.build(), outPort);
+ this.pushPacket(sw, m, pi, outPort);
+ this.writeFlowMod(sw, OFFlowModCommand.ADD, OFBufferId.NO_BUFFER, m, outPort);
if (LEARNING_SWITCH_REVERSE_FLOW) {
- Match.Builder mb2 = mb.build().createBuilder();
- mb2.setExact(MatchField.ETH_SRC, mb.get(MatchField.ETH_DST))
- .setExact(MatchField.ETH_DST, mb.get(MatchField.ETH_SRC))
- .setExact(MatchField.IPV4_SRC, mb.get(MatchField.IPV4_DST))
- .setExact(MatchField.IPV4_DST, mb.get(MatchField.IPV4_SRC));
- if (mb.get(MatchField.IP_PROTO).equals(IpProtocol.TCP)) {
- mb2.setExact(MatchField.TCP_SRC, mb.get(MatchField.TCP_DST))
- .setExact(MatchField.TCP_DST, mb.get(MatchField.TCP_SRC));
- } else if (mb.get(MatchField.IP_PROTO).equals(IpProtocol.UDP)) {
- mb2.setExact(MatchField.UDP_SRC, mb.get(MatchField.UDP_DST))
- .setExact(MatchField.UDP_DST, mb.get(MatchField.UDP_SRC));
- } else if (mb.get(MatchField.IP_PROTO).equals(IpProtocol.SCTP)) {
- mb2.setExact(MatchField.SCTP_SRC, mb.get(MatchField.SCTP_DST))
- .setExact(MatchField.SCTP_DST, mb.get(MatchField.SCTP_SRC));
+ Match.Builder mb2 = m.createBuilder();
+ mb2.setExact(MatchField.ETH_SRC, m.get(MatchField.ETH_DST))
+ .setExact(MatchField.ETH_DST, m.get(MatchField.ETH_SRC))
+ .setExact(MatchField.VLAN_VID, m.get(MatchField.VLAN_VID))
+ .setExact(MatchField.ETH_TYPE, m.get(MatchField.ETH_TYPE))
+ .setExact(MatchField.IPV4_SRC, m.get(MatchField.IPV4_DST))
+ .setExact(MatchField.IPV4_DST, m.get(MatchField.IPV4_SRC));
+ if (m.get(MatchField.IP_PROTO).equals(IpProtocol.TCP)) {
+ mb2.setExact(MatchField.IP_PROTO, IpProtocol.TCP)
+ .setExact(MatchField.TCP_SRC, m.get(MatchField.TCP_DST))
+ .setExact(MatchField.TCP_DST, m.get(MatchField.TCP_SRC));
+ } else if (m.get(MatchField.IP_PROTO).equals(IpProtocol.UDP)) {
+ mb2.setExact(MatchField.IP_PROTO, IpProtocol.UDP)
+ .setExact(MatchField.UDP_SRC, m.get(MatchField.UDP_DST))
+ .setExact(MatchField.UDP_DST, m.get(MatchField.UDP_SRC));
+ } else if (m.get(MatchField.IP_PROTO).equals(IpProtocol.SCTP)) {
+ mb2.setExact(MatchField.IP_PROTO, IpProtocol.SCTP)
+ .setExact(MatchField.SCTP_SRC, m.get(MatchField.SCTP_DST))
+ .setExact(MatchField.SCTP_DST, m.get(MatchField.SCTP_SRC));
} else {
- log.debug("In writing reverse LS flow, could not determine L4 proto (was int " + mb.get(MatchField.IP_PROTO).getIpProtocolNumber() + ")");
+ log.debug("In writing reverse LS flow, could not determine L4 proto (was int " + m.get(MatchField.IP_PROTO).getIpProtocolNumber() + ")");
}
mb2.setExact(MatchField.IN_PORT, outPort);
- this.writeFlowMod(sw, OFFlowModCommand.ADD, OFBufferId.NO_BUFFER, mb2.build(), mb.get(MatchField.IN_PORT));
+ this.writeFlowMod(sw, OFFlowModCommand.ADD, OFBufferId.NO_BUFFER, mb2.build(), inPort);
}
}
return Command.CONTINUE;
@@ -490,13 +516,16 @@ private Command processFlowRemovedMessage(IOFSwitch sw, OFFlowRemoved flowRemove
.setExact(MatchField.IPV4_SRC, match.get(MatchField.IPV4_DST))
.setExact(MatchField.IPV4_DST, match.get(MatchField.IPV4_SRC));
if (match.get(MatchField.IP_PROTO).equals(IpProtocol.TCP)) {
- mb.setExact(MatchField.TCP_SRC, match.get(MatchField.TCP_DST))
+ mb.setExact(MatchField.IP_PROTO, IpProtocol.TCP)
+ .setExact(MatchField.TCP_SRC, match.get(MatchField.TCP_DST))
.setExact(MatchField.TCP_DST, match.get(MatchField.TCP_SRC));
} else if (match.get(MatchField.IP_PROTO).equals(IpProtocol.UDP)) {
- mb.setExact(MatchField.UDP_SRC, match.get(MatchField.UDP_DST))
+ mb.setExact(MatchField.IP_PROTO, IpProtocol.UDP)
+ .setExact(MatchField.UDP_SRC, match.get(MatchField.UDP_DST))
.setExact(MatchField.UDP_DST, match.get(MatchField.UDP_SRC));
} else if (match.get(MatchField.IP_PROTO).equals(IpProtocol.SCTP)) {
- mb.setExact(MatchField.SCTP_SRC, match.get(MatchField.SCTP_DST))
+ mb.setExact(MatchField.IP_PROTO, IpProtocol.SCTP)
+ .setExact(MatchField.SCTP_SRC, match.get(MatchField.SCTP_DST))
.setExact(MatchField.SCTP_DST, match.get(MatchField.SCTP_SRC));
} else {
log.debug("In writing reverse LS flow, could not determine L4 proto (was int " + mb.get(MatchField.IP_PROTO).getIpProtocolNumber() + ")");
@@ -610,5 +639,9 @@ public void startUp(FloodlightModuleContext context) {
log.debug("FlowMod idle timeout set to {} seconds", FLOWMOD_DEFAULT_IDLE_TIMEOUT);
log.debug("FlowMod hard timeout set to {} seconds", FLOWMOD_DEFAULT_HARD_TIMEOUT);
log.debug("FlowMod priority set to {}", FLOWMOD_PRIORITY);
+
+ debugCounterService.registerModule(this.getName());
+ counterFlowMod = debugCounterService.registerCounter(this.getName(), "flow-mods-written", "Flow mods written to switches by LearningSwitch", MetaData.WARN);
+ counterPacketOut = debugCounterService.registerCounter(this.getName(), "packet-outs-written", "Packet outs written to switches by LearningSwitch", MetaData.WARN);
}
}
diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
index 5ca1b5eb7a..d075b70114 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
@@ -123,6 +123,8 @@
* LinkTuple will be indexed into switchLinks for both src.id and dst.id, and
* portLinks for each src and dst -The updates queue is only added to from
* within a held write lock
+ *
+ * @edited Ryan Izard, rizard@g.clemson.edu, ryan.izard@bigswitch.com
*/
@LogMessageCategory("Network Topology")
public class LinkDiscoveryManager implements IOFMessageListener,
@@ -250,6 +252,9 @@ public class LinkDiscoveryManager implements IOFMessageListener,
*/
protected LinkedBlockingQueue quarantineQueue;
protected LinkedBlockingQueue maintenanceQueue;
+ protected LinkedBlockingQueue toRemoveFromQuarantineQueue;
+ protected LinkedBlockingQueue toRemoveFromMaintenanceQueue;
+
/**
* Quarantine task
*/
@@ -565,7 +570,7 @@ protected Command handlePacketIn(DatapathId sw, OFPacketIn pi,
FloodlightContext cntx) {
Ethernet eth = IFloodlightProviderService.bcStore.get(cntx,
IFloodlightProviderService.CONTEXT_PI_PAYLOAD);
- OFPort inPort = (pi.getVersion().compareTo(OFVersion.OF_13) < 0 ? pi.getInPort() : pi.getMatch().get(MatchField.IN_PORT));
+ OFPort inPort = (pi.getVersion().compareTo(OFVersion.OF_12) < 0 ? pi.getInPort() : pi.getMatch().get(MatchField.IN_PORT));
if (eth.getPayload() instanceof BSN) {
BSN bsn = (BSN) eth.getPayload();
if (bsn == null) return Command.STOP;
@@ -595,7 +600,7 @@ protected Command handlePacketIn(DatapathId sw, OFPacketIn pi,
}
// If packet-in is from a quarantine port, stop processing.
- NodePortTuple npt = new NodePortTuple(sw, (pi.getVersion().compareTo(OFVersion.OF_13) < 0 ? pi.getInPort() : pi.getMatch().get(MatchField.IN_PORT)));
+ NodePortTuple npt = new NodePortTuple(sw, inPort);
if (quarantineQueue.contains(npt)) {
ctrQuarantineDrops.increment();
return Command.STOP;
@@ -782,15 +787,16 @@ else if (lldptlv.getValue()[0] == TLV_DIRECTION_VALUE_REVERSE[0])
addOrUpdateLink(reverseLink, reverseInfo);
}
- // Remove the node ports from the quarantine and maintenance queues.
+ // Queue removal of the node ports from the quarantine and maintenance queues.
NodePortTuple nptSrc = new NodePortTuple(lt.getSrc(),
lt.getSrcPort());
NodePortTuple nptDst = new NodePortTuple(lt.getDst(),
lt.getDstPort());
- removeFromQuarantineQueue(nptSrc);
- removeFromMaintenanceQueue(nptSrc);
- removeFromQuarantineQueue(nptDst);
- removeFromMaintenanceQueue(nptDst);
+
+ flagToRemoveFromQuarantineQueue(nptSrc);
+ flagToRemoveFromMaintenanceQueue(nptSrc);
+ flagToRemoveFromQuarantineQueue(nptDst);
+ flagToRemoveFromMaintenanceQueue(nptDst);
// Consume this message
ctrLldpEol.increment();
@@ -912,16 +918,22 @@ public void run() {
* @param npt
*/
protected void addToQuarantineQueue(NodePortTuple npt) {
- if (quarantineQueue.contains(npt) == false)
+ if (quarantineQueue.contains(npt) == false) {
quarantineQueue.add(npt);
+ }
}
/**
* Remove a switch port from the quarantine queue.
- */
+ *
protected void removeFromQuarantineQueue(NodePortTuple npt) {
// Remove all occurrences of the node port tuple from the list.
while (quarantineQueue.remove(npt));
+ }*/
+ protected void flagToRemoveFromQuarantineQueue(NodePortTuple npt) {
+ if (toRemoveFromQuarantineQueue.contains(npt) == false) {
+ toRemoveFromQuarantineQueue.add(npt);
+ }
}
/**
@@ -939,10 +951,15 @@ protected void addToMaintenanceQueue(NodePortTuple npt) {
* Remove a switch port from maintenance queue.
*
* @param npt
- */
+ *
protected void removeFromMaintenanceQueue(NodePortTuple npt) {
// Remove all occurrences of the node port tuple from the queue.
while (maintenanceQueue.remove(npt));
+ } */
+ protected void flagToRemoveFromMaintenanceQueue(NodePortTuple npt) {
+ if (toRemoveFromMaintenanceQueue.contains(npt) == false) {
+ toRemoveFromMaintenanceQueue.add(npt);
+ }
}
/**
@@ -958,7 +975,24 @@ protected void processBDDPLists() {
while (count < BDDP_TASK_SIZE && quarantineQueue.peek() != null) {
NodePortTuple npt;
npt = quarantineQueue.remove();
- sendDiscoveryMessage(npt.getNodeId(), npt.getPortId(), false, false);
+ /*
+ * Do not send a discovery message if we already have received one
+ * from another switch on this same port. In other words, if
+ * handleLldp() determines there is a new link between two ports of
+ * two switches, then there is no need to re-discover the link again.
+ *
+ * By flagging the item in handleLldp() and waiting to remove it
+ * from the queue when processBDDPLists() runs, we can guarantee a
+ * PORT_STATUS update is generated and dispatched below by
+ * generateSwitchPortStatusUpdate().
+ */
+ if (!toRemoveFromQuarantineQueue.remove(npt)) {
+ sendDiscoveryMessage(npt.getNodeId(), npt.getPortId(), false, false);
+ }
+ /*
+ * Still add the item to the list though, so that the PORT_STATUS update
+ * is generated below at the end of this function.
+ */
nptList.add(npt);
count++;
}
@@ -967,7 +1001,13 @@ protected void processBDDPLists() {
while (count < BDDP_TASK_SIZE && maintenanceQueue.peek() != null) {
NodePortTuple npt;
npt = maintenanceQueue.remove();
- sendDiscoveryMessage(npt.getNodeId(), npt.getPortId(), false, false);
+ /*
+ * Same as above, except we don't care about the PORT_STATUS message;
+ * we only want to avoid sending the discovery message again.
+ */
+ if (!toRemoveFromMaintenanceQueue.remove(npt)) {
+ sendDiscoveryMessage(npt.getNodeId(), npt.getPortId(), false, false);
+ }
count++;
}
@@ -986,7 +1026,6 @@ private void generateSwitchPortStatusUpdate(DatapathId sw, OFPort port) {
if (ofp == null) return;
Set srcPortState = ofp.getState();
- //TODO @Ryan verify this is equivalent boolean portUp = ((srcPortState & OFPortState.OFPPS_STP_MASK.getValue()) != OFPortState.OFPPS_STP_BLOCK.getValue());
boolean portUp = !srcPortState.contains(OFPortState.STP_BLOCK);
if (portUp) {
@@ -1142,9 +1181,7 @@ protected void sendDiscoveryMessage(DatapathId sw, OFPort port,
* Send LLDPs to all switch-ports
*/
protected void discoverOnAllPorts() {
- if (log.isTraceEnabled()) {
- log.trace("Sending LLDP packets out of all the enabled ports");
- }
+ log.info("Sending LLDP packets out of all the enabled ports");
// Send standard LLDPs
for (DatapathId sw : switchService.getAllSwitchDpids()) {
IOFSwitch iofSwitch = switchService.getSwitch(sw);
@@ -1167,8 +1204,6 @@ protected void discoverOnAllPorts() {
}
protected UpdateOperation getUpdateOperation(OFPortState srcPortState, OFPortState dstPortState) {
- //TODO @Ryan verify this is equivalent
- //boolean added = (((srcPortState & OFPortState.STP_MASK) != OFPortState.STP_BLOCK) && ((dstPortState & OFPortState.STP_MASK) != OFPortState.STP_BLOCK));
boolean added = ((srcPortState != OFPortState.STP_BLOCK) && (dstPortState != OFPortState.STP_BLOCK));
if (added) {
@@ -1179,8 +1214,6 @@ protected UpdateOperation getUpdateOperation(OFPortState srcPortState, OFPortSta
}
protected UpdateOperation getUpdateOperation(OFPortState srcPortState) {
- //TODO @Ryan verify this too
- //boolean portUp = ((srcPortState & OFPortState.STP_MASK) != OFPortState.STP_BLOCK);
boolean portUp = (srcPortState != OFPortState.STP_BLOCK);
if (portUp) {
@@ -1693,60 +1726,6 @@ public void rowsModified(String tableName, Set