Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

floodlight
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

46224b0d

Commit 46224b0d authored 11 years ago by abat

Downloads
- Plain Diff

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)

parents c502b127 da112b92

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/net/floodlightcontroller/core/IOFSwitch.java 3 additions, 3 deletions

src/main/java/net/floodlightcontroller/core/IOFSwitch.java
src/main/java/net/floodlightcontroller/core/OFSwitchBase.java 1 addition, 1 deletion

...main/java/net/floodlightcontroller/core/OFSwitchBase.java
src/main/java/net/floodlightcontroller/core/internal/OFChannelHandler.java 17 additions, 3 deletions

.../floodlightcontroller/core/internal/OFChannelHandler.java
src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java 58 additions, 185 deletions

...ntroller/linkdiscovery/internal/LinkDiscoveryManager.java
src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java 2 additions, 2 deletions

...et/floodlightcontroller/core/internal/ControllerTest.java
src/test/java/net/floodlightcontroller/core/internal/OFChannelHandlerTest.java 4 additions, 2 deletions

...odlightcontroller/core/internal/OFChannelHandlerTest.java
src/test/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManagerTest.java 3 additions, 3 deletions

...ller/linkdiscovery/internal/LinkDiscoveryManagerTest.java

with 88 additions and 199 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment