Instead of keeping hardcoded files in bin/ directory it is
more flexible to install such files using setup.cfg file.
It will for example install files with correct shebang for
python2 and python3.
This patch also removes tools/osken-manager.spec file
as it was used by PyInstaller in Ryu and it isn't used
in os-ken.
Change-Id: Ie85c64d81c86f0059528ad4d8e238a4124d4e5b4
this new command takes a sub-command name as its first positional argument
and passes the rest of arguments to the corresponding sub-module.
for example, 'run' sub-command is an equivalent to bin/ryu-manager.
this commit does not replace the existing commands like ryu-manager.
this merely adds new ways to invoke the functionalities.
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
suggested by some openstack folks.
see https://review.openstack.org/#/c/71791
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Like ryu-manager, this agent serves Ryu applications and acts an OpenFlow
controller to control switches. The neutron agent logic, which we will
push to the neutron repo, is implemented as a Ryu application.
Implements: OpenStack blueprint ryu-ml2-driver
https://blueprints.launchpad.net/neutron/+spec/ryu-ml2-driver
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Since it is debugging tool for developer, don't install it.
and move it under ryu/rests directory.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This fixes a problem that app_mgr.close() is not called when
KeyboardInterrupt exception occurs.
Signed-off-by: OHMURA Kei <ohmura.kei@lab.ntt.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
event.py: add link events.
switches.py: add link discovery (only of1.0).
dumper.py: add handler for link events.
TODO: support other OpenFlow version.
Signed-off-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
to make cli show-options a little prettier.
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
rename options. (s/_/-/)
according to Isaku Yamahata, this makes us look similar to openstack.
caveat: no backward compat is provided. you need to update both of
config files and cli options.
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
make most of modules use openstack.common.cfg instead of gflags
caveats: no config file compatibility is provided. (flagfile vs ini file)
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Exception can be be caused by importing the threading module before
monkey.patch_all().
This patch fixes the following keyError:
$ ryu-manager --version
ryu-manager 1.5
Exception KeyError: KeyError(30027824,) in <module 'threading' from
'/usr/lib/python2.7/threading.pyc'> ignored
Signed-off-by: OHMURA Kei <ohmura.kei@lab.ntt.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
- create ryu/contrib directory
- adjust module load path for third party library and prioritize our own copy
than system's
- teach ryu-manager ryu/contrib
- run_tests.sh: exclude contrib dir for pep8
third party files will be included under ryu/contrib.
Third party files aren't suitable to our pep8 check because they aren't under
our control.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
No reason that we use register_cls() for ofp handlers. We can do with
register_instance() with the others do.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This patch simplifies integrated OVS test suite. Currently, we wait
for a barrier response before moving to the next test. However, we
don't need. The logic works like the following:
sending a flow mod (deleting all the flows)
sending a barrier
sending a flow mod (set up a flow to test)
sending a barrier
sending a flow stats
Then the reply handler for flow stats verifies the result and move to
the next.
You can run a test suite like:
$ ryu-manager ~/git/ryu/ryu/tests/integrated/test_add_flow_v12_actions.py
We can try two more suites:
ryu/tests/integrated/test_add_flow_v10.py
ryu/tests/integrated/test_add_flow_v12_matches.py
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This patch adds a test framework with OVS to test various matches and
actions; adding various matches and actions and check `ovs-ofctl
dump-flows' output.
First, create 'br-tester' bridge:
fujita@rose:~$ sudo ovs-vsctl add-br br-tester
Secondly, configure the bridge to use the local controller:
fujita@rose:~$ sudo ovs-vsctl set-controller br-tester tcp:127.0.0.1
Thirdly, run what you want to test. If you want to try adding flows on
OF1.0:
fujita@rose:~$ ryu-manager --verbose --run_test_mod ryu.tests.integrated.test_add_flow_v10 ryu.tests.integrated.tester
This patch adds three test sets:
ryu.tests.integrated.test_add_flow_v10
ryu.tests.integrated.test_add_flow_v12_actions
ryu.tests.integrated.test_add_flow_v12_matches
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
You can run your Ryu applicaiton in the following way:
$ ryu-manager yourapp.py
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reviewed-by: Isaku Yamahata <yamahata@valinux.co.jp>
RyuApp class is used as a base class for Ryu network application. So
let's pass Ryu application module name instead of class name.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reviewed-by: Isaku Yamahata <yamahata@valinux.co.jp>
Ryu uses NOX's code based on twisted for web service. It's much
cleaner to use webob since Ryu doesn't use twisted framework. Let's
give up the NOX compatibility (incomplete) and go with the cleaner
code.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reviewed-by: Isaku Yamahata <yamahata@valinux.co.jp>
The ryu-manager creates structures which applications share.
Currently it is hard-coded in ryu-managers. Concretely network.Network and
dpset.DPSet. It is difficult to maintain the code appropriately by hand.
When the application is changed or new application comes in, ryu-manager
also must be updated.
So introduce the notion of application context so that application manager
can determine what structures applications want to share and create them.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
To make the further integration into IaaS OSS (OpenStack and
CloudStack) easier, we switch to Apache 2.0 license.
ryu/app/wsapi.py is still under GPL3 or later. We replace it later.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Slawek Kaplonski