Floodlight subtree update
Squashed commit of the following: commit ddd41071e7369a1bac3fc8d357215c8bc7b9204d Author: Gregor Maier <gregor.maier@bigswitch.com> Date: Thu Feb 14 12:52:36 2013 -0800 Use more aggressive findbugs settings for eclipse plugin. Need to run "ant eclipse" to get the new settings. commit 2a3d7c23b8762007476d2f3d367244530260e7d0 Author: Gregor Maier <gregor.maier@bigswitch.com> Date: Wed Feb 13 16:27:06 2013 -0800 ant eclipse: create project specific config for FindBugs plugin When creating the eclipse project files we also create a project specific config for FindBugs that sets the exclude file correctly. commit d8a8cc71313abf5a0aae76c2574f6783ad31b345 Author: Gregor Maier <gregor.maier@bigswitch.com> Date: Wed Feb 13 16:15:37 2013 -0800 Don't put project specific eclipse settings in git commit f89469bf4c88e7da04b575f6dc6b28cf69e8ea0f Author: Kanzhe Jiang <kanzhe.jiang@bigswitch.com> Date: Wed Feb 13 00:03:07 2013 -0800 add debug log commit 0c786a373fd9c3de825a6a75c66f90898da34ed0 Author: Kanzhe Jiang <kanzhe.jiang@bigswitch.com> Date: Tue Feb 12 22:19:21 2013 -0800 order the IDeviceListeners commit bae3d9582e7dfb82e6485ad50778e894695d6ba7 Author: Andreas Wundsam <andreas.wundsam@bigswitch.com> Date: Tue Feb 12 16:21:13 2013 -0800 OFSwitch: add caveat about undocumented behavior commit a448809df39b3391201ce4991225e4525827dfe7 Author: Andreas Wundsam <andreas.wundsam@bigswitch.com> Date: Tue Feb 12 16:19:20 2013 -0800 OFSwitchBase: fix broadcast portBroadcastCacheHitMap commit 4d511d5535209120c29fe921c49cc8cdfa009781 Author: Srinivasan Ramasubramanian <srini@bigswitch.com> Date: Sun Feb 10 10:20:59 2013 -0800 Fix findbugs issue in Forwarding module. commit f808e3f3973228080630c3cd5e4a4f9bf3778098 Author: Srinivasan Ramasubramanian <srini@bigswitch.com> Date: Sat Feb 9 09:29:33 2013 -0800 Minor changes to autoportfast default. Remove "final" to allow default to be changed, if needed. commit 1b3727767cc097db4e5488abf7ea0c0860b02369 Author: Andreas Wundsam <andreas.wundsam@bigswitch.com> Date: Fri Feb 8 18:15:20 2013 -0800 undo SuppressWarning change commit 3da6ad5c90d1a521e27d52b5c374435bfa47dd81 Author: Andreas Wundsam <andreas.wundsam@bigswitch.com> Date: Fri Feb 8 11:32:24 2013 -0800 floodlight/build.xml: remove superfluous echo commit 4c08f11712c143e0668b86fa57c0a0f37bc8a093 Author: Andreas Wundsam <andreas.wundsam@bigswitch.com> Date: Thu Feb 7 14:24:49 2013 -0800 add findbugs-exclude.xml commit e3ff611e95de692ad86bcabb80fa22b169df0d87 Author: Andreas Wundsam <andreas.wundsam@bigswitch.com> Date: Fri Feb 8 10:17:59 2013 -0800 add jars for Findbugs ignore annotations Conflicts: floodlight/build.xml floodlight/src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java commit a70d25ebd62f70af0197584079faaed06df33604 Author: Rob Adams <rob.adams@bigswitch.com> Date: Fri Feb 8 13:46:38 2013 -0800 Remove unused imports commit 20677f687e707d4dcc7b7f4b4c5875b18a94f7c1 Author: Sudeep Modi <sudeep.modi@bigswitch.com> Date: Thu Feb 7 18:33:00 2013 -0800 Use a set instead of a list to disallow duplicate entries for ignoring MAC commit e04417fb59c84ad45c0603946ae49609987c9f87 Author: Sudeep Modi <sudeep.modi@bigswitch.com> Date: Thu Feb 7 18:26:01 2013 -0800 Add functionality to link discovery manager to ignore packets from certain MAC addresses commit 2a96cb044b517206f04049ca4990ec1d93ef5d02 Author: Rob Adams <rob.adams@bigswitch.com> Date: Thu Feb 7 18:03:18 2013 -0800 Fix a number of issues identified by FindBugs commit fa73be54a2763ef429f092a23abfd917a8099f09 Author: Rob Adams <rob.adams@bigswitch.com> Date: Wed Feb 6 18:02:27 2013 -0800 Remove 'assert' from unit tests commit f97859da6333bc05ac80275e770526e8f018179d Merge: 5f0f2d5 1d5e532 Author: Saurav Das <saurav.das@bigswitch.com> Date: Wed Feb 6 11:25:38 2013 -0800 Merge branch 'master' of github.com:bigswitch/bigswitchcontroller commit 5f0f2d525c546270a626beb40b2793e961823ccd Author: Saurav Das <saurav.das@bigswitch.com> Date: Wed Feb 6 11:23:08 2013 -0800 Handling portnum correctly in portstats reply when serializing for json in response to a rest call commit 1d5e532141baf96392a55c101fb6cf38a5e75d90 Author: Srinivasan Ramasubramanian <srini@bigswitch.com> Date: Tue Feb 5 22:41:32 2013 -0800 Minor code fixes due to FindBugs report. commit e4a73a37c9b36c7744900cdfec14cb7de177608f Merge: 562be45 acad9ef Author: abat <abat@bigswitch.com> Date: Tue Feb 5 17:21:46 2013 -0800 Merge into master from pull request #2491: Fix NPE in LinkDiscoveryManager.java commit acad9eff8015f2758c588fd98fd6fdc736982f08 Author: Srinivasan Ramasubramanian <srini@bigswitch.com> Date: Tue Feb 5 16:47:35 2013 -0800 Fix NPE in LinkDiscoveryManager.java commit 562be4530a43a23d5c31f3204d51639c6b7a8faa Merge: f5e0dc8 13fde15 Author: abat <abat@bigswitch.com> Date: Tue Feb 5 15:06:38 2013 -0800 Merge into master from pull request #2489: Bugfix. Should check if portBroadcastDomainLinks contains NodePortTuple, and not long. commit 13fde1562d69155fa83d5840e33ac58d5e26adc5 Author: Srinivasan Ramasubramanian <srini@bigswitch.com> Date: Tue Feb 5 14:55:23 2013 -0800 Bugfix. Should check if portBroadcastDomainLinks contains NodePortTuple, and not long. commit f5e0dc8f4152b5162f7f4246e4124ee2b916c10b Merge: 631cc42 5a8edcc Author: abat <abat@bigswitch.com> Date: Tue Feb 5 14:01:24 2013 -0800 Merge into master from pull request #2488: Fix consistency and rest output for None/null values commit 5a8edccec90cc09df2eb2a59bb3d1000b38e8d4a Author: Ronald Li <ronald.li@bigswitch.com> Date: Tue Feb 5 13:14:09 2013 -0800 Make null values not show up in the rest output commit 631cc42d5eee22335738fd6dd7c88fc5e193f407 Author: Srinivasan Ramasubramanian <srini@bigswitch.com> Date: Tue Feb 5 09:44:39 2013 -0800 Option to flush or not flush flow tables on a switch through properties file. commit 8f1917bd34be3c81f4fc049b4736e4fbe3f1cd0e Author: Shudong Zhou <shudongzhou@gmail.com> Date: Thu Jan 31 00:59:16 2013 -0800 Fix singleton task initialization commit dd361d41dafca32cae1f2e8f6be0725633082dc5 Author: Shudong Zhou <shudongzhou@gmail.com> Date: Wed Jan 30 21:58:22 2013 -0800 Send HA role request to switch when master controller gets permission error commit c18d87699bda09c07707a36e026fb5a4e6301e0d Author: Shudong Zhou <shudongzhou@gmail.com> Date: Wed Jan 30 20:33:51 2013 -0800 Dampen frequency of HA role transitions commit ed7c1bd030ce6826510c52427ccea1f8631e09fa Author: Shudong Zhou <shudongzhou@gmail.com> Date: Wed Jan 30 20:04:43 2013 -0800 Update unit test for HA role change commit 32dc0b95b34a82902f1309aebbe469b4b713b356 Merge: 4963170 63a85a2 Author: abat <abat@bigswitch.com> Date: Wed Jan 30 16:27:28 2013 -0800 Merge into master from pull request #2414: lower a message level to trace commit 63a85a28be92ca5c14d826198a572c9e408b0343 Author: Kanzhe Jiang <kanzhe.jiang@bigswitch.com> Date: Wed Jan 30 14:55:52 2013 -0800 lower log level to info commit 49631705e7393452cd6825ae126e053c6ff3f3a1 Author: Gregor Maier <gregor.maier@bigswitch.com> Date: Wed Jan 30 10:10:07 2013 -0800 Adding debug logging to SwitchPortMatcher. Tweak log levels. We'll now log when SwitchPortMatcher can't find the switch or port for a packet its trying to match. commit ca75639f53067087be0b308e3aa72e07bf75d924 Author: Srinivasan Ramasubramanian <srini@bigswitch.com> Date: Tue Jan 29 12:20:13 2013 -0800 Bug fix: When tunnel links are identified, they should not be added to topology switchportlinks. Update unit tests. commit 3ee7da2f062834929212a568bf07cb462eb41979 Author: kwanggithub <kwang@clemson.edu> Date: Mon Jan 28 11:51:52 2013 -0800 refactor loadbalancer to not use StaticFlowEntries commit a0cac00f334970199ca2af9679d927d69fa539ab Author: Kanzhe Jiang <kanzhe.jiang@bigswitch.com> Date: Sun Jan 27 18:05:23 2013 -0800 notify listeners for device classification first, then listeners for reconcile. commit 5925b52aa2f0d7aae290dd22d30626bf81e879c3 Author: Srinivasan Ramasubramanian <srini@bigswitch.com> Date: Wed Jan 23 01:24:29 2013 -0800 Refactoring some methods to better support extensibility. commit ae577282bdc906262cf3fed44eabf685090ca60e Merge: 9f1613e 1d88cbf Author: abat <abat@bigswitch.com> Date: Mon Jan 21 17:22:21 2013 -0800 Merge into master from pull request #2255 commit 9f1613e936c5b9485a798486e19670b8dc2dd8eb Author: Gregor Maier <gregor.maier@bigswitch.com> Date: Sat Jan 19 23:25:48 2013 -0800 Don't use vlans from devices. Use explicitly specified VLAN. commit 1d88cbff4bc53f8936145abc8ca653fa0d58c9ce Author: Ronald Li <ronald.li@bigswitch.com> Date: Thu Jan 10 18:08:39 2013 -0800
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- build.xml 5 additions, 1 deletionbuild.xml
- findbugs-exclude.xml 23 additions, 0 deletionsfindbugs-exclude.xml
- lib/findbugs-annotations-2.0.1.jar 0 additions, 0 deletionslib/findbugs-annotations-2.0.1.jar
- lib/findbugs-jsr305-2.0.1.jar 0 additions, 0 deletionslib/findbugs-jsr305-2.0.1.jar
- setup-eclipse.sh 7 additions, 0 deletionssetup-eclipse.sh
- src/main/java/net/floodlightcontroller/core/OFMessageFilterManager.java 9 additions, 7 deletions...net/floodlightcontroller/core/OFMessageFilterManager.java
- src/main/java/net/floodlightcontroller/core/OFSwitchBase.java 47 additions, 27 deletions...main/java/net/floodlightcontroller/core/OFSwitchBase.java
- src/main/java/net/floodlightcontroller/core/internal/Controller.java 14 additions, 5 deletions...va/net/floodlightcontroller/core/internal/Controller.java
- src/main/java/net/floodlightcontroller/core/internal/RoleChanger.java 3 additions, 1 deletion...a/net/floodlightcontroller/core/internal/RoleChanger.java
- src/main/java/net/floodlightcontroller/core/web/AllSwitchStatisticsResource.java 0 additions, 8 deletions...lightcontroller/core/web/AllSwitchStatisticsResource.java
- src/main/java/net/floodlightcontroller/devicemanager/IDeviceListener.java 3 additions, 1 deletion...t/floodlightcontroller/devicemanager/IDeviceListener.java
- src/main/java/net/floodlightcontroller/devicemanager/IDeviceService.java 1 addition, 17 deletions...et/floodlightcontroller/devicemanager/IDeviceService.java
- src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java 29 additions, 20 deletions...tcontroller/devicemanager/internal/DeviceManagerImpl.java
- src/main/java/net/floodlightcontroller/devicemanager/web/AbstractDeviceResource.java 7 additions, 4 deletions...tcontroller/devicemanager/web/AbstractDeviceResource.java
- src/main/java/net/floodlightcontroller/devicemanager/web/DeviceSerializer.java 4 additions, 1 deletion...odlightcontroller/devicemanager/web/DeviceSerializer.java
- src/main/java/net/floodlightcontroller/firewall/Firewall.java 1 addition, 3 deletions...main/java/net/floodlightcontroller/firewall/Firewall.java
- src/main/java/net/floodlightcontroller/flowcache/FCQueryObj.java 43 additions, 31 deletions...n/java/net/floodlightcontroller/flowcache/FCQueryObj.java
- src/main/java/net/floodlightcontroller/forwarding/Forwarding.java 4 additions, 3 deletions.../java/net/floodlightcontroller/forwarding/Forwarding.java
- src/main/java/net/floodlightcontroller/linkdiscovery/ILinkDiscoveryService.java 10 additions, 0 deletions...dlightcontroller/linkdiscovery/ILinkDiscoveryService.java
Loading
Please register or sign in to comment