This code is a backport from the upstream OVS (commit dcb66da):
If the loop condition in Stream.connect() was false, which is especially
likely for TCP connections, then Stream.connect() would return None,
which violates its documented behavior. This commit fixes the problem.
Reported-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
- add ip match support
- add match_to_str() and actions_to_str() instead of action_to_str()
Signed-off-by: OHMURA Kei <ohmura.kei@lab.ntt.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
hacky workaround, will be removed. OF1.3 doesn't have ports. An
application should not depend on them. But there might be such bad
applications so let's keep this workaround for while.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
File "/Users/fujita/git/ryu/ryu/ofproto/ofproto_v1_3_parser.py", line 2649, in OFPPacketQueue
@clasmethod
NameError: name 'clasmethod' is not defined
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
File "/Users/fujita/git/ryu/ryu/ofproto/ofproto_v1_3_parser.py", line 1555, in <module>
@_set_msg_type(ofproto_v1_3.OFPT_SET_ASYNC)
AttributeError: 'module' object has no attribute 'OFPT_SET_ASYNC'
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
File "/Users/fujita/git/ryu/ryu/ofproto/ofproto_v1_3_parser.py", line 1398, in register_queue_property
return _register_queue_property
NameError: global name '_register_queue_property' is not defined
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
File "/Users/fujita/git/ryu/ryu/ofproto/ofproto_v1_3_parser.py", line 1265, in <module>
@_set_stats_type(ofproto_v1_3.OFPMP_METER_FEATUERS, OFPMeterFeaturesStats)
AttributeError: 'module' object has no attribute 'OFPMP_METER_FEATUERS'
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
File "/Users/fujita/git/ryu/ryu/ofproto/ofproto_v1_3_parser.py", line 1246, in <module>
@_set_stats_type(ofproto_v1_3.OFPMP_METER_CONFIG, OFPMeterCOnfigStats)
NameError: name 'OFPMeterCOnfigStats' is not defined
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
File "/Users/fujita/git/ryu/ryu/ofproto/ofproto_v1_3_parser.py", line 976, in <module>
@_set_msg_type(ofproto_v1_3.OFPT_STATS_REPLY)
AttributeError: 'module' object has no attribute 'OFPT_STATS_REPLY'
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
File "/Users/fujita/git/ryu/ryu/ofproto/ofproto_v1_3_parser.py", line 898, in <module>
@_set_stats_type(ofproto_v1_3.OFPST_AGGREGATE, OFPAggregateStats)
AttributeError: 'module' object has no attribute 'OFPST_AGGREGATE'
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
File "/Users/fujita/git/ryu/ryu/ofproto/ofproto_v1_3.py", line 533, in <module>
DESC_STR_LEN + 'c'
TypeError: cannot concatenate 'str' and 'int' objects
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This fixes the following exception:
When Stream.__scs_connecting doesn't change self.state, Stream.connect()
returns None as implicit return value. Thus, the following exception is raised.
conf_switch_set_handler 00003247b5e63145 ovsdb_addr tcp:172.17.60.198:6634
_ovsdb_update 00003247b5e63145 tcp:172.17.60.198:6634 172.17.60.198
_add_tunnel_ports <ryu.app.tunnel_port_updater.TunnelDP object at 0x14a5950> set([])
172.17.60.198 - - [2012-11-21 15:01:00] "PUT /v1.0/conf/switches/00003247b5e63145/ovsdb_addr HTTP/1.1" 201 120 0.267351
remote tcp:172.17.60.198:6634
Traceback (most recent call last):
File "/usr/lib/pymodules/python2.7/gevent/greenlet.py", line 390, in run
result = self._run(*self.args, **self.kwargs)
File "/home/yamahata/openvswitch/sp-lab/scarab/gre-tunnel/ryu-2/bin/ryu/app/tunnel_port_updater.py", line 289, in _serve_loop
self._init()
File "/home/yamahata/openvswitch/sp-lab/scarab/gre-tunnel/ryu-2/bin/ryu/app/tunnel_port_updater.py", line 125, in _init
self.ovs_bridge.init()
File "/home/yamahata/openvswitch/sp-lab/scarab/gre-tunnel/ryu-2/bin/ryu/lib/ovs/bridge.py", line 103, in init
self.br_name = self._get_bridge_name()
File "/home/yamahata/openvswitch/sp-lab/scarab/gre-tunnel/ryu-2/bin/ryu/lib/ovs/bridge.py", line 111, in _get_bridge_name
self.run_command([command])
File "/home/yamahata/openvswitch/sp-lab/scarab/gre-tunnel/ryu-2/bin/ryu/lib/ovs/bridge.py", line 99, in run_command
self.vsctl.run_command(commands, self.timeout, self.exception)
File "/home/yamahata/openvswitch/sp-lab/scarab/gre-tunnel/ryu-2/bin/ryu/lib/ovs/vsctl.py", line 1006, in run_command
self._run_command(commands)
File "/home/yamahata/openvswitch/sp-lab/scarab/gre-tunnel/ryu-2/bin/ryu/lib/ovs/vsctl.py", line 999, in _run_command
self._do_main(commands)
File "/home/yamahata/openvswitch/sp-lab/scarab/gre-tunnel/ryu-2/bin/ryu/lib/ovs/vsctl.py", line 918, in _do_main
self._init_schema_helper()
File "/home/yamahata/openvswitch/sp-lab/scarab/gre-tunnel/ryu-2/bin/ryu/lib/ovs/vsctl.py", line 805, in _init_schema_helper
vswitch_idl.OVSREC_DB_NAME)
File "/home/yamahata/openvswitch/sp-lab/scarab/gre-tunnel/ryu-2/bin/ryu/lib/ovs/vsctl.py", line 793, in _rpc_get_schema_json
error, reply = rpc.transact_block(request)
File "/home/yamahata/openvswitch/sp-lab/scarab/gre-tunnel/ryu-2/bin/ryu/contrib/ovs/jsonrpc.py", line 306, in transact_block
error = self.send(request)
File "/home/yamahata/openvswitch/sp-lab/scarab/gre-tunnel/ryu-2/bin/ryu/contrib/ovs/jsonrpc.py", line 240, in send
self.run()
File "/home/yamahata/openvswitch/sp-lab/scarab/gre-tunnel/ryu-2/bin/ryu/contrib/ovs/jsonrpc.py", line 200, in run
retval = self.stream.send(self.output)
File "/home/yamahata/openvswitch/sp-lab/scarab/gre-tunnel/ryu-2/bin/ryu/contrib/ovs/stream.py", line 213, in send
return -retval
TypeError: bad operand type for unary -: 'NoneType'
<Greenlet at 0x133fd10: <bound method TunnelDP._serve_loop of <ryu.app.tunnel_port_updater.TunnelDP object at 0x14a5950>>> failed with TypeError
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
- The OFPVID_PRESENT bit indicate the presence of a valid VLAN_ID.
- Reflect to unittests.
Signed-off-by: HIYAMA Manabu <hiyama.manabu@po.ntts.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Normally dirs.py is created from dirs.py.template by configure script.
Create it manually for our own copy.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
From changeset 8087f5ff825cae3a699e5a60ca6dd0deb10fc8e5
dirs.py.template needs to be adopted for Ryu environment.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
- create ryu/contrib directory
- adjust module load path for third party library and prioritize our own copy
than system's
- teach ryu-manager ryu/contrib
- run_tests.sh: exclude contrib dir for pep8
third party files will be included under ryu/contrib.
Third party files aren't suitable to our pep8 check because they aren't under
our control.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
This patch implements REST API for accessing state. This module helps
your debugging and retrieving various statistics. It also supports
flow entry pusher to allow users to manually insert flows into switch.
- get all switch DPIDs connected to the controller
$ curl http://<controller_ip>:8080/stats/switches
- get the desc stats
$ curl http://<controller_ip>:8080/stats/desc/<dpid>
- get flows stats
$ curl http://<controller_ip>:8080/stats/flow/<dpid>
- get ports stats
$ curl http://<controller_ip>:8080/stats/port/<dpid>
- add a flow entry
$ curl -d '{"dpid": "1", "cookie":"0", "priority":"32768", \
"actions":[{"port":2, "type":"OUTPUT"}], "match":{"in_port":1}}' \
http://<controller_ip>:8080/stats/flowentry
- delete all flows of the switch
$ curl -X DELETE \
http://<controller_ip>:8080/stats/flowentry/clear/<dpid>
Signed-off-by: OHMURA Kei <ohmura.kei@lab.ntt.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This patch provides the raw OF interface. We can talk with a switch
by using the OF interface via some protocols such as REST.
Signed-off-by: OHMURA Kei <ohmura.kei@lab.ntt.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
- Now easy to know the protocol name and iterate protocols.
- find_protocol doesn't handle the case the same protocols are stacked.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
- use bytearray(n) instead of str().zfill(n)
- test data are more strictly.
Signed-off-by: HIYAMA Manabu <hiyama.manabu@po.ntts.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
