Skip to content
Snippets Groups Projects
  • kwanggithub's avatar
    d3c8f776
    Squashed commit of the following: · d3c8f776
    kwanggithub authored
    commit 0c4827f291febc5d8f00b1a180260a31a27cce08
    Author: Shudong Zhou <shudongzhou@gmail.com>
    Date:   Sun Mar 24 00:19:50 2013 -0700
    
        Add unit test for IPv4 fragment deserialization
    
    commit 5c4496d3b7054189d93cbea9c72123779c647466
    Author: Shudong Zhou <shudongzhou@gmail.com>
    Date:   Sun Mar 24 00:19:19 2013 -0700
    
        Downgrade packet parsing error message to trace
    
    commit afd97398aa9ba9f6bc673d731b880f116df49e82
    Author: Shudong Zhou <shudongzhou@gmail.com>
    Date:   Sat Mar 23 07:25:43 2013 -0700
    
        Handle IP fragments and packet parsing errors
    
    commit 48d3726e4f001383cf86f5587d690665106a5e03
    Author: Srinivasan Ramasubramanian <srini@bigswitch.com>
    Date:   Tue Mar 19 17:37:14 2013 -0700
    
        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.
    
    commit b7e226c8880ada4116a137b791cb66c0c29d8b35
    Merge: aa6fc53 f9ad34e
    Author: Sandeep Hebbani <sandeep.hebbani@bigswitch.com>
    Date:   Tue Mar 19 14:35:36 2013 -0700
    
        Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
    
    commit aa6fc534e2d36b57c6320f2a681eb9a6ac2ec877
    Author: Sandeep Hebbani <sandeep.hebbani@bigswitch.com>
    Date:   Tue Mar 19 14:28:35 2013 -0700
    
        process all flow-mod failure cases and cleanup the policy that has this flow that failed to be pushed. changes to src/main/java/net/floodlightcontroller/core/internal/Controller.java
    
    commit f9ad34e4c70e91ce7269e99429c4b6e585d041ca
    Merge: 9b5e174 c16db38
    Author: abat <abat@bigswitch.com>
    Date:   Mon Mar 18 13:47:20 2013 -0700
    
        Merge into master from pull request #2847: Generate launch targets with ant eclipse (https://github.com/bigswitch/bigswitchcontroller/pull/2847)
    
    commit c16db3825ac067e7a01bf5ca7c4ba2df7363abf9
    Author: Alex Reimers <alex@bigswitch.com>
    Date:   Mon Mar 18 13:39:34 2013 -0700
    
        When running 'make/ant eclipse' automatically generate Eclipse launch targets.
    
    commit 9b5e1741574212f56cc5ea30fae73a786872b257
    Author: Shudong Zhou <shudongzhou@gmail.com>
    Date:   Sat Mar 16 23:55:11 2013 -0700
    
        Make ControllerTest.testErrorEPERM() more robust
    
    commit 200813e3748836decf4cb09347d6d5d791f4282c
    Author: Saurav Das <saurav.das@bigswitch.com>
    Date:   Wed Mar 13 16:08:10 2013 -0700
    
        Cosmetic changes - trying to get near 80 chars
    
    commit 5bacf17ea0e2da142904e2e35829b7df64c7b3ff
    Author: Vishnu Emmadi <vishnu.emmadi@bigswitch.com>
    Date:   Tue Mar 12 19:44:25 2013 -0700
    
    commit f9ac29c188de98538fc4852480c45eaa2f4871b0
    Merge: 96617d9 5aef3ea
    Author: Sandeep Hebbani <sandeep.hebbani@bigswitch.com>
    Date:   Wed Mar 13 10:27:15 2013 -0700
    
        Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
    
    commit 5aef3ea0efa0976f1484d8f538e3d4bc076a715e
    Author: Srinivasan Ramasubramanian <srini@bigswitch.com>
    Date:   Tue Mar 12 17:54:21 2013 -0700
    
        Make path cache to be a LoadingCache, to make it multi-thread safe.
    
    commit 96617d94ef2e8e4c750eebb47f60a996d0300136
    Author: Sandeep Hebbani <sandeep.hebbani@bigswitch.com>
    Date:   Tue Mar 12 17:01:38 2013 -0700
    
        BT-143 and BT-144 tab cleanup
    
    commit 9245ef4f63fe9885a0e406d56553fd30dc789f18
    Merge: da8f54e 03f6f12
    Author: Sandeep Hebbani <sandeep.hebbani@bigswitch.com>
    Date:   Tue Mar 12 16:49:27 2013 -0700
    
        Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
    
    commit ac13ab7e8a25e9f07749cc742d9fe3e513bd8ab6
    Author: Saurav Das <saurav.das@bigswitch.com>
    Date:   Tue Mar 12 15:50:30 2013 -0700
    
        changes to comments removing unused imports in ControllerTest
    
    commit 03f6f12fa37ce31b44b7c861f45b425c43a64e95
    Author: Srinivasan Ramasubramanian <srini@bigswitch.com>
    Date:   Sun Mar 10 13:31:04 2013 -0700
    
        Change buildRoute() to use only RouteId as the only parameter as srcId and dstId are included in it.
    
    commit 0592df150867a60d6c7f60ef5d99b3f67c3fd57b
    Author: kwang-bsn <kevin.wang@bigswitch.com>
    Date:   Sat Mar 9 14:13:47 2013 -0800
    
        BSC-3132 Adjust the date time format
    
    commit a6287c1b34c2e0acfab7597de6d89d58f30f0151
    Author: Wilson Ng <wilson.ng@bigswitch.com>
    Date:   Fri Mar 8 21:45:23 2013 -0800
    
    commit 696b9bd281b057da78f576d1148c663668c10772
    Author: Shudong Zhou <shudongzhou@gmail.com>
    Date:   Fri Mar 8 14:46:07 2013 -0800
    
        Add unit test for HA role recovery
    
    commit 8a0bf57717ce457c35758f08408a9278d68b3571
    Author: Shudong Zhou <shudongzhou@gmail.com>
    Date:   Fri Mar 8 14:45:12 2013 -0800
    
        Fix HA recovery code (error type/code swapped)
    
    commit da8f54ebcb0de59ac637f6baee2dd51af48e4a3d
    Merge: 8be109f eb8449b
    Author: Sandeep Hebbani <sandeep.hebbani@bigswitch.com>
    Date:   Fri Mar 8 11:12:12 2013 -0800
    
        Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
    
    commit d0075653493bf07656cf028f74c8ba8f4092d415
    Merge: 01374ef eb8449b
    Author: Gregor Maier <gregor.maier@bigswitch.com>
    Date:   Fri Mar 8 10:34:43 2013 -0800
    
        Merge remote-tracking branch 'bigswitch/master' into misc
    
    commit 01374ef6a7da242d90d318ae517ba20ca60253f4
    Author: Gregor Maier <gregor.maier@bigswitch.com>
    Date:   Fri Mar 8 10:34:08 2013 -0800
    
        Add trace log message when storage listeneres are notified.
    
    commit eb8449bc8b4a01add31ca804439fca82b9fb7450
    Merge: d5768f8 95f14e3
    Author: Saurav Das <saurav.das@bigswitch.com>
    Date:   Thu Mar 7 18:42:27 2013 -0800
    
        Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
    
    commit d5768f873c0eb625035544e20cd37051a3fe6c72
    Author: Saurav Das <saurav.das@bigswitch.com>
    Date:   Thu Mar 7 16:33:56 2013 -0800
    
        minor comment changes
    
    commit 8be109f7439fbb3a5a0e08112fc11629d429e410
    Author: Sandeep Hebbani <sandeep.hebbani@bigswitch.com>
    Date:   Thu Mar 7 16:08:13 2013 -0800
    
        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].
    
    commit 95f14e3dbe3e94b4e586ae2d4bc079c3d700f3f1
    Author: Alex Reimers <alex@bigswitch.com>
    Date:   Thu Mar 7 13:33:11 2013 -0800
    
        BSC-2984 - - When computing uptimes and start times use the information provided by the JVM.
    
        Conflicts:
        	floodlight/src/main/java/net/floodlightcontroller/core/internal/Controller.java
    
    commit 9789a8e9330d309f11bea439da72026ed88b51f0
    Author: Sudeep Modi <sudeep.modi@bigswitch.com>
    Date:   Wed Mar 6 17:33:13 2013 -0800
    
        Add an API to set a hard timeout in routing decision
    
    commit 12067e399487080b3abb36f589837f01212460e9
    Author: Saurav Das <saurav.das@bigswitch.com>
    Date:   Wed Mar 6 16:31:26 2013 -0800
    
        updating unit tests
    
    commit d0d1ec9f3973ebb3b29d4993d48204c56c90eeb9
    Author: Saurav Das <saurav.das@bigswitch.com>
    Date:   Wed Mar 6 15:53:45 2013 -0800
    
        Bug fix to attachment point logic - do not treat an attachment point going from null to non-null as device moved
    
    commit 9492e34dd4591bcea9c3f747d3832bf2e6b51ce3
    Author: Saurav Das <saurav.das@bigswitch.com>
    Date:   Wed Mar 6 10:56:36 2013 -0800
    
        code cleanup and small bug fix in devicemanager
    
    commit 7faf8a05329e2060f9fd50725ede4fe08d238a0f
    Merge: ec977d8 4b4b697
    Author: Saurav Das <saurav.das@bigswitch.com>
    Date:   Mon Mar 4 09:29:30 2013 -0800
    
        Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
    
    commit ec977d86b11079eccea239423e9795f2f4a281ad
    Author: Saurav Das <saurav.das@bigswitch.com>
    Date:   Mon Mar 4 09:29:06 2013 -0800
    
        code cleanup
    
    commit 4b4b6975e2597bebd23eceba35da62e2be2ba7aa
    Author: kwang-bsn <kevin.wang@bigswitch.com>
    Date:   Sat Mar 2 09:44:50 2013 -0800
    
        BSC-3132
    
    commit 09dc60550ec31b01c1cdf2237046becf5b11e53f
    Author: Saurav Das <saurav.das@bigswitch.com>
    Date:   Fri Mar 1 09:31:42 2013 -0800
    
        Small bug fixes in link discovery
    
    commit 7086875ddb478d80277bc63f9f30e986c7e653de
    Author: Saurav Das <saurav.das@bigswitch.com>
    Date:   Thu Feb 28 15:55:10 2013 -0800
    
        more code cleanup and thread safety
    
    commit 2a71b2e5478b4adc19eccc99cbdbb85cd890057b
    Merge: 12bf11d 7d536d2
    Author: Saurav Das <saurav.das@bigswitch.com>
    Date:   Thu Feb 28 09:18:26 2013 -0800
    
        Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
    
    commit 12bf11d28ab7a731c03750d8eab2351d60eada0e
    Author: Saurav Das <saurav.das@bigswitch.com>
    Date:   Thu Feb 28 09:17:34 2013 -0800
    
        Code cleanup
    
    commit 7d536d28cb87d7ed54c95fc218313b7bb81aba8a
    Author: Wilson Ng <wilson.ng@bigswitch.com>
    Date:   Tue Feb 26 14:00:28 2013 -0800
    
        Clean up code based on Sudeep's feedback
    
    commit c500a0e648ed6bf04091311a1df211045d7ff82d
    Author: Srinivasan Ramasubramanian <srini@bigswitch.com>
    Date:   Mon Feb 25 20:47:23 2013 -0800
    
        [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.
    
    commit c98731d53a9144e4a006234c79689d4508d41775
    Author: Wilson Ng <wilson.ng@bigswitch.com>
    Date:   Fri Feb 22 17:59:44 2013 -0800
    
    commit cb30fedcc9391155bab52090fc512a9eb6be0659
    Author: Rob Vaterlaus <rob.vaterlaus@bigswitch.com>
    Date:   Wed Feb 20 20:35:22 2013 -0800
    
        Fixed bugs with storage source query evaluation
    
    commit 3ac0e2af3769ad2f2283b3e4e0b54d630fa9f100
    Author: Srinivasan Ramasubramanian <srini@bigswitch.com>
    Date:   Wed Feb 20 19:29:37 2013 -0800
    
        Remove the usage of getAPMap() when retrieving attachmentpoints.  Its use is needed only when computing duplicates.
    
    commit 32e9df2b0b25e7d26cfd3987e49b8a3e92c47f26
    Author: Gregor Maier <gregor.maier@bigswitch.com>
    Date:   Wed Feb 20 15:19:18 2013 -0800
    
        Don't return from inside if(log.isTraceEnabled()) BSC-3228
    
    commit 335e263b7fd6e53980d964f0f7e678ae117b8788
    Merge: bf45e84 5700374
    Author: abat <abat@bigswitch.com>
    Date:   Tue Feb 19 18:54:39 2013 -0800
    
        Merge into master from pull request #2616: findbugs stuff (https://github.com/bigswitch/bigswitchcontroller/pull/2616)
    
    commit bf45e84c7743a71ffec10097a67a20d0ba0b6425
    Author: Srinivasan Ramasubramanian <srini@bigswitch.com>
    Date:   Tue Feb 19 15:53:01 2013 -0800
    
        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.
    
    commit 5700374b092c4c09d398d664a5694dfcc9cc6a46
    Author: Andreas Wundsam <andreas.wundsam@bigswitch.com>
    Date:   Tue Feb 19 15:33:53 2013 -0800
    
        build.xml: increase findbugs memory, exclude more generated code
    
    commit e25c24d0617b04734dc2fb4b87d4ac3f14cb20b0
    Author: Andreas Wundsam <andreas.wundsam@bigswitch.com>
    Date:   Tue Feb 19 13:06:15 2013 -0800
    
        findbugs-exclude: exclude warnings about thrift generated files
    
    commit 6129de321278ba2c71e01616809c9fa769257448
    Author: Sandeep Hebbani <sandeep.hebbani@bigswitch.com>
    Date:   Fri Feb 15 17:12:08 2013 -0800
    
    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 (https://github.com/bigswitch/bigswitchcontroller/pull/2491)
    
    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. (https://github.com/bigswitch/bigswitchcontroller/pull/2489)
    
    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 (https://github.com/bigswitch/bigswitchcontroller/pull/2488)
    
    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 (https://github.com/bigswitch/bigswitchcontroller/pull/2414)
    
    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
    d3c8f776
    History
    Squashed commit of the following:
    kwanggithub authored
    commit 0c4827f291febc5d8f00b1a180260a31a27cce08
    Author: Shudong Zhou <shudongzhou@gmail.com>
    Date:   Sun Mar 24 00:19:50 2013 -0700
    
        Add unit test for IPv4 fragment deserialization
    
    commit 5c4496d3b7054189d93cbea9c72123779c647466
    Author: Shudong Zhou <shudongzhou@gmail.com>
    Date:   Sun Mar 24 00:19:19 2013 -0700
    
        Downgrade packet parsing error message to trace
    
    commit afd97398aa9ba9f6bc673d731b880f116df49e82
    Author: Shudong Zhou <shudongzhou@gmail.com>
    Date:   Sat Mar 23 07:25:43 2013 -0700
    
        Handle IP fragments and packet parsing errors
    
    commit 48d3726e4f001383cf86f5587d690665106a5e03
    Author: Srinivasan Ramasubramanian <srini@bigswitch.com>
    Date:   Tue Mar 19 17:37:14 2013 -0700
    
        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.
    
    commit b7e226c8880ada4116a137b791cb66c0c29d8b35
    Merge: aa6fc53 f9ad34e
    Author: Sandeep Hebbani <sandeep.hebbani@bigswitch.com>
    Date:   Tue Mar 19 14:35:36 2013 -0700
    
        Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
    
    commit aa6fc534e2d36b57c6320f2a681eb9a6ac2ec877
    Author: Sandeep Hebbani <sandeep.hebbani@bigswitch.com>
    Date:   Tue Mar 19 14:28:35 2013 -0700
    
        process all flow-mod failure cases and cleanup the policy that has this flow that failed to be pushed. changes to src/main/java/net/floodlightcontroller/core/internal/Controller.java
    
    commit f9ad34e4c70e91ce7269e99429c4b6e585d041ca
    Merge: 9b5e174 c16db38
    Author: abat <abat@bigswitch.com>
    Date:   Mon Mar 18 13:47:20 2013 -0700
    
        Merge into master from pull request #2847: Generate launch targets with ant eclipse (https://github.com/bigswitch/bigswitchcontroller/pull/2847)
    
    commit c16db3825ac067e7a01bf5ca7c4ba2df7363abf9
    Author: Alex Reimers <alex@bigswitch.com>
    Date:   Mon Mar 18 13:39:34 2013 -0700
    
        When running 'make/ant eclipse' automatically generate Eclipse launch targets.
    
    commit 9b5e1741574212f56cc5ea30fae73a786872b257
    Author: Shudong Zhou <shudongzhou@gmail.com>
    Date:   Sat Mar 16 23:55:11 2013 -0700
    
        Make ControllerTest.testErrorEPERM() more robust
    
    commit 200813e3748836decf4cb09347d6d5d791f4282c
    Author: Saurav Das <saurav.das@bigswitch.com>
    Date:   Wed Mar 13 16:08:10 2013 -0700
    
        Cosmetic changes - trying to get near 80 chars
    
    commit 5bacf17ea0e2da142904e2e35829b7df64c7b3ff
    Author: Vishnu Emmadi <vishnu.emmadi@bigswitch.com>
    Date:   Tue Mar 12 19:44:25 2013 -0700
    
    commit f9ac29c188de98538fc4852480c45eaa2f4871b0
    Merge: 96617d9 5aef3ea
    Author: Sandeep Hebbani <sandeep.hebbani@bigswitch.com>
    Date:   Wed Mar 13 10:27:15 2013 -0700
    
        Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
    
    commit 5aef3ea0efa0976f1484d8f538e3d4bc076a715e
    Author: Srinivasan Ramasubramanian <srini@bigswitch.com>
    Date:   Tue Mar 12 17:54:21 2013 -0700
    
        Make path cache to be a LoadingCache, to make it multi-thread safe.
    
    commit 96617d94ef2e8e4c750eebb47f60a996d0300136
    Author: Sandeep Hebbani <sandeep.hebbani@bigswitch.com>
    Date:   Tue Mar 12 17:01:38 2013 -0700
    
        BT-143 and BT-144 tab cleanup
    
    commit 9245ef4f63fe9885a0e406d56553fd30dc789f18
    Merge: da8f54e 03f6f12
    Author: Sandeep Hebbani <sandeep.hebbani@bigswitch.com>
    Date:   Tue Mar 12 16:49:27 2013 -0700
    
        Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
    
    commit ac13ab7e8a25e9f07749cc742d9fe3e513bd8ab6
    Author: Saurav Das <saurav.das@bigswitch.com>
    Date:   Tue Mar 12 15:50:30 2013 -0700
    
        changes to comments removing unused imports in ControllerTest
    
    commit 03f6f12fa37ce31b44b7c861f45b425c43a64e95
    Author: Srinivasan Ramasubramanian <srini@bigswitch.com>
    Date:   Sun Mar 10 13:31:04 2013 -0700
    
        Change buildRoute() to use only RouteId as the only parameter as srcId and dstId are included in it.
    
    commit 0592df150867a60d6c7f60ef5d99b3f67c3fd57b
    Author: kwang-bsn <kevin.wang@bigswitch.com>
    Date:   Sat Mar 9 14:13:47 2013 -0800
    
        BSC-3132 Adjust the date time format
    
    commit a6287c1b34c2e0acfab7597de6d89d58f30f0151
    Author: Wilson Ng <wilson.ng@bigswitch.com>
    Date:   Fri Mar 8 21:45:23 2013 -0800
    
    commit 696b9bd281b057da78f576d1148c663668c10772
    Author: Shudong Zhou <shudongzhou@gmail.com>
    Date:   Fri Mar 8 14:46:07 2013 -0800
    
        Add unit test for HA role recovery
    
    commit 8a0bf57717ce457c35758f08408a9278d68b3571
    Author: Shudong Zhou <shudongzhou@gmail.com>
    Date:   Fri Mar 8 14:45:12 2013 -0800
    
        Fix HA recovery code (error type/code swapped)
    
    commit da8f54ebcb0de59ac637f6baee2dd51af48e4a3d
    Merge: 8be109f eb8449b
    Author: Sandeep Hebbani <sandeep.hebbani@bigswitch.com>
    Date:   Fri Mar 8 11:12:12 2013 -0800
    
        Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
    
    commit d0075653493bf07656cf028f74c8ba8f4092d415
    Merge: 01374ef eb8449b
    Author: Gregor Maier <gregor.maier@bigswitch.com>
    Date:   Fri Mar 8 10:34:43 2013 -0800
    
        Merge remote-tracking branch 'bigswitch/master' into misc
    
    commit 01374ef6a7da242d90d318ae517ba20ca60253f4
    Author: Gregor Maier <gregor.maier@bigswitch.com>
    Date:   Fri Mar 8 10:34:08 2013 -0800
    
        Add trace log message when storage listeneres are notified.
    
    commit eb8449bc8b4a01add31ca804439fca82b9fb7450
    Merge: d5768f8 95f14e3
    Author: Saurav Das <saurav.das@bigswitch.com>
    Date:   Thu Mar 7 18:42:27 2013 -0800
    
        Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
    
    commit d5768f873c0eb625035544e20cd37051a3fe6c72
    Author: Saurav Das <saurav.das@bigswitch.com>
    Date:   Thu Mar 7 16:33:56 2013 -0800
    
        minor comment changes
    
    commit 8be109f7439fbb3a5a0e08112fc11629d429e410
    Author: Sandeep Hebbani <sandeep.hebbani@bigswitch.com>
    Date:   Thu Mar 7 16:08:13 2013 -0800
    
        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].
    
    commit 95f14e3dbe3e94b4e586ae2d4bc079c3d700f3f1
    Author: Alex Reimers <alex@bigswitch.com>
    Date:   Thu Mar 7 13:33:11 2013 -0800
    
        BSC-2984 - - When computing uptimes and start times use the information provided by the JVM.
    
        Conflicts:
        	floodlight/src/main/java/net/floodlightcontroller/core/internal/Controller.java
    
    commit 9789a8e9330d309f11bea439da72026ed88b51f0
    Author: Sudeep Modi <sudeep.modi@bigswitch.com>
    Date:   Wed Mar 6 17:33:13 2013 -0800
    
        Add an API to set a hard timeout in routing decision
    
    commit 12067e399487080b3abb36f589837f01212460e9
    Author: Saurav Das <saurav.das@bigswitch.com>
    Date:   Wed Mar 6 16:31:26 2013 -0800
    
        updating unit tests
    
    commit d0d1ec9f3973ebb3b29d4993d48204c56c90eeb9
    Author: Saurav Das <saurav.das@bigswitch.com>
    Date:   Wed Mar 6 15:53:45 2013 -0800
    
        Bug fix to attachment point logic - do not treat an attachment point going from null to non-null as device moved
    
    commit 9492e34dd4591bcea9c3f747d3832bf2e6b51ce3
    Author: Saurav Das <saurav.das@bigswitch.com>
    Date:   Wed Mar 6 10:56:36 2013 -0800
    
        code cleanup and small bug fix in devicemanager
    
    commit 7faf8a05329e2060f9fd50725ede4fe08d238a0f
    Merge: ec977d8 4b4b697
    Author: Saurav Das <saurav.das@bigswitch.com>
    Date:   Mon Mar 4 09:29:30 2013 -0800
    
        Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
    
    commit ec977d86b11079eccea239423e9795f2f4a281ad
    Author: Saurav Das <saurav.das@bigswitch.com>
    Date:   Mon Mar 4 09:29:06 2013 -0800
    
        code cleanup
    
    commit 4b4b6975e2597bebd23eceba35da62e2be2ba7aa
    Author: kwang-bsn <kevin.wang@bigswitch.com>
    Date:   Sat Mar 2 09:44:50 2013 -0800
    
        BSC-3132
    
    commit 09dc60550ec31b01c1cdf2237046becf5b11e53f
    Author: Saurav Das <saurav.das@bigswitch.com>
    Date:   Fri Mar 1 09:31:42 2013 -0800
    
        Small bug fixes in link discovery
    
    commit 7086875ddb478d80277bc63f9f30e986c7e653de
    Author: Saurav Das <saurav.das@bigswitch.com>
    Date:   Thu Feb 28 15:55:10 2013 -0800
    
        more code cleanup and thread safety
    
    commit 2a71b2e5478b4adc19eccc99cbdbb85cd890057b
    Merge: 12bf11d 7d536d2
    Author: Saurav Das <saurav.das@bigswitch.com>
    Date:   Thu Feb 28 09:18:26 2013 -0800
    
        Merge branch 'master' of github.com:bigswitch/bigswitchcontroller
    
    commit 12bf11d28ab7a731c03750d8eab2351d60eada0e
    Author: Saurav Das <saurav.das@bigswitch.com>
    Date:   Thu Feb 28 09:17:34 2013 -0800
    
        Code cleanup
    
    commit 7d536d28cb87d7ed54c95fc218313b7bb81aba8a
    Author: Wilson Ng <wilson.ng@bigswitch.com>
    Date:   Tue Feb 26 14:00:28 2013 -0800
    
        Clean up code based on Sudeep's feedback
    
    commit c500a0e648ed6bf04091311a1df211045d7ff82d
    Author: Srinivasan Ramasubramanian <srini@bigswitch.com>
    Date:   Mon Feb 25 20:47:23 2013 -0800
    
        [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.
    
    commit c98731d53a9144e4a006234c79689d4508d41775
    Author: Wilson Ng <wilson.ng@bigswitch.com>
    Date:   Fri Feb 22 17:59:44 2013 -0800
    
    commit cb30fedcc9391155bab52090fc512a9eb6be0659
    Author: Rob Vaterlaus <rob.vaterlaus@bigswitch.com>
    Date:   Wed Feb 20 20:35:22 2013 -0800
    
        Fixed bugs with storage source query evaluation
    
    commit 3ac0e2af3769ad2f2283b3e4e0b54d630fa9f100
    Author: Srinivasan Ramasubramanian <srini@bigswitch.com>
    Date:   Wed Feb 20 19:29:37 2013 -0800
    
        Remove the usage of getAPMap() when retrieving attachmentpoints.  Its use is needed only when computing duplicates.
    
    commit 32e9df2b0b25e7d26cfd3987e49b8a3e92c47f26
    Author: Gregor Maier <gregor.maier@bigswitch.com>
    Date:   Wed Feb 20 15:19:18 2013 -0800
    
        Don't return from inside if(log.isTraceEnabled()) BSC-3228
    
    commit 335e263b7fd6e53980d964f0f7e678ae117b8788
    Merge: bf45e84 5700374
    Author: abat <abat@bigswitch.com>
    Date:   Tue Feb 19 18:54:39 2013 -0800
    
        Merge into master from pull request #2616: findbugs stuff (https://github.com/bigswitch/bigswitchcontroller/pull/2616)
    
    commit bf45e84c7743a71ffec10097a67a20d0ba0b6425
    Author: Srinivasan Ramasubramanian <srini@bigswitch.com>
    Date:   Tue Feb 19 15:53:01 2013 -0800
    
        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.
    
    commit 5700374b092c4c09d398d664a5694dfcc9cc6a46
    Author: Andreas Wundsam <andreas.wundsam@bigswitch.com>
    Date:   Tue Feb 19 15:33:53 2013 -0800
    
        build.xml: increase findbugs memory, exclude more generated code
    
    commit e25c24d0617b04734dc2fb4b87d4ac3f14cb20b0
    Author: Andreas Wundsam <andreas.wundsam@bigswitch.com>
    Date:   Tue Feb 19 13:06:15 2013 -0800
    
        findbugs-exclude: exclude warnings about thrift generated files
    
    commit 6129de321278ba2c71e01616809c9fa769257448
    Author: Sandeep Hebbani <sandeep.hebbani@bigswitch.com>
    Date:   Fri Feb 15 17:12:08 2013 -0800
    
    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 (https://github.com/bigswitch/bigswitchcontroller/pull/2491)
    
    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. (https://github.com/bigswitch/bigswitchcontroller/pull/2489)
    
    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 (https://github.com/bigswitch/bigswitchcontroller/pull/2488)
    
    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 (https://github.com/bigswitch/bigswitchcontroller/pull/2414)
    
    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
build.xml 12.42 KiB
<?xml version="1.0" encoding="UTF-8" standalone="no"?>

 <!--
   Copyright 2011, Big Switch Networks, Inc.
   
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-->

<!--
    The build uses pregenerated Thrift code by default to reduce build
    dependencies. To generate it locally run the gen-thrift target.
    If you change the Thrift files be sure to also commit the updated
    generated code.
-->

<project default="dist" name="Floodlight">
    <property name="target" location="target"/>
    <property name="build" location="${target}/bin"/>
    <property name="build-test" location="${target}/bin-test"/>
    <property name="build-coverage" location="${target}/bin-coverage"/>
    <property name="test-output" location="${target}/test"/>
    <property name="coverage-output" location="${target}/coverage"/>
    <property name="source" location="src/main/java"/>
    <property name="resources" location="src/main/resources/"/>
    <property name="source-test" location="src/test/java"/>
    <property name="python-src" location="src/main/python"/>
    <property name="docs" location="${target}/docs"/>
    <property name="main-class" value="net.floodlightcontroller.core.Main"/>
    <property name="floodlight-jar" location="${target}/floodlight.jar"/>
    <property name="floodlight-test-jar" location="${target}/floodlight-test.jar"/>
    <property name="thrift.dir" value="${basedir}/src/main/thrift"/>
    <property name="thrift.out.dir" value="lib/gen-java"/>
    <property name="thrift.package" value="net/floodlightcontroller/packetstreamer/thrift"/>
    <property name="ant.build.javac.source" value="1.6"/>
    <property name="ant.build.javac.target" value="1.6"/>
    <property name="findbugs.home" value="../build/findbugs-2.0.2"/>
    <property name="findbugs.results" value="findbugs-results" />
    <property name="lib" location="lib"/>

    <patternset id="lib">
        <include name="logback-classic-1.0.0.jar"/>
        <include name="logback-core-1.0.0.jar"/>
        <include name="jackson-core-asl-1.8.6.jar"/>
        <include name="jackson-mapper-asl-1.8.6.jar"/>
        <include name="slf4j-api-1.6.4.jar"/>
        <include name="org.restlet-2.1-RC1.jar"/>
        <include name="org.restlet.ext.jackson-2.1-RC1.jar"/>
        <include name="org.restlet.ext.simple-2.1-RC1.jar"/>
        <include name="org.restlet.ext.slf4j-2.1-RC1.jar"/>
        <include name="simple-4.1.21.jar"/>
        <include name="netty-3.2.6.Final.jar"/>
        <include name="args4j-2.0.16.jar"/>
        <include name="concurrentlinkedhashmap-lru-1.2.jar"/>
        <include name="jython-2.5.2.jar"/>
        <include name="libthrift-0.7.0.jar"/>
        <include name="guava-13.0.1.jar" />
        <include name="findbugs-annotations-2.0.1.jar" />
        <include name="findbugs-jsr305-2.0.1.jar" />
    </patternset>

    <path id="classpath">
        <fileset dir="${lib}">
            <patternset refid="lib"/>
        </fileset>
    </path>

    <patternset id="lib-cobertura">
        <include name="cobertura-1.9.4.1.jar"/>
        <include name="asm-3.0.jar"/>
        <include name="asm-tree-3.0.jar"/>
        <include name="oro/jakarta-oro-2.0.8.jar"/>
        <include name="log4j-1.2.9.jar"/>
    </patternset>
    <path id="classpath-cobertura">
        <fileset dir="${lib}">
            <patternset refid="lib-cobertura"/>
    </fileset>
    </path>

    <patternset id="lib-test">
        <include name="junit-4.8.2.jar"/>
        <include name="org.easymock-3.1.jar"/>
        <include name="objenesis-1.2.jar"/>  <!-- required by easymock to mock classes -->
        <include name="cglib-nodep-2.2.2.jar"/>    <!-- required by easymock to mock classes -->
    </patternset>
    <path id="classpath-test">
        <fileset dir="${lib}">
            <patternset refid="lib-test"/>
            <patternset refid="lib-cobertura"/>
            <patternset refid="lib"/>
        </fileset>
    </path>

    <target name="init">
        <mkdir dir="${build}"/>
        <mkdir dir="${build-test}"/>
        <mkdir dir="${target}/lib"/>
        <mkdir dir="${thrift.out.dir}"/>
        <mkdir dir="${test-output}"/>
    </target>

    <target name="compile" depends="init">
        <javac includeAntRuntime="false" 
           classpathref="classpath" 
           debug="true" 
           srcdir="${source}:${thrift.out.dir}"
           destdir="${build}">
        </javac>
    </target>

    <target name="compile-tests" depends="compile-test"/>
    <target name="compile-test" depends="compile">
        <fileset dir="${resources}"/>
        <javac includeAntRuntime="false" debug="true" 
           srcdir="${source-test}"
           classpath="${build}"
           classpathref="classpath-test"
           destdir="${build-test}"/>
    </target>

    <!-- Thrift build based on http://www.flester.com/blog/2009/04/26/using-thrift-from-ant -->
    <fileset id="thrift.files" dir="${thrift.dir}">
        <include name="**/*.thrift"/>
    </fileset>

    <target name="gen-thrift" depends="init">
        <pathconvert property="thrift.file.list" refid="thrift.files"
            pathsep=" " dirsep="/">
        </pathconvert>
        <echo message="Running thrift generator on ${thrift.file.list}"/>
        <exec executable="thrift" dir="${basedir}" failonerror="true">
            <arg line="--strict -v --gen java -o ${thrift.out.dir}/.. '${thrift.file.list}'"/>
        </exec>
        <!-- Get rid of annoying warnings in thrift java: at annotations -->
        <echo message="Adding @SuppressWarning annotations"/>
        <replaceregexp byline="true">
            <regexp pattern="^public "/>
            <substitution expression='@SuppressWarnings("all") public '/>
            <fileset id="thrift.output.files" dir="${thrift.out.dir}/..">
                <include name="**/*.java"/>
            </fileset>
        </replaceregexp>
    </target>

    <target name="clean">
        <delete dir="${target}"/>
    </target>

    <target name="run" depends="dist">
        <java fork="true" jar="${floodlight-jar}" classpathref="classpath">
            <jvmarg value="-server"/>
            <jvmarg value="-Xms1024M"/>
            <jvmarg value="-Xmx1024M"/>
        </java>
    </target>

    <target name="tests" depends="test"/>
    <target name="test" depends="compile-test">
        <junit fork="true" forkmode="once"
           failureproperty="junit.failure"
           printsummary="on">
        <sysproperty key="net.sourceforge.cobertura.datafile"
             file="${target}/cobertura.ser" />
            <classpath>
                <pathelement location="${build-coverage}"/>
                <pathelement location="${build}"/>
                <pathelement location="${build-test}"/>
                <pathelement location="${floodlight-jar}"/>
                <path refid="classpath-test"/>
            </classpath>
            <formatter type="brief" usefile="true" />
            <batchtest todir="${test-output}">
                <fileset dir="${source-test}">
                    <exclude name="**/storage/tests/StorageTest.java"/>
				    <include name="**/*Test*.java"/>
                    <exclude name="**/core/test/**"/>
                    <exclude name="**/core/module/**"/>
                </fileset>
            </batchtest>
        </junit>
        <fail if="junit.failure" message="Unit test(s) failed.  See reports!"/>
    </target>

    <taskdef classpathref="classpath-cobertura" resource="tasks.properties"/>
    <target name="clean-instrument">
        <delete file="${target}/cobertura.ser"/>
        <delete dir="${build-coverage}"/>
    </target>
    <target name="instrument" depends="compile,compile-test,clean-instrument">
      <cobertura-instrument datafile="${target}/cobertura.ser"
                todir="${build-coverage}"
                classpathref="classpath-cobertura">
    <fileset dir="${build}">
      <include name="**/*.class"/>
    </fileset>
      </cobertura-instrument>
    </target>
    <target name="coverage-report">
        <cobertura-report format="html"
              datafile="${target}/cobertura.ser"
              destdir="${coverage-output}"
              srcdir="${source}"/>
        <cobertura-report format="xml"
              datafile="${target}/cobertura.ser"
              destdir="${coverage-output}"
              srcdir="${source}"/>
    </target>
    <target name="coverage" depends="instrument,test,coverage-report"/>

    <target name="dist" depends="compile,compile-test">
        <jar destfile="${floodlight-jar}" filesetmanifest="mergewithoutmain">
            <manifest>
                <attribute name="Main-Class" value="${main-class}"/>
                <attribute name="Class-Path" value="."/>
            </manifest>
            <fileset dir="${build}"/>
            <fileset dir="${resources}"/>
            <fileset dir="${python-src}">
                <include name="**/*.py"/>
            </fileset>
            <zipgroupfileset dir="${lib}">
                <patternset refid="lib"/>
            </zipgroupfileset>
        </jar>
        <jar destfile="${floodlight-test-jar}" filesetmanifest="mergewithoutmain">
            <manifest>
                <attribute name="Class-Path" value="."/>
            </manifest>
            <fileset dir="${build-test}"/>
            <fileset dir="${resources}"/>
            <zipgroupfileset dir="${lib}">
                <patternset refid="lib-test"/>
                <patternset refid="lib-cobertura"/>
            </zipgroupfileset>
        </jar>
    </target>

    <target name="javadoc">
        <javadoc access="protected"
            author="true"
            classpathref="classpath"
            destdir="${docs}"
            doctitle="Floodlight"
            nodeprecated="false"
            nodeprecatedlist="false"
            noindex="false"
            nonavbar="false"
            notree="false"
            source="1.6"
            sourcepath="${source}"
            splitindex="true"
            use="true"
            version="true"/>
    </target>

    <target name="eclipse" depends="init">
        <pathconvert property="eclipse-lib">
            <map from="${basedir}/" to=""/>
            <fileset dir="${lib}">
                <patternset refid="lib"/>
                <patternset refid="lib-test"/>
            </fileset>
        </pathconvert>
        <exec executable="${basedir}/setup-eclipse.sh">
            <arg value="${main-class}"/>
            <arg value="${eclipse-lib}"/>
        </exec>
    </target>

    <target name="findbugs-xml" depends="init,compile">
        <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${findbugs.home}/lib/findbugs-ant.jar"/>
        <mkdir dir="${findbugs.results}"/>
        <findbugs
            home="${findbugs.home}"
            output="xml"
            excludeFilter="${basedir}/findbugs-exclude.xml"
            jvmargs="-Xmx1024m"
            outputFile="${findbugs.results}/results.xml">
           <sourcePath path="${source}" />
           <sourcePath path="${thrift.out.dir}" />
           <class location="${build}" />
           <auxClasspath>
                <path refid="classpath" />
           </auxClasspath>
        </findbugs>
    </target>

    <target name="findbugs" depends="init,compile">
        <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${findbugs.home}/lib/findbugs-ant.jar"/>
        <mkdir dir="${findbugs.results}"/>
        <findbugs
            home="${findbugs.home}"
            output="html"
            excludeFilter="${basedir}/findbugs-exclude.xml"
            jvmargs="-Xmx1024m"
            outputFile="${findbugs.results}/results.html" >
           <sourcePath path="${source}" />
           <sourcePath path="${thrift.out.dir}" />
           <class location="${build}" />
           <auxClasspath>
                <path refid="classpath" />
           </auxClasspath>
        </findbugs>
    </target>

</project>