summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2013-02-15doc: internal document on openstack cooperationIsaku Yamahata
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-15test: tuning integration test for OFPT_FLOW_REMOVEDHIYAMA Manabu
tuning grace sec of tests for OFPT_FLOW_REMOVED. Sometimes, we will received the OFPT_FLOW_REMOVED message before rewirte the duration time of the ofp_flow_removed by the switch. Signed-off-by: HIYAMA Manabu <hiyama.manabu@po.ntts.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-15of1.3: fix ACTION_POP_MPLSFUJITA Tomonori
Fix a typo. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-14stop requiring gflagsYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-14fix a typo in the help message of quantum_controller_addrYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-14update a sample and documentationYAMAMOTO Takashi
try to sync the documentation with the reality at least about gflags/cfg changes. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-14adjust import order in ryu-manager and add a comment.YAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-14use openstack.common.cfg instead of gflagsYAMAMOTO Takashi
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>
2013-02-14import cfg.py from oslo-incubatorYAMAMOTO Takashi
import cfg.py taken from: https://github.com/openstack/oslo-incubator.git commit 30a50c8a6c534f01d518eb3ce4cf0d35877d9a7f we are going to switch from python-gflags to openstack cfg.py because the latter is more flexible wrt schema modifications. eg. it allows introducing options at module import time. references: http://wiki.openstack.org/CommonConfigModule Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-14controller: fix send_q drainingYAMAMOTO Takashi
when stopping the sender thread, ensure that no one is going to block on send_q. otherwise a ryu app who wants to do send_msg on the datapath can block on the queue forever if the queue is full. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-13of1.2: fix OFPQueueProp parserKONDOH Tasuku
- add OFP_QUEUE_PROP_HEADER_SIZE to offset of argument of propreties class. Signed-off-by: KONDOH Tasuku <kondoh.tasuku@po.ntts.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-13fix breakage the commit 68f3259754fdbd7b5351c9739bf6f238c7ffb313FUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-13controller/ofp_handler: improve version negotiationIsaku Yamahata
- fix string concatenation. Needs surrounding paren. - more version checks - make hello_failed private. (adding "_" prefix) Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-13quantum_adapter: exception when VM deletionIsaku Yamahata
> Traceback (most recent call last): > File "/usr/lib/python2.7/dist-packages/gevent/greenlet.py", line 390, in run > result = self._run(*self.args, **self.kwargs) > File "/opt/stack/ryu/ryu/base/app_manager.py", line 86, in _event_loop > handler(ev) > File "/opt/stack/ryu/ryu/app/quantum_adapter.py", line 368, in dp_handler > ovs_switch.close() > AttributeError: 'OVSSwitch' object has no attribute 'close' This is legacy from the old code, so remove calling close method Reported-by: Yoshihiro Kaneko <y.kaneko__0929@nifty.com> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-13LICENCE: change end-of-line code CRLF to LFIsaku Yamahata
> wrong-file-end-of-line-encoding rpmlint prefers unix style than dos converted by sed -i 's/\r//g' LICENSE Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-12tests: make run_tests.py, test_lib.py executable as it includes #!Isaku Yamahata
rpmlint requires it as follows. > ryu.noarch: E: non-executable-script /usr/lib/python2.7/site-packages/ryu/tests/run_tests.py 0644L /usr/bin/env > ryu.noarch: E: non-executable-script /usr/lib/python2.7/site-packages/ryu/tests/test_lib.py 0644L /usr/bin/env > This text file contains a shebang or is located in a path dedicated for > executables, but lacks the executable bits and cannot thus be executed. If > the file is meant to be an executable script, add the executable bits, > otherwise remove the shebang or move the file elsewhere. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-12doc: man pages for ryu-manager and ryu-clientIsaku Yamahata
In order to quieten rpmlint > ryu.noarch: W: no-manual-page-for-binary ryu-manager > Each executable in standard binary directories should have a man page. > > ryu.noarch: W: no-manual-page-for-binary ryu-client > Each executable in standard binary directories should have a man page. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-12doc: eliminate sphinx warningsIsaku Yamahata
This patch eliminates the following sphinx warnings. > ryu/doc/source/parameters.rst:47: ERROR: Unexpected indentation. > ryu/doc/source/step_by_step.rst:1: WARNING: malformed hyperlink target. > ryu/doc/source/step_by_step.rst:164: ERROR: Inconsistent literal block quoting. > ryu/doc/source/step_by_step.rst:229: WARNING: Bullet list ends without a blank line; unexpected unindent. > ryu/doc/source/step_by_step.rst:278: WARNING: Bullet list ends without a blank line; unexpected unindent. > ryu/doc/source/step_by_step.rst:320: WARNING: Bullet list ends without a blank line; unexpected unindent. > ryu/doc/source/step_by_step.rst:329: WARNING: Bullet list ends without a blank line; unexpected unindent. > ryu/doc/source/step_by_step.rst:333: WARNING: Bullet list ends without a blank line; unexpected unindent. > ryu/doc/source/step_by_step.rst:357: WARNING: Bullet list ends without a blank line; unexpected unindent. > checking consistency... ryudoc/source/parameters.rst:: WARNING: document isn't included in any toctree Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-08fix typos in commentsYAMAMOTO Takashi
netowrk -> network Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-08fix a fatal typo in network.pyYAMAMOTO Takashi
netowrk_id -> network_id Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-08fix a fatal typo in GRETunnel _CONTEXTSYAMAMOTO Takashi
netowrk -> network Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-08gre_tunnel: adapt to the new world order after dispatcher removalYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-08tunnel_port_updater: adapt to the new world order after dispatcher removalYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-08controller/handler: allow set_ev_handler without dispatchersYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-08app_manager: add some assertions and LOG.infoYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-08app_manager: print event flow for --verboseYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-08app_manager: print some info about event flows for --verboseYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> BRICK dpset PROVIDES EventPortModify TO ['PortSet'] PROVIDES EventPortAdd TO ['QuantumAdapter', 'PortSet'] PROVIDES EventDP TO ['QuantumAdapter', 'PortSet'] PROVIDES EventPortDelete TO ['QuantumAdapter', 'PortSet'] CONSUMES EventOFPSwitchFeatures CONSUMES EventOFPStateChange CONSUMES EventOFPPortStatus BRICK conf_switch PROVIDES EventConfSwitchDel TO ['TunnelPortUpdater', 'QuantumAdapter'] PROVIDES EventConfSwitchSet TO ['TunnelPortUpdater', 'QuantumAdapter'] BRICK network PROVIDES EventNetworkDel TO ['PortSet'] PROVIDES EventNetworkPort TO ['TunnelPortUpdater', 'PortSet'] PROVIDES EventMacAddress TO ['PortSet'] BRICK TunnelPortUpdater CONSUMES EventConfSwitchDel CONSUMES EventNetworkPort CONSUMES EventConfSwitchSet : : : : Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-08app_manager: add an function to register an app instance explicitlyYAMAMOTO Takashi
will be used by gre_tunnel Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-08Add support live-migrationYoshihiro Kaneko
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-08ryu/controller/controller: add a helper method, is_reserved_port()Isaku Yamahata
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-08ovs/bridge: more helper methodsIsaku Yamahata
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-08ovs/vsctl: more commandsIsaku Yamahata
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-08lib/ovs/db_client: library for low-level ovsdb manipulationIsaku Yamahata
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-08app/client: add mac supportIsaku Yamahata
- fix path to 'networks' - list_macs() must return string object, not implicit None Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-08app/rest: add requirements to path componentIsaku Yamahata
This patch adds requirements to path component so that URL is verified. And simplify with submapper. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-08app/rest: add API to register/update mac address for a given portIsaku Yamahata
Via this API, ryu knows that what mac address is associated with the port. So ryu can pass/drop packets from the port. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-08app/tunnel_port_updater: application that creates/deletes tunnel portsIsaku Yamahata
This application dynamically creates/deletes tunnel ports for GRE tunnel app. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-08ryu/controller/network.py: add helper functions for tunnel updaterIsaku Yamahata
This will be used by tunnel app. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-08app/gre_tunnel: implement GRETunnel appIsaku Yamahata
- race masking layer - implement GRETunnel app: app/gre_tunnel Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-07packet lib: rename icmp6 to icmpv6HIYAMA Manabu
- renamed variables "ICMP6_XXX" to "ICMPV6_XXX" Signed-off-by: HIYAMA Manabu <hiyama.manabu@po.ntts.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-07test: fix integration tests: reflects 978f3e5cHIYAMA Manabu
File "/home/openflow/git/osrg/ryu/ryu/tests/integrated/tester.py", line 167, in TestFlowBase @handler.set_ev_cls(dpset.EventDP, dpset.DPSET_EV_DISPATCHER) AttributeError: 'module' object has no attribute 'DPSET_EV_DISPATCHER' Signed-off-by: HIYAMA Manabu <hiyama.manabu@po.ntts.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-07dpset: fix the new event mechnism breakageFUJITA Tomonori
Keep the compatibility for a while. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-07dpset: improve debug messageYAMADA Hideki
Could not understand "reason" number at a glance. Signed-off-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-06packet lib: fix a bug in ipv6HIYAMA Manabu
ERROR: Failure: AttributeError ('module' object has no attribute 'IPPROTO_ICMP6') ---------------------------------------------------------------------- Traceback (most recent call last): (...) File "/home/openflow/git/osrg/ryu/ryu/lib/packet/ipv6.py", line 68, in <module> ipv6.register_packet_type(icmp6.icmp6, inet.IPPROTO_ICMP6) AttributeError: 'module' object has no attribute 'IPPROTO_ICMP6' Signed-off-by: HIYAMA Manabu <hiyama.manabu@po.ntts.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-06test: update integration testsHIYAMA Manabu
- remove get_supported() at test_request_reply_v12.py. use 'is_supported()' if any test wants to skip. - print results summary. Signed-off-by: HIYAMA Manabu <hiyama.manabu@po.ntts.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-05ryu/app/simple_vlan: simple VLAN app for OVSFUJITA Tomonori
Based on the following patch: Subject: ryu/app/simple_vlan: simple VLAN spp This application provides VLAN separation with ovs tag function. Something similar openstack quantum openvswitch vlan function. Example to run: ryu-manager ryu/app/simple_vlan.py \ ryu/app/quantum_adapter.py \ ryu/app/rest.py \ ryu/app/rest_conf_switch.py \ ryu/app/rest_tunnel.py \ ryu/app/rest_quantum.py Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-05app: Add quantum adapterFUJITA Tomonori
Based on the following patch: From: Yoshihiro Kaneko <ykaneko0929@gmail.com> Subject: app: Add quantum adapter Thanks to Kaneko for finding and fixing my bugs. Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-05bin/ryu-client: teach quantum iface rest apiIsaku Yamahata
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-05ryu/app/client: teach quantum iface apiIsaku Yamahata
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-05rest/quantum: quantum iface REST APIIsaku Yamahata
Quantum teach ryu the relation iface-id and network_id Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>