commits.log

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<OFMessage>, 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<OFMessage>, 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 = <int> 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