Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Topology abnormal when use RYU #84

Closed
wants to merge 33 commits into from
Closed

Fix Topology abnormal when use RYU #84

wants to merge 33 commits into from

Conversation

westwind
Copy link
Contributor

@westwind westwind commented Apr 7, 2015

modify README.md and add simple_switch_13.py

Shun-Hsiang Hu and others added 30 commits December 3, 2014 14:53
modify README.md
c7dc03d
fix concluded
9bb38cb
fix concluded, and merge dlink-dev
13e9a32 
	modified:   README.md
    modified:   adapter/floodlight/README.md
	modified:   adapter/floodlight/omniui/FlowModResource.java
	modified:   adapter/floodlight/omniui/OmniUIWebRoutable.java
	modified:   adapter/ryu/README.md
	modified:   adapter/ryu/omniui/omniui.py
	modified:   core/README.md
	modified:   core/core.py
	modified:   core/floodlight_modules/flow_mod.py
	modified:   core/floodlight_modules/uipusher.py
	modified:   core/trema_modules/uipusher.py
	modified:   webui/index.html
	new file:   webui/js/config.js
	modified:   webui/js/omniui.js
	modified:   webui/js/uds.js
	modified:   webui/stat.html
	modified:   webui/stat13.html
	modified:   webui/uds.html
Merge branch 'dev' of https://github.com/westwind/OmniUI into dev
b58ae74
@ChickenFood @charlesmcchan
Updated Installation Instructions
c354f6b
@charlesmcchan
Retrieve the missing part in README.md
dab7ae6
@ChickenFood @charlesmcchan
Fix space and indent
649a805
@win911 @charlesmcchan
Gather url configuration in a single file
33bbd0e
@ChickenFood @charlesmcchan
Mistyped Type & Variable correction
4d7c28f
@starbops @charlesmcchan
Server-sent event
0e38031 
A prototype of whole set of server-sent event notification mechanism, demo
using UDS feature

       OK          NOT YET
webui <---> core <---------> ctrl adptr

- In core/core.py
        - Provide event source to be subscribed
        - Provide SSE handler registration
        - Provide south bound REST API to be used by controller adapters
        - Use event name to distinguish many kinds of events
- In core/trema_modules/uipusher.py
        - Register SSE handler
        - The handler handles the event received from south bound REST API
- In webui/js/uds.js
        - Remove "reload" function
        - Subscribe event provided by the core
- In webui/uds.html
        - Remove "reload" button

SSE on Floodlight core module, topology function

- In core/floodlight_modules/uipusher.py
        - Regist 'updatetopo' SSE handler
- In webui/js/omniui.js
        - Subscribe event provided by the core
@ChickenFood @charlesmcchan
Implement FlowMod for Ryu 1.0
c3ea9b3
@charlesmcchan
gevent is required by core
80eb706
@charlesmcchan
Read url from config.js
84fa2a3
@charlesmcchan
Merge UI from waynelkh/Network-Management-Tool. Add CI configuration.
e39faa4
@charlesmcchan
Introduce continuous integration
84b7b31 
* Use setuptool to take care the dependencies

* Create test framework
    - Add test framework for core
    - Add test for EventHandler class

* Introduce CI
    - Update .travis.yml to cache site-packages and npm_modules

* Minor refactor
    - Remove unnecessary import of core
    - Move default log file to /tmp/omniui.log
    - Disable	the use of statistic module by default
@steven9467 @charlesmcchan
Implement FlowMod for Ryu 1.3
f2b7157 
NOTE: Corresponding UI is not finished at this moment.
@charlesmcchan
Add install.sh for Floodlight adapter
46d29ca
@kansokusha @charlesmcchan
Update README.md and floodlight/install.sh
1466de6 
* Solve setup.py path issue in README.md
* Minor modification in floodlight/install.sh
@win911 @charlesmcchan
Fix bugs of POX adapter
e8a81a2 
* Fixed POX adapter; slightly revised the core module and js
- fix link problem to produce correct topology
- complete barrier reply to stop spinner of WebUI
- add the lack fields (tosBits & vlanP) to fix flow_high_light
- support multi actions and no action
- correct the wildcards value to show the right ip/mask field
- solved the topology problem of single switch

* Correct the name of actions

* Updated webui
- adjust functions to be compatible with POX
- remove the default value of flow_modify entry to avoid wildcards_error
- completely support all actions for flow_highlight
@win911 @charlesmcchan
Busy link detection
4772aa9 
- get information about links and ports
- calculate link's counterBytes
- set threshold for busy link
- return busy_link'info to WebUI to display

- Request switch features to get port features for link capacity
- Periodically remove unexisted link info from local data structure
Merge branch 'tmp' into dev
1a1d4d8
new file: adapter/ryu/omniui/simple_switch_13.py
7d060be
modified: README.md
1feaadd
modified: core/config.json
0d36c7f
modified: ../.gitignore
cc14ed5
modified: .gitignore
c8cbc8f
Merge branch 'master' of git://github.com/dlinknctu/OmniUI
897b4df 
Conflicts:
	.gitignore

	modified:   .gitignore
	new file:   .travis.yml
	modified:   README.md
	modified:   adapter/floodlight/README.md
	new file:   adapter/floodlight/install.sh
	modified:   adapter/floodlight/omniui/ActionParse.java
	modified:   adapter/floodlight/omniui/FlowModMethod.java
	modified:   adapter/floodlight/omniui/FlowModResource.java
	modified:   adapter/floodlight/omniui/OmniUI.java
	modified:   adapter/floodlight/omniui/OmniUIWebRoutable.java
	modified:   adapter/floodlight/omniui/SwitchInfo.java
	modified:   adapter/pox/omniui/flow_modify.py
	modified:   adapter/pox/omniui/flow_stats.py
	modified:   adapter/pox/omniui/upload_webcore.py
	new file:   adapter/ryu/README.md
	new file:   adapter/ryu/omniui/omniui.py
	new file:   adapter/trema/.gitignore
	new file:   adapter/trema/README.md
	new file:   adapter/trema/uds/GPL2
	new file:   adapter/trema/uds/Makefile
	new file:   adapter/trema/uds/librestapi.c
	new file:   adapter/trema/uds/librestapi.h
	new file:   adapter/trema/uds/mongoose.c
	new file:   adapter/trema/uds/mongoose.h
	new file:   adapter/trema/uds/simple_restapi_manager.c
	new file:   adapter/trema/uds/simple_restapi_manager.h
	new file:   adapter/trema/uds/src/.gitignore
	new file:   adapter/trema/uds/src/Makefile
	new file:   adapter/trema/uds/src/uds.c
	modified:   core/README.md
	new file:   core/src/__init__.py
	new file:   core/src/core.py
	new file:   core/src/floodlight_modules/busylink_detect.py
	renamed:    core/modules/controlleradapter.py -> core/src/floodlight_modules/controlleradapter.py
	new file:   core/src/floodlight_modules/dbcollection.py
	renamed:    core/modules/flow_mod.py -> core/src/floodlight_modules/flow_mod.py
	new file:   core/src/floodlight_modules/uipusher.py
	new file:   core/src/pox_modules/controlleradapter.py
	renamed:    core/modules/dbcollection.py -> core/src/pox_modules/dbcollection.py
	new file:   core/src/pox_modules/flow_mod.py
	renamed:    core/modules/uipusher.py -> core/src/pox_modules/uipusher.py
	new file:   core/src/trema_modules/controlleradapter.py
	new file:   core/src/trema_modules/dbcollection.py
	new file:   core/src/trema_modules/flow_mod.py
	new file:   core/src/trema_modules/uipusher.py
	new file:   core/test/__init__.py
	new file:   core/test/test_core.py
	new file:   run-tests.sh
	new file:   ui/.gitignore
	new file:   ui/config/preprocessor.js
	new file:   ui/config/webpack.config.js
	new file:   ui/package.json
	new file:   ui/src/assets/stylesheets/custom-overrides.less
	new file:   ui/src/assets/stylesheets/main.less
	new file:   ui/src/index.html
	new file:   ui/src/scripts/actions/TodoListActionCreator.js
	new file:   ui/src/scripts/components/App.jsx
	new file:   ui/src/scripts/components/InputBox.jsx
	new file:   ui/src/scripts/components/ListItem.jsx
	new file:   ui/src/scripts/components/ListView.jsx
	new file:   ui/src/scripts/components/__tests__/InputBox-test.js
	new file:   ui/src/scripts/components/__tests__/ListItem-test.js
	new file:   ui/src/scripts/constants/TodoConstants.js
	new file:   ui/src/scripts/dispatcher/AppDispatcher.js
	new file:   ui/src/scripts/main.js
	new file:   ui/src/scripts/stores/TodoStore.js
	modified:   webui/css/omniui-stat.css
	new file:   webui/css/omniui-stat13.css
	modified:   webui/css/omniui.css
	modified:   webui/css/reset.css
	new file:   webui/css/smoothness/images/animated-overlay.gif
	new file:   webui/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
	new file:   webui/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
	new file:   webui/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
	new file:   webui/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
	new file:   webui/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
	new file:   webui/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
	new file:   webui/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
	new file:   webui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
	new file:   webui/css/smoothness/images/ui-icons_222222_256x240.png
	new file:   webui/css/smoothness/images/ui-icons_2e83ff_256x240.png
	new file:   webui/css/smoothness/images/ui-icons_454545_256x240.png
	new file:   webui/css/smoothness/images/ui-icons_888888_256x240.png
	new file:   webui/css/smoothness/images/ui-icons_cd0a0a_256x240.png
	new file:   webui/css/smoothness/jquery-ui.css
	new file:   webui/css/uds.css
	modified:   webui/index.html
	new file:   webui/js/config.js
	modified:   webui/js/flowmod.js
	modified:   webui/js/jquery-ui-1.10.4.custom.min.js
	new file:   webui/js/jquery.keyframes.min.js
	modified:   webui/js/match.js
	new file:   webui/js/omniui-stat13.js
	modified:   webui/js/omniui.js
	new file:   webui/js/uds.js
	modified:   webui/stat.html
	new file:   webui/stat13.html
	new file:   webui/uds.html
# This is a combination of 4 commits.
27b518c 
# The first commit's message is:
# This is a combination of 2 commits.
# The first commit's message is:

Rebase dev to master
    modify README.md

	modified:   core/etc/config.json

Updated various instructions

	modified:   adapter/ryu/README.md
	modified:   core/etc/config.json

Spacing fixed

Spacing

Spacing and mistyped Type

	modified:   adapter/ryu/README.md
	modified:   core/etc/config.json
	modified:   webui/index.html

Fixed Indents

Fixed Indent

Integrate URL Routing

	modified:   adapter/ryu/README.md
	modified:   core/etc/config.json
	modified:   webui/index.html

minor adjust format

	modified:   adapter/ryu/README.md
	modified:   core/etc/config.json
	modified:   webui/index.html

SSE on Floodlight core module, topology function

- In core/floodlight_modules/uipusher.py
        - Regist 'updatetopo' SSE handler
- In webui/js/omniui.js
        - Subscribe event provided by the core

Recover CORS_ORIGINS

Update documentation and delete useless comment

Remove Pyenv configuration file

Flow Mod v1.0 Implemented

Minor Tweeks to Flow Mod v1.0

Fixed indents

Fixed LOG.debug messages

Fixed indents to whitespaces

Fixed minor errors

Removed debug messages & Fixed STRIP_VLAN error

# This is the 2nd commit message:

Generalised mutiple action detection

# This is the 2nd commit message:

Add a slash between getUdsUrl() and action variable

# This is the 3rd commit message:

	new file:   adapter/ryu/omniui/simple_switch_13.py

# This is the 4th commit message:

	modified:   README.md
new file: simple_switch.py
73370ba 
	modified:   ../README.md
modified: README.md
733e8a6
Shun-Hsiang Hu added 3 commits April 8, 2015 13:00
Merge branch 'dev' of https://github.com/westwind/OmniUI into dev
3a83f6c 
Conflicts:
	.travis.yml
	README.md
	adapter/floodlight/README.md
	adapter/ryu/README.md
	adapter/ryu/omniui/omniui.py
	core/src/core.py
	run-tests.sh
modified: ../.travis.yml
7c40006 
	modified:   ../README.md
	modified:   floodlight/README.md
	modified:   ../core/src/core.py
	modified:   ../run-tests.sh
Revert " modified: core/config.json"
f75d2fe 
This reverts commit 0d36c7f.

Conflicts:
	core/config.json
@charlesmcchan
Copy link
Contributor

Superseded by pull request #86

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@westwind @charlesmcchan @ChickenFood @win911 @starbops @steven9467 @kansokusha