summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2013-02-25appease pep8YAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-25test of1.2: add test code of max, min, and pattern. review of the test codeKONDOH Tasuku
Signed-off-by: KONDOH Tasuku <kondoh.tasuku@po.ntts.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-25xflow: add sflow supportwatanabe.fumitaka
This patch implements sflow packet parser. I confirmed that it can parse a sflow packet from Open vSwitch. Signed-off-by: WATANABE Fumitaka <watanabe.fumitaka@nttcom.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-24remove no longer used contrib/openstackYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-24switch from openstack.common.cfg to oslo.config.cfgYAMAMOTO Takashi
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-24import oslo-configYAMAMOTO Takashi
import oslo-config as of today. https://github.com/openstack/oslo-config.git commit df77677698483b58d6026994614cb847d25f9b69 this is a new version of the code which we currently have in contrib/openstack. mainly to obtain the following change. commit 16c4ecbefc94941821f3ae7ca253fad7bc377c58 Author: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Date: Wed Feb 13 14:01:46 2013 +0900 sort options to make --help output prettier explicitly sort options when adding them to argparse. it's a bit silly to print them in a dict iteration order. Change-Id: Id508331d7ee3b24e76be7fa958d27d29905bd3d2 Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-24controller: fix that sender thread is never terminatedYAMADA Hideki
Empty q.get() is blocking send thread. Because of this issue, datapath state never transit to DEAD. This fixes commit 83e3709a0d70f889e794d1c5f70c1c1eb73075f7. - controller: fix send_q draining https://github.com/osrg/ryu/commit/83e3709a0d70f889e794d1c5f70c1c1eb73075f7 Signed-off-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-24test: remove unnecessary variablesHIYAMA Manabu
Signed-off-by: HIYAMA Manabu <hiyama.manabu@po.ntts.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-24packet lib: fix icmpv6.nd_s.parser() and support NDP option typeHIYAMA Manabu
This patch fixes parser error if there is no NDP option, and support the class to handle the NDP option. I have implemented only the option type = 1 and 2. We also need to implement other type, but this is enough in mininet for now. > Traceback (most recent call last): > (...) > File "/usr/local/lib/python2.7/dist-packages/ryu-1.6-py2.7.egg/ryu/lib/packet/icmpv6.py", line 87, in parser > msg.data = cls_.parser(buf, offset) > File "/usr/local/lib/python2.7/dist-packages/ryu-1.6-py2.7.egg/ryu/lib/packet/icmpv6.py", line 134, in parser > buf, offset) > error: unpack_from requires a buffer of at least 28 bytes Signed-off-by: HIYAMA Manabu <hiyama.manabu@po.ntts.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-24of1.3: fix error in port_mod and get_config_reply logic张东亚
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-24ryu/controller/dpset.py: duplicate importIsaku Yamahata
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-24of1.2: fix OFPGroupDescStats parserKONDOH Tasuku
- add action's size to offset of bucket. Signed-off-by: KONDOH Tasuku <kondoh.tasuku@po.ntts.co.jp> Reviewed-by: Simon Horman <horms@verge.net.au> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
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>