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

dbb8263a

Commit dbb8263a authored 11 years ago by abat

Downloads
- Plain Diff

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)

parents a18e3486 0d772acd

No related branches found

No related tags found

No related merge requests found

Changes 7

Expand all Hide whitespace changes

Inline Side-by-side

Showing

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

...floodlightcontroller/core/IFloodlightProviderService.java
src/main/java/net/floodlightcontroller/core/internal/Controller.java 29 additions, 23 deletions

...va/net/floodlightcontroller/core/internal/Controller.java
src/main/java/net/floodlightcontroller/core/internal/OFChannelHandler.java 5 additions, 1 deletion

.../floodlightcontroller/core/internal/OFChannelHandler.java
src/main/java/net/floodlightcontroller/core/web/ControllerRoleResource.java 9 additions, 6 deletions

...floodlightcontroller/core/web/ControllerRoleResource.java
src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java 468 additions, 713 deletions

...et/floodlightcontroller/core/internal/ControllerTest.java
src/test/java/net/floodlightcontroller/core/internal/OFChannelHandlerTest.java 28 additions, 0 deletions

...odlightcontroller/core/internal/OFChannelHandlerTest.java
src/test/java/net/floodlightcontroller/core/test/MockFloodlightProvider.java 1 addition, 1 deletion

...loodlightcontroller/core/test/MockFloodlightProvider.java

with 547 additions and 747 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