summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2018-07-31Fix UT when running in python 3.7 envSlawek Kaplonski
Due to change [1] in python 3.7 one of ryu's unit tests was failing with this version of interpreter. It was like that because of missing __qualname__ attribute in functools.partial object. This patch fixes it by adding such attribute if it's not set already. [1] https://github.com/python/cpython/pull/4496 Signed-off-by: Slawek Kaplonski <skaplons@redhat.com> Acked-By: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-07-21lib/ovs/bridge: Return multiple controllersIWAMOTO Toshihiro
OVSBridge may have more than one controller. Let get_controller() return a list of controllers in such cases. NOTE: this introduces incompatibility if multiple controllers are configured for a bridge. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-07-15BGPSpeaker: Enable to specify remote port for neighborIWASE Yusuke
Currently, the remote port of neighbor is the hard-coded value 179. This patch enables to specify the remote port of neighbor in "BGPSpeaker.neighbor_add()" API. Suggested-by: Suresh Kumar <knetsolutions2@gmail.com> Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
2018-07-15switch.tester: Fix name shadowingIWAMOTO Toshihiro
tester.py imported all the classes from the packet library at the top level namespace. This commit adds CLSNAME_ALIASES dict so that those classes with the same names can be imported as different names. This fixes an issue reported by ted.nozaki in ryu-devel: https://sourceforge.net/p/ryu/mailman/message/36312622/ Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-07-15gui_topology: Avoid wildcard URL matchingIWAMOTO Toshihiro
GUIServerController eats up the entire URL space and sometimes causes problems. See the following thread in ryu-devel for example: https://sourceforge.net/p/ryu/mailman/message/36312411/ Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-07-01Ryu 4.26FUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-06-20nx_actions: Fix NXActionSetTunnel docstringIWAMOTO Toshihiro
set_tunnel and set_field:xxx->tun_id are different actions. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-06-20Fix pycodestyle W605 warningsIWAMOTO Toshihiro
W605 invalid escape sequence, which was recently added in pycodestyle, would be a syntax error in future python3 versions. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-06-20BGPSpeaker: Fix BGP state string conversionIWASE Yusuke
The constants BGP_FSM_* are str type values and not callable. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-06-20pycodestyle: Ignore W504IWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-06-20BGPSpeaker: Advertise local routes to RR clientsIWASE Yusuke
The current implementation misses the mandatory attributes when sending locally generated routes to its Route Reflector (RR) clients, then the clients will reject the received routes. This patch fixes to add or update attributes to for sending locally generated routes its RR clients. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-06-20pip: Blacklist eventlet 0.23.0IWAMOTO Toshihiro
This is to sync with OpenStack requirements. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-06-20lldp: Remove remaining SystemCapabilities.subtype from testsIWAMOTO Toshihiro
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-06-20lldp: fixed SystemCapabilities TLVMarcin Chron
This patch removes 'Subtype' byte from SystemCapabilities TLV. There was an inconsistency in offical IEEE document which was corrected in 802.1AB-2009/Cor 1-2013. Signed-off-by: Marcin Chron <marcin_miko1@o2.pl> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-06-01Ryu 4.25FUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-05-13allow versions of eventlet > 0.21.0Joe Mader
2018-04-01Ryu 4.24FUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-03-28ofproto: add Nicira extension ct_clear actionIWAMOTO Toshihiro
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-03-26ofproto: Encode data field on OFPErrorMsgIWASE Yusuke
Currently, when Ryu failed to negotiate the OpenFlow version with a switch, Ryu will send the OFPT_ERROR message with an error reason on its data field. But on Python 3, error reason string is a str type value and required to be encoded into a bytes type value, otherwise causes an exception when sending the message. This patch fixes to encode the given str value into a bytes type value in OFPErrorMsg.__init__() and solves this problem. Signed-off-by: William Fisher <william.w.fisher@gmail.com> Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-03-26ofp_handler: Close socket when HELLO failedIWASE Yusuke
With this patch, when failed to negotiate the OpenFlow version with a switch, Ryu will close the socket connecting to the switch after sending a OFPT_ERROR message. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-03-26controller: Wait for switch to disconnect connectionIWASE Yusuke
If a sender closes a socket immediately after sending some data, a receiver can fail to receive full data from the sender. This patch fixes to shutdown a socket with "SHUT_WR" (disallows further sends only) and enables "Datapath" to wait for a switch to disconnect the connection. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-03-26controller: Option to close socket after sending MessageIWASE Yusuke
Currently, Ryu does not provide the way to close a socket connecting to a switch after sending all enqueued messages, but provides only the way to close the socket immediately regardless of enqueued messages. This patch adds a new option "close_socket" into "Datapath.send_msg()" method and this option enables to close the socket after sending the given message. This patch is convenient to close the socket after sending OFPT_ERROR message to the switch. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-03-26controller: Improve pylint resultIWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-03-26test_requirements: Avoid using pip as libraryIWASE Yusuke
Because importing "pip" in Python scripts is not supported usage of "pip", this patch fixes to use "pkg_resources" + "urllib" instead. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-03-26utils: Remove "parse_requirements" functionIWASE Yusuke
This patch removes unused function "parse_requirements" in order to avoid using "pip" as a Python library. Note: Officially "from pip import req as pip_req" is not supported usage of "pip". Reported-by: Katsaounis Molyvas Stamatios <mokats@intracom-telecom.com> Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-03-20Switch to msgpack in pip-requiresThomas Bechtold
msgpack-python got renamed to msgpack[1] so use the new name. [1] https://pypi.python.org/pypi/msgpack/0.5.1 Signed-off-by: Thomas Bechtold <tbechtold@suse.com> Acked-By: Iwase Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-03-20nicira_ext: Support DEC_NSH_TTL actionIWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-03-20nicira_ext: Support Network Service Header matchIWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-03-05doc: Fix unexpected indent in ofctl.api docIWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-03-02Ryu 4.23FUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-02-10doc: Document for ryu.lib.ovsIWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-02-10lib/ovs: Fix a typo of "--may-exist" optionIWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-02-01Ryu 4.22FUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-01-23bgp/application: Add note for BGPSpeaker API referenceIWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-01-23BGPSpeaker: Move docstring from __init__ to classIWASE Yusuke
By the default, Sphinx does not include __init__() method for the "autoclass" directive, and currently the description for the arguments of BGPSpeaker is not generated. This patch moves the docstring of __init__() to the class's docstring and enables to generate the docs for the arguments of __init__(). Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-01-23BGPSpeaker: Enable to notify adj-RIB-in changedIWASE Yusuke
This patch introduces a new argument "adj_rib_in_change_handler" into BGPSpeaker and enables to notify adj-RIB-in changed to watchers. Also this patch enables to "bgp.application.RyuBGPSpeaker" to notify a new event EventAdjRibInChanged to other Ryu applications. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-01-17ofctl: Enable to get all datapath objectsIWASE Yusuke
Also, updates the API document of ryu.app.ofctl.api. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-01-17confroller/dpset: Add usage example of instantiationIWASE Yusuke
This patch adds the example to explain how to register dpset.DPSet service and how to get DPSet instance from user application in order to call the API of DPSet. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-01-17test_rpc: Adopt to msgpack-python>=0.50IWASE Yusuke
msgpack-python version 0.50 or later supports bytearray objects, this patch fixes to adopt to this change. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-01-17doc: Usage for ryu/services/protocols/bgp/application.pyIWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2018-01-02Ryu 4.21FUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2017-12-17*: Apply autopep8IWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2017-12-17travis: Introduce autopep8 testIWASE Yusuke
This patch add a new test using "autopep8" to keep codes reformatted easily by using Python tool. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2017-12-17*: Adopt to pycodestyle's checksIWASE Yusuke
This patch adopts to the following pycodestyle's checks; E275: missing whitespace after keyword E305: expected 2 blank lines after end of function or class Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2017-12-17pycodestyle: Replace pep8IWASE Yusuke
pep8 has been renamed to pycodestyle and will be removed in a future release. This patch replaces pep8 by pycodestyle and adding some settings for pycodestyle. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2017-12-17ofproto_v1_5_parser: oxm_ids with name str in OFPActionCopyFieldIWASE Yusuke
Currently, oxm_ids argument of OFPActionCopyField should be a list of OFPOxmId instances, but this patch enables to specify with the OXM field name as the str type value which is corresponding to the keywords of OFPMatch. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2017-12-17ofproto_v1_5_parser: Missing trailing pads of OFPActionCopyFieldIWASE Yusuke
OpenFlow Spec 1.5 says OFPActionCopyField has the trailing paddings to make the action a whole multiple of 8 bytes in length. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2017-12-17ofproto_v1_5_parser: Fix length calculation of OFPOxmIdIWASE Yusuke
Currently, the oxm_length field is always composed with zero value because OpenFlow Spec does not still clarify whether its value should be doubled if the hasmask bit is set. This patch fixes to compose the oxm_length value with the payload length because Open vSwitch strictly checks the oxm_length which contained in the OFPAT_COPY_FIELD action (introduced at OpenFlow 1.5), and this causes the OFPT_ERROR messages then flows will not be installed. Note: This patch does not backport this fix to ofproto_v1_3_parser.py and ofproto_v1_4_parser.py because those modules are tested based on the implementation of "linc/of_protocol" which supposes the oxm_length is always zero. Also OFPOxmId should be rarely serialized at the controller side when using OpenFlow 1.3 or 1.4. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2017-12-11ovsdb: Fix small bugFelician Nemeth
Signed-off-by: Felicián Németh <nemethf@tmit.bme.hu> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2017-12-11packet_data_generator3: Generate OF13 Ext-230 bundle packetsIWAMOTO Toshihiro
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>