2696 Commits

Author SHA1 Message Date
Jason Kölker
369df99822 lib/ofctl_v1_[34]: Consolidate common functions
Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-30 08:08:53 +09:00
Jason Kölker
110118586f lib/ofctl_v1_3: Support nicira extensions
Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-30 08:08:48 +09:00
Jason Kölker
429a6bc546 lib/ofctl_v1_3: Allow caller to disable conversion
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-30 08:08:44 +09:00
Jason Kölker
cb51b6cdc3 lib/ofctl_*: Consolidate send_stats_requst
Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-30 08:08:40 +09:00
Jason Kölker
b69c5b907a lib/ofctl_*: Log the xid of messages being sent
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-30 08:08:35 +09:00
Jason Kölker
3350ee045e unit/lib/test_ofctl: Fix Flake8 [e731]
Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-30 08:08:28 +09:00
Jason Kölker
3b7b2819ce ofproto/ofproto_v1_4_parser: Flake8 Fixes
Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-30 08:08:10 +09:00
Jason Kölker
2825212c31 ofproto/ofproto_v1_3_parser: Flake8 Fixes
Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-30 08:08:06 +09:00
Jason Kölker
740cc3a099 ofproto/ofproto_v1_2_parser: Flake8 Fixes
Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-30 08:07:51 +09:00
Jason Kölker
a77ab6fddc ofproto/ofproto_v1_0_parser: Flake8 Fixes
Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-30 08:07:47 +09:00
Jason Kölker
bb3cfefb5d ofproto/nx_actions: Flake8 Fixes
Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-30 08:07:42 +09:00
Jason Kölker
daa77e73c7 lib/ofctl_v1_4: Flake8 Fixes
Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-30 08:07:38 +09:00
Jason Kölker
0f79e71fdc lib/ofctl_v1_3: Flake8 Fixes
Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-30 08:07:34 +09:00
Jason Kölker
e16faaa79c lib/ofctl_v1_2: Flake8 Fixes
Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-30 08:07:30 +09:00
Jason Kölker
b88adadec4 lib/ofctl_v1_0: Flake8 Fixes
Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-30 08:07:23 +09:00
FUJITA Tomonori
b8cb2d22aa pip-requires: force ovs>=2.6.0dev0 for everyone
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-30 05:02:38 +09:00
Jason Kölker
00c31a4d73 packet/tcp: Add TCP Control Flags
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-27 22:29:46 +09:00
Minoru TAKAHASHI
9bc1624932 lib/ofctl_utils: Add a deprecated value
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-27 22:29:40 +09:00
Minoru TAKAHASHI
61306439db lib/ofctl_v1_4: Fix json format of queue_desc_reply
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-27 22:29:35 +09:00
Minoru TAKAHASHI
5246068fe8 lib/ofctl_v1_4: Fix an omission in OFPTFPT_*
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-27 22:29:30 +09:00
Minoru TAKAHASHI
7715934d95 lib/ofctl_v1_4: Fix a small bug in mod_group_entry()
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-27 22:29:25 +09:00
Minoru TAKAHASHI
3484e6e573 lib/ofctl_v1_0: Fix a small bug in get_desc_stats() and 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-27 22:29:18 +09:00
Jason Kölker
d33c9f0fd9 protocols/ovsdb: Add api for systemd_id lookup
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-24 05:18:03 +09:00
Jason Kölker
9e7a3e2342 protocols/ovsdb: Add bulk read support
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-24 05:17:58 +09:00
Jason Kölker
b5cf6e1121 protocols/ovsdb: Fix shadow variables
Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-24 05:17:53 +09:00
Jason Kölker
2de65ac1ad protocols/ovsdb: Update wrapped Idl()
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-24 05:17:48 +09:00
Jason Kölker
e190549b76 protocols/ovsdb: Remove patched ovs.vlog
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-24 05:17:42 +09:00
Shinpei Muraoka
c9a68a429d test_ofctl: Add test cases
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-23 22:44:13 +09:00
Shinpei Muraoka
a1a5ff08b6 doc/app/ofctl_rest: Add the attribute for message
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-23 22:44:08 +09:00
Shinpei Muraoka
32f5c622b3 ofctl_rest: Support port number and queue id in get_queue_stats()
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-23 22:44:01 +09:00
Shinpei Muraoka
3e180d8504 ofctl_rest: Support meter id in get_meter_config()
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-23 22:43:56 +09:00
Shinpei Muraoka
c39b9d57f8 ofctl_rest: Support meter id in get_meter_stats()
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-23 22:43:50 +09:00
Shinpei Muraoka
ba1535b4b3 ofctl_rest: Support group id in get_group_stats()
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-23 22:43:45 +09:00
Shinpei Muraoka
294d241830 ofctl_rest: Support port number in get_port_stats()
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-23 22:43:40 +09:00
Jason Kölker
545645eef8 hub: Preserve functions return value
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-23 22:30:14 +09:00
Jason Kölker
69744305b9 protocols/ovsdb: Improve non-blocking performance
Prevent `client.discover_schemas` from blocking while calling into the
`ovs` library by emulating `jsonrpc.Connection.transact_block` to not
block and explicitly allow greenlet switching every loop.

Works with both the embeded ryu.contrib.ovs and upstream ovs python
packages.

Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-23 22:29:07 +09:00
Jason Kölker
8d2604ee67 contrib/ovs: Remove embeded ovs, use upstream
Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-21 19:28:32 +09:00
Jason Kölker
0ffbc19e18 protocols/ovsdb: Fix variable name issue
Previous patch referred to the wrong config names

Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-17 08:53:15 +09:00
Jason Kölker
2b047bd7d7 protocols/ovsdb: Allow setting backoff settings
Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-17 06:11:11 +09:00
Victor J. Orlikowski
a3c8c591d9 Cleanups to controller.py
A set of minor cleanups.
1) Remove the unused import of MAIN_DISPATCHER from ryu.controller.handler.
2) Remove the extraneous "close_requested" variable.
3) Ensure use of equality instead of identity for testing against DEAD_DISPATCHER.
4) Alter the exit condition for the _send_loop.

Signed-off-by: Victor J. Orlikowski <vjo@duke.edu>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-11 23:56:34 +09:00
Jason Kölker
8ae807ff66 protocols/ovsdb: Allow setting probe interval
Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-11 23:44:47 +09:00
Jason Kölker
57c6897210 protocols/ovsdb: Fix shadow loop variables [F402]
Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-11 23:44:45 +09:00
Jason Kölker
db02d0f487 protocols/bgp: PEP-8 and Python3 fixes
Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-11 23:44:27 +09:00
Jason Kölker
7d42aecb8d packet/bgp: PEP-8 and Python3 fixes
Signed-off-by: Jason Kölker <jason@koelker.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-11 23:44:24 +09:00
Minoru TAKAHASHI
03e365d6b1 doc/app/ofctl_rest: Update description for 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-03-11 23:44:08 +09:00
Minoru TAKAHASHI
020eb2b9bf ofctl_v1_3: Add support for using action experimenter
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-03-11 23:44:06 +09:00
Minoru TAKAHASHI
801bdacbe3 ofproto_v1_3: Add unit test cases for action experimenter
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-11 23:44:03 +09:00
Minoru TAKAHASHI
7316f86034 ofproto_v1_5: Reduce an unnecessary code
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-11 23:43:49 +09:00
Minoru TAKAHASHI
2f1500cc37 ofproto_v1_5: Add test case for OFPExperimenter
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2016-03-11 23:43:40 +09:00
FUJITA Tomonori
1adae0f4df Ryu 4.0
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
v4.0
2016-03-04 05:56:43 +09:00