summaryrefslogtreecommitdiffhomepage
path: root/ryu/lib
AgeCommit message (Collapse)Author
2016-07-27stplib: Adopt to Python3IWASE Yusuke
In Python3, cmp() method is no longer supported and numerical operations evaluates value type more strictly. So, stplib get some errors in its calculating process. This patch fixes these problems and enable to use stplib on Python3 interpreter. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-07-27packet: support relayed DHCP packetMichael Haro
https://tools.ietf.org/html/draft-ietf-dhc-implementation-02#section-4.7.2 states that DHCP relays should use source port 67 and dest port 67. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-07-14Fix: LLDP.OrganizationallySpecific not ignoring info fieldJonas Grunert
LLDP.OrganizationallySpecificTLV did not set info field and produced malformed LLDP packets Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-07-11packet: Fix minimum ethernet frame lengthIWASE Yusuke
In the Ethernet frame Spec (Both DIX EthernetII and IEEE 802.3), the frame size must be at least 64 bytes long (not including the preamble). 64 bytes = 14 bytes (Header) + 46 bytes (Payload) + 4 bytes (FCS) This patch appends padding if the payload is less than 46 bytes long. Reported-by: Kawai, Hiroaki <kawai@iij.ad.jp> Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-07-11BGPSpeaker: Support Four-Octet AS numberIWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-07-11packet/bgp: Support Four-Octet AGGREGATOR Path AttributeIWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-07-01lib/ofctl_utils: Log the datapath sent toJason Kölker
If a controller has multiple switches connected it is useful to be able to distinguish which datapath the msg is being sent to. Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-06-18python 3: Replace deprecated logging.warn with logging.warningFumihiko Kakuma
logging.warn is deprecated in Python 3 [1]. This patch switches it to the non-deprecated logging.warning. This is bug-reported by openstack [2]. [1] https://docs.python.org/3/library/logging.html#logging.warning [2] https://bugs.launchpad.net/magnum/+bug/1508442 Signed-off-by: Fumihiko Kakuma <kakuma@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-06-01doc: Add PCAP file library referenceIWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-06-01pcaplib: Reduce Pylint warningsIWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-06-01packet/bgp: Reduce Pylint warningsIWASE Yusuke
This patch removes the following Pylint warnings: - anomalous-backslash-in-string - arguments-differ - bad-builtin - bad-staticmethod-argument - superfluous-parens - super-init-not-called - unidiomatic-typecheck - unused-variable - wrong-import-order Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-06-01bgp: fix typosIWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-05-23packet: Add VXLAN parserIWASE Yusuke
IANA has assigned the value 4789 for the VXLAN UDP destination port, this patch registers dst_port 4789 into UDP packet parser. Additionally, early adopters might be using UDP dst_port 8472, we register this number for the backward compatibility. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-05-18packet/bgp: Add missing __hash__ functionIWAMOTO Toshihiro
This commit fixes up the commit 7d42aecb, which added __eq__ without adding __hash__ and left some copy-paste error. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-05-18BGP: Make RouteFamily class hashableIWASE Yusuke
In Python 3, the key objects of dict must be hashable, but RouteFamily class does not have '__hash__' method. This patch adds this method. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-05-18doc: Remove warnings when building doc pagesIWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-05-13lib/ofctl: Support OpenFlow 1.5Minoru TAKAHASHI
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: Shinpei Muraoka <shinpei.muraoka@gmail.com> Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-05-13ofctl_v1_4: Port some improvements from ofctl_v1_3IWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-05-13ofctl_v1_4: Rename to get_queue_desc for uniformityIWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-05-13ofctl_v1_4: Support request parametersMinoru TAKAHASHI
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-05-13ofctl_utils: Enhance user value conversionIWASE Yusuke
Currently, OFCtlUtil._reserved_num_from_user() fails to convert an user specified value when it is a numeric string. This patch enhances this conversion to enable to convert an user value as follows. e.g.) - Integer: 1 -> 1 - Numeric string: "1" -> 1 - Reserved number: "OFPP_ANY" -> 0xffffffff - Invalid value: "foobar" -> "foobar" (do not conversion) Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-05-13lib/ofctl_v1_[23]: Unify the arguments orderIWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-05-13ofctl_utils: Confirm binary type data in send_experimenterIWASE Yusuke
In Python 3, the data field in OFPExperimenter must be a binary type value, but when data_type='ascii', ofctl_utils may get it as a str type value. This patch confirms the data field is a binary type value. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-30lib/ofctl_v1_[234]: Consolidate send_experimenterJason Kölker
Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-30lib/ofctl_v1_[34]: Consolidate common functionsJason Kölker
Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-30lib/ofctl_v1_3: Support nicira extensionsJason Kölker
Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-30lib/ofctl_v1_3: Allow caller to disable conversionJason Kölker
Paramaterizes type converions in function to allow calling code to specify if responses should be converted to user friendly display (strings) or type perserved. Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-30lib/ofctl_*: Consolidate `send_stats_requst`Jason Kölker
Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-30lib/ofctl_*: Log the xid of messages being sentJason Kölker
Useful for debugging calling code that waits for or uses reponses. Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-30lib/ofctl_v1_4: Flake8 FixesJason Kölker
Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-30lib/ofctl_v1_3: Flake8 FixesJason Kölker
Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-30lib/ofctl_v1_2: Flake8 FixesJason Kölker
Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-30lib/ofctl_v1_0: Flake8 FixesJason Kölker
Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-27packet/tcp: Add TCP Control FlagsJason Kölker
Add the control flags constants and a helper function to test which flags are on. Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-27lib/ofctl_utils: Add a deprecated valueMinoru TAKAHASHI
Note: The list of 'deprecated_value' are used by '_reserved_num_to_user()' to ignore values those are deprecated in OpenFlow Spec. Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-27lib/ofctl_v1_4: Fix json format of queue_desc_replyMinoru TAKAHASHI
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-27lib/ofctl_v1_4: Fix an omission in OFPTFPT_*Minoru TAKAHASHI
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-27lib/ofctl_v1_4: Fix a small bug in mod_group_entry()Minoru TAKAHASHI
If the specified value of group_type is empty, cause an error. This patch fixes this problem. Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-27lib/ofctl_v1_0: Fix a small bug in get_desc_stats() and ↵Minoru TAKAHASHI
get_aggregate_flow_stats() If there is an empty value in the reply msg, there are cases where those methods cause an error. This patch fixes this problem. Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-23ofctl_rest: Support port number and queue id in get_queue_stats()Shinpei Muraoka
This patch enables to specify the port number and the queue id to get the queue stats. Usage) $ curl -X GET http://localhost:8080/stats/queue/<dpid>[/<port>[/<queue_id>]] Note: Specification of port number and queue id are optional. If you want to omitting the port number and setting the queue id, please specify the keyword "ALL" to the port number. e.g. GET /stats/queue/1/ALL/1 Signed-off-by: Shinpei Muraoka <shinpei.muraoka@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-23ofctl_rest: Support meter id in get_meter_config()Shinpei Muraoka
This patch enables to specify the meter id to get the meter config. Usage) $ curl -X GET http://localhost:8080/stats/meterconfig/<dpid>[/<meter_id>] Note: Specification of meter id is optional Signed-off-by: Shinpei Muraoka <shinpei.muraoka@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-23ofctl_rest: Support meter id in get_meter_stats()Shinpei Muraoka
This patch enables to specify the meter id to get the meter stats. Usage) $ curl -X GET http://localhost:8080/stats/meter/<dpid>[/<meter_id>] Note: Specification of meter id is optional Signed-off-by: Shinpei Muraoka <shinpei.muraoka@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-23ofctl_rest: Support group id in get_group_stats()Shinpei Muraoka
This patch enables to specify the group id to get the group stats. Usage) $ curl -X GET http://localhost:8080/stats/group/<dpid>[/<group_id>] Note: Specification of group id is optional Signed-off-by: Shinpei Muraoka <shinpei.muraoka@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-23ofctl_rest: Support port number in get_port_stats()Shinpei Muraoka
This patch enables to specify the port number to get the port stats. Usage) $ curl -X GET http://localhost:8080/stats/port/<dpid>[/<port>] Note: Specification of port number is optional Signed-off-by: Shinpei Muraoka <shinpei.muraoka@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-23hub: Preserve functions return valueJason Kölker
Calling GreenThread.wait() should return the value of the greenthread or reraise the exception. As it is being wrapped to mimic gevent's .join behaviour introduce the `raise_error` kwarg to allow callers to specify the behavior they expect while maintaining backwards compatability. Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-11packet/bgp: PEP-8 and Python3 fixesJason Kölker
Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-11ofctl_v1_3: Add support for using action experimenterMinoru TAKAHASHI
This patch makes it possible for ofctl_v1_3 to use the action type of experimenter. Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-02-27Typo fixesVictor J. Orlikowski
Signed-off-by: Victor J. Orlikowski <vjo@duke.edu> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-02-27Wrap handler calls in the event loop in a try/except and log exceptionsVictor J. Orlikowski
In order to prevent an exception from terminating the execution of the event loop. Wrapper name also added to hub.py for GreenletExit. Signed-off-by: Victor J. Orlikowski <vjo@duke.edu> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-02-27Use a slightly lighter Queue implementationVictor J. Orlikowski
It does not include an internal counter. Signed-off-by: Victor J. Orlikowski <vjo@duke.edu> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>