1831 Commits

Author SHA1 Message Date
Yuichi Ito
1146d1da67 sw test tool: Add support for initialization of group tables
Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-27 20:24:28 +09:00
Yuichi Ito
2b4500ab3d sw test tool: Add a link between switches
This change is for tests that use group_table.

Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-27 20:24:17 +09:00
Satoshi Kobayashi
41a52adaf8 wsgi: add ws_topology application
- Topology change is notified
  - JSON-RPC/WebSocket

Signed-off-by: Satoshi Kobayashi <satoshi-k@stratosphere.co.jp>
Reviewed-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-24 10:53:06 +09:00
Satoshi Kobayashi
aecc7b0af5 rest_topology: use decorator api
Signed-off-by: Satoshi Kobayashi <satoshi-k@stratosphere.co.jp>
Reviewed-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-24 10:52:55 +09:00
Yuichi Ito
d91f5e08f7 sw test tool: pylint
E:1026, 8: Instance of 'DummyDatapath' has no 'set_xid' member (but some types could not be inferred) (maybe-no-member)
E:1027, 8: Instance of 'DummyDatapath' has no 'send_msg' member (but some types could not be inferred) (maybe-no-member)

NOTE: These methods are never called. This patch is only for avoiding pylint error.

Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-21 17:50:52 +09:00
Yuichi Ito
0356f5ff22 sw test tool: Reduce similar methods of checking entries exist
All of _test_xxx_exist_chk() are merged as _test_exist_chk().

Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-21 17:50:52 +09:00
Yuichi Ito
5ad4f2c212 sw test tool: Reduce similar methods of handling events
All of xxx_stats_reply_handler() are merged as stats_reply_handler().

Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-21 17:50:52 +09:00
Yuichi Ito
d02ab63a7d sw test tool: Reduce similar methods of initializing flows
_test_initialize_flow_tester() is merged into _test_initialize_flow().

Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-21 17:50:52 +09:00
Yuichi Ito
cc47d4d9f2 sw test tool: Reduce similar methods of deleting flows
OpenFlowSw.del_test_flow() and OpenFlowSw.del_flows_for_throughput_analysis() are merged as OpenFlowSw.del_flows().

And rename OpenFlowSw.del_test_meter() to OpenFlowSw.del_meters(), like OpenFlowSw.del_flows().

Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-21 17:50:52 +09:00
Yuichi Ito
d73d3bb136 sw test tool: Reduce similar classes
TargetSw and TesterSw are merged as OpenFlowSw.

Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-21 17:50:52 +09:00
Yuichi Ito
fea1f610aa sw test tool: Remove an unnecessary wrapper method
Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-21 17:50:51 +09:00
YAMADA Hideki
f27768650e simple_switch_websocket_13: Add get_arp_table RPC method
Signed-off-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-20 12:39:09 +09:00
YAMADA Hideki
192d693075 pip-requires: WebSocket-RPC requires tinyrpc
Signed-off-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-20 12:39:09 +09:00
YAMADA Hideki
377769e354 Add WebSocket JSON RPC feature
Signed-off-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-20 12:39:09 +09:00
YAMADA Hideki
55fe4e17ec simple_switch_websocket_13: fix typo
Signed-off-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-20 12:39:09 +09:00
Satoshi Kobayashi
7598ef0561 New API for WebSocket support
- API
 - @websocket decorator
 - WSGIApplication#websocketmanager()
- bugfix
 - Even if a connection is cut, it continues remaining
- remove restriction
 - Two or more connections can be accepted

Signed-off-by: Satoshi Kobayashi <satoshi-k@stratosphere.co.jp>
Reviewed-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-19 14:36:28 +09:00
YAMADA Hideki
eb0055f0ce Add PacketIn dumper websocket application
Signed-off-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-16 05:03:11 +09:00
YAMADA Hideki
7b6f638874 wsgi: Support WebSocket
- Hack webob.dec.wsgify for taking start_response function.
- Add websocket handshake helper method to controller.

Signed-off-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-16 05:03:11 +09:00
YAMADA Hideki
28339dd774 Import eventlet.websocket from master branch
Because eventlet 0.14 doen't support RFC 6455.

Signed-off-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-16 05:03:11 +09:00
YAMADA Hideki
73e16c15cc hub: import semaphore
Signed-off-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-16 05:03:10 +09:00
Yuichi Ito
ca1b271705 tester: cleanup the code of couting the results
Reported-by: Chiu,Cheng-Han <a54931232@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-16 04:40:43 +09:00
Chiu,Cheng-Han
200241a66d tester: let each attribute of meter had a chance to be compared.
Signed-off-by: Chiu,Cheng-Han <a54931232@gmail.com>
Reviewed-by: Yuichi Ito <ito.yuichi0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-16 04:40:00 +09:00
Yoshihiro Kaneko
ee5bf73b73 add openflow api reference for of1.4
Update OpenFlow API document.
- add OpenFlow 1.4 API Reference
- update OpenFlow API Reference index for OF1.4

Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-15 08:00:35 +09:00
Yoshihiro Kaneko
fe8d8e27c5 app/rest_qos: fix pep8
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-14 15:53:02 +09:00
Yoshihiro Kaneko
6ab117db4f add pep8 options to tox.ini
Add the pep8 section to tox.ini and specify ignoring E113.
Many E113 errors appeared on comments. It seems a bug of pep8, so it can be ignored.

Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-14 15:39:33 +09:00
Yoshihiro Kaneko
857ec0c019 tests/unit: fix pep8
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-14 13:20:58 +09:00
Yoshihiro Kaneko
bd61cd5dd1 tests: fix pep8
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-14 13:20:58 +09:00
Yoshihiro Kaneko
c468fdd126 services/protocols: fix pep8
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-14 13:20:58 +09:00
Yoshihiro Kaneko
039f9a154c lib/xflow: fix pep8
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-14 13:20:58 +09:00
Yoshihiro Kaneko
c38270ce12 lib/packet: fix pep8
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-14 13:20:57 +09:00
Yoshihiro Kaneko
853bdeb1c3 lib/of_config: fix pep8
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-14 13:20:08 +09:00
Yoshihiro Kaneko
3f46c5a2ff lib: fix pep8
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-14 13:19:16 +09:00
Yoshihiro Kaneko
16839dfc68 controller: fix pep8
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-14 13:19:16 +09:00
Yoshihiro Kaneko
89a428b10b app: fix pep8
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-14 13:19:16 +09:00
Yoshihiro Kaneko
f295487bef topology/switches: fix pep8
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-14 13:19:16 +09:00
Yoshihiro Kaneko
f79634b3c7 base/app_manager: fix pep8
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-14 13:19:16 +09:00
Yoshihiro Kaneko
df8f807e13 ofproto: fix pep8
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-14 13:19:16 +09:00
Kiyonari Harigae
01bf2ca349 Added rest_qos module
This module is intended for operation in a pipeline on a flow table.
It supports setting of the queue, (Currently, only support
OpenvSwitch), packet marking, queuing, regitation to meter table,
perform this simple QoS.

Signed-off-by: Kiyonari Harigae <lakshmi@cloudysunny14.org>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-13 14:43:22 +09:00
ISHIDA Wataru
abafab9149 packet/bgp: bug fix of route target nlri class
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-10 01:14:57 +09:00
ISHIDA Wataru
b65d6dc315 bgp: fix bug of accessing dead socket
BGP session can be closed by sending inappropriate messages.
So touching socket by get_peername() after sending messages may cause an
exception. Though we can handle this by try..exception, I fixed to simply
call get_peername() before sending messages because session disconnection by
sending messages is an ordinary procedure and not an exception(the peer will
send notification before disconnection).

Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-10 01:14:57 +09:00
ISHIDA Wataru
2430fc7c17 bgp: improve how to show rib
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-10 01:14:56 +09:00
ISHIDA Wataru
e3a3c7dc0c bgp: fix typo
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-10 01:14:56 +09:00
ISHIDA Wataru
4f8d7a1411 packet/bgp: enhanced route refresh support
Enhanced Route Refresh(draft-ietf-idr-bgp-enhanced-route-refresh) uses
reserved fields in a Route Refresh message as demarcation fileds.

Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-10 01:14:56 +09:00
ISHIDA Wataru
c560908633 packet/bgp: fix bug in serializing AS PATH path attribute
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-10 01:14:56 +09:00
ISHIDA Wataru
7c1410ccf6 bgp: add ssh client
add ssh client which has basic bash keybinds and tab complement.
to use, you have to create ssh key at first then specify the location of
the key in ryu configuration files.

configuration file will be like this.

> ryu.conf
> ==
> [DEFAULT]
> cli_ssh_hostkey=/home/user/.ssh/id_rsa

after this, run operator/ssh.py with application.py

$ ryu-manager --config-file=ryu.conf application.py operator/ssh.py

you can login by

$ ssh ryu@localhost -p 4990

Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-10 01:14:56 +09:00
ISHIDA Wataru
eb488e3cb3 bgp: fix wrong module path
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-10 01:14:56 +09:00
ISHIDA Wataru
ca923a35bf packet/bgp: add helper methods to nlri class for bgp ssh client
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-10 01:14:56 +09:00
ISHIDA Wataru
1d97ac1727 bgp: don't block at start method
Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-10 01:14:56 +09:00
ISHIDA Wataru
6da9cf0187 bgp: bug fix when the peer initiated the connection.
set binded ip and port properly regardless of the direction of connection

Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-10 01:14:56 +09:00
ISHIDA Wataru
2d00b7d424 bgp: remove unnecessary log message
update msg without MpReachNlri or MpUnReachNlri is now normal

Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-05-10 01:14:56 +09:00