summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
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>
2013-02-05ryu/lib/quantum_ifaces.py: track the relation of quantum iface-idFUJITA Tomonori
Based on the following patch: From: Isaku Yamahata <yamahata@valinux.co.jp> Date: Tue, 20 Nov 2012 12:21:51 +0900 Subject: ryu/lib/quantum_ifaces.py: track the relation of quantum iface-id This is needed for quantum plugin in order to track the association from iface-id to network id or other info. 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: support switch_confIsaku Yamahata
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: support gre tunnel clientIsaku 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: support conf_switchIsaku 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: REST API to set per-switch configurationIsaku Yamahata
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-05controller/switch_conf: introduce a class to manage per-switch configurationFUJITA Tomonori
This should be merged into dpset... Based on the following patch: From: Isaku Yamahata <yamahata@valinux.co.jp> Subject: controller/switch_conf: introduce a class to manage per-switch configuration For tunnel application and generally, it is necessary to associate configurations to each switches. Such as tunnel port ip address for each switches. So introduce a helper class to manage those configurations. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-05app/client: add tunnel clientIsaku Yamahata
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-05app/rest_tunnel: REST API for tunnelIsaku Yamahata
With this API, other component such as openstack quantum tells informations necessary for tunnel. - tunnel key corresponding to network id - tunnel port related information which tunnel port of a given datapath connected to which remote datapath Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-05controller/tunnel: introduce new class for tunnelingFUJITA Tomonori
This should be renamed (already used for non tunnel stuff, e.g. VLAN). Based on the following patch: From: Isaku Yamahata <yamahata@valinux.co.jp> Subject: controller/tunnel: introduce new class that tracks infos related to tunneling - helper functions and event generator for gre tunnel - plug events 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-05dpset: add port event supportFUJITA Tomonori
Based on the following patch: From: Isaku Yamahata <yamahata@valinux.co.jp> Subject: dpset: add port{add, delete, modify} event for convenience and helper functions It is sometimes commonly interesting to track datapath/port appearance/disappearance. The applications usually want to see that ports appear after datapath becomes ready, and ports disappear when datapath is dead. It requires to handle properly events, hand shaking, port_mod event, switch_feature_reply. So introduce a common layer to handle them. GRE tunnel is interested in datapath/port appearance/disappearance. With this, tunnel app doesn't have to handle those conditions. Discovery is interested only in datapath/port appearance/disappearance. With this, discovery app would not have to handle OFP events directly. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-05controller/network: add event supportsFUJITA Tomonori
Base on the following patch: From: Isaku Yamahata <yamahata@valinux.co.jp> Subject: controller/network: factor out network.py and add event generator for gre tunnel and helper methods - Factor out from network.py the logic to track network and dpid - introduce class Port to allow other info Later we'll track mac address associated to port. So allow intermediate layer to contain infos related to Port. - make network track mac address associated to port - generate events Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-05controller/handler: allow set_ev_cls not to specify dispatchersFUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-05packet lib: add ipv6 ICMP supportHenkel, Michael
Signed-off-by: "Henkel, Michael" <michael.henkel@hp.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-05packet lib: add ipv6 supportHenkel, Michael
Signed-off-by: "Henkel, Michael" <michael.henkel@hp.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-05packet lib: add LLDP support.YAMADA Hideki
See "ryu/tests/unit/packet/test_lldp.py" to use this library. This patch is based on Yamahata's topology discovery patch series. http://thread.gmane.org/gmane.network.ryu.devel/467 Signed-off-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>