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

559f6dc9

Commit 559f6dc9 authored 10 years ago by Ryan Izard

Downloads
- Plain Diff

Merge pull request #1 from hwchiu/openflow-1.3

Fixed LLDP handling, DPID and OFPort serializers, accounted for default cluster ID = 0, modify circuitpusher.py for new REST API format.

parents 3de2b506 306be67a

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

apps/circuitpusher/circuitpusher.py 14 additions, 16 deletions

apps/circuitpusher/circuitpusher.py
src/main/java/net/floodlightcontroller/core/web/serializers/DPIDSerializer.java 4 additions, 4 deletions

...dlightcontroller/core/web/serializers/DPIDSerializer.java
src/main/java/net/floodlightcontroller/devicemanager/web/DeviceSerializer.java 1 addition, 1 deletion

...odlightcontroller/devicemanager/web/DeviceSerializer.java
src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java 4 additions, 4 deletions

...ntroller/linkdiscovery/internal/LinkDiscoveryManager.java
src/main/java/net/floodlightcontroller/topology/Cluster.java 2 additions, 1 deletion

src/main/java/net/floodlightcontroller/topology/Cluster.java
src/main/java/net/floodlightcontroller/topology/NodePortTuple.java 0 additions, 1 deletion

...java/net/floodlightcontroller/topology/NodePortTuple.java

with 25 additions and 27 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