summaryrefslogtreecommitdiffhomepage
AgeCommit message (Collapse)Author
2016-05-13ofctl_rest: Enable to omit port_no and queue_idShinpei Muraoka
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_rest: Adopt decorator to simplifyIWASE Yusuke
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-05-13test_ofctl: Test cases for omitting port_no in get_queue_configShinpei Muraoka
Add test cases of specify the port number for get queues config. 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-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-05-13test_import_module: Update test casesMinoru TAKAHASHI
Because Python does not provides features to unimport modules which ware imported before, this patch separates dummy modules to test import features of Ryu. e.g.) If 'aaa' was imported in the previous test case, 'aaa' affects the subsequent test cases. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-05-13utils: fix for temporarily storing the value of sys.pathMinoru TAKAHASHI
Currentry, the *reference* of sys.path is temporarily stored before appending a path to the user modules. However, the *value* of sys.path should be stored because the type of sys.path is list (mutable object) type. Reported-by: Xandaros <mz.bremerhaven@gmail.com> 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-10Ryu 4.2FUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-05-10Enable filtering the OVSDB schema tables/columnsAlan Quillin
Adds the ability to filter the OVSDB scheme to only include specified tables from the config as well as filter out (exclude) specific table columns. If neither of the values are defined in the config, then the discovered schema is used unchanged. The is needed to calm down noise with unused tables/columns to help with scale problems on hosts with a large number of bridges and interfaces. Signed-off-by: Alan Quillin <alanquillin@gmail.com> Acked-By: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-05-09tox: Upgrade PyPy version to 2.6IWASE Yusuke
Recently, Paramiko updates the requirements to 'cryptography>=1.1', cryptography 1.0 is not compatible with PyPy < 2.6, but PyPy version of Travis-CI is older than 2.6. So this causes CI test error. This patch upgrades PyPy interpreter version to 2.6 in tox environment. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-04-20Eventlet throws a subclass of IOError when an SSL read timeout occurs. ↵Victor J. Orlikowski
Ensure that the read loop continues in this case. Signed-off-by: Victor J. Orlikowski <vjo@duke.edu> Tested-by: Andy Hill <hillad@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-04-18Added support for the tcp flags nicira extensionAlan Quillin
Adds support for setting TCP flags using the nicira extensions for OF1.0 and OF1.2+ Allows using the extensions with OF1.2+ for OVS versions < 2.4 where the TCP flags OF extension is not yet supported. Signed-off-by: Alan Quillin <alanquillin@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-04-06Removes unnecessary Windows requirementsClaudiu Belu
The wmi and pywin32 modules are not used anywhere in this project. There is no reason to have them.
2016-04-02Ryu 4.1FUJITA Tomonori
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-04-02doc/app/ofctl_rest: Update example of set-field actionShinpei Muraoka
Signed-off-by: Shinpei Muraoka <shinpei.muraoka@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-04-02doc/app/ofctl_rest: Update the code-block language of response dataShinpei Muraoka
Signed-off-by: Shinpei Muraoka <shinpei.muraoka@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-04-02doc/app/ofctl_rest: Update the ryu.app.ofctl_rest version from openflow1.3 ↵Shinpei Muraoka
to openflow1.4 Signed-off-by: Shinpei Muraoka <shinpei.muraoka@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-30unit/lib/test_ofctl: Fix Flake8 [e731]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-30ofproto/ofproto_v1_4_parser: 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-30ofproto/ofproto_v1_3_parser: 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-30ofproto/ofproto_v1_2_parser: 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-30ofproto/ofproto_v1_0_parser: 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-30ofproto/nx_actions: 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_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-30pip-requires: force ovs>=2.6.0dev0 for everyoneFUJITA Tomonori
The version of pip on Ubuntu 14.04 can't handle the version condition. So force ovs>=2.6.0dev0 for python2.7 users too. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Acked-by: Jason Kölker <jason@koelker.net>
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-24protocols/ovsdb: Add api for systemd_id lookupJason Kölker
Create an api helper function for correlation of system_id given a datapath_id. Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-24protocols/ovsdb: Add bulk read supportJason Kölker
At times is it convient to read from all clients at the same time. In particular when searching for what system_id a port or bridge (datapath) belongs to. Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-24protocols/ovsdb: Fix shadow variablesJason Kölker
Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-24protocols/ovsdb: Update wrapped Idl()Jason Kölker
Upstream ovs added the `Idl.readonly` property after ryu embeded ovs. Add the property for compatability. Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-24protocols/ovsdb: Remove patched ovs.vlogJason Kölker
The upstream `ovs.vlog` plays nice with python logging. No need for the workaround. Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-23test_ofctl: Add test casesShinpei Muraoka
This patch adds the following test cases. - Specify the port number for get ports stats. - Specify the group id for get group stats. - Specify the meter id for get meter stats. - Specify the meter id for get meter config. - Specify the port number and queue id for get queue stats. Signed-off-by: Shinpei Muraoka <shinpei.muraoka@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-23doc/app/ofctl_rest: Add the attribute for messageShinpei Muraoka
This patch adds attributes of the following messages. - Add the port number for get ports stats. - Add the group id for get group stats. - Add the meter id for get meter stats. - Add the meter id for get meter config. - Add the port number and queue id for get queue stats. 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 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>