mirrors/ryu
1
0
Fork 0
mirror of https://github.com/faucetsdn/ryu.git synced 2026-05-08 13:56:09 +02:00
Code Issues Projects Releases Wiki Activity
732 Commits 2 Branches 109 Tags
Commit Graph

732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
FUJITA Tomonori
43b439770b Ryu 2.0 
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
v2.0 		2013-06-02 20:28:44 +09:00
Shaun Crampton
144eca05b0 of1.3: various fixes 
- OFPActionSetField
- OFPBucket parser
- OFPMeterBandStats

Signed-off-by: Shaun Crampton <Shaun.Crampton@metaswitch.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-06-02 20:12:49 +09:00
FUJITA Tomonori
d7d4d8c1b5 fix 77effb29 regression 
The following commit broke ofp_attrs():

commit 77effb29a69eeb6d320dd9a7554924b2578c3c95
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Mon May 27 18:15:27 2013 +0900

    ofproto/ofproto_parser: pylint

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-06-02 20:12:49 +09:00
Shaun Crampton
93b457bf63 packet lib: make test_packet work stand-alone 
Prevent missing imports when running
  ./run_tests.sh ryu.tests.unit.packet

Signed-off-by: Shaun Crampton <Shaun.Crampton@metaswitch.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-06-01 21:11:51 +09:00
竹下昇
f9b24a1720 Add Packet library API Reference 
Add DHCP encoder/decoder class.

Signed-off-by: TAKESHITA Noboru <takeshita.noboru@yes.nttcom.ne.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-31 17:54:01 +09:00
竹下昇
6f2716b7ff lib/packet: DHCP packet parser/serializer 
Add DHCP encoder/decoder class.

Signed-off-by: TAKESHITA Noboru <takeshita.noboru@yes.nttcom.ne.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-31 17:53:56 +09:00
Isaku Yamahata
77effb29a6 ofproto/ofproto_parser: pylint 
************* Module ryu.ofproto.ofproto_parser
W:155,4:MsgBase.__init__: __init__ method from base class 'StringifyMixin' is not called
W:186,8:MsgBase.parser: Redefining name 'msg' from outer scope (line 48)
W:240,14:ofp_attrs: Redefining name 'msg' from outer scope (line 48)
W:268,17:msg_str_attr: Redefining name 'msg' from outer scope (line 48)
E:270,20:msg_str_attr: Undefined variable 'ofp_attr'

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-31 17:41:14 +09:00
Isaku Yamahata
d86f04015a of1.0: use tun_id instead of tun_id_ 
Since there is no name conflict with tun_id, no reason to use tun_id_
instead of tun_id.
This is needed for OF message conversion from/to json later.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-31 17:41:00 +09:00
FUJITA Tomonori
f09407e4d6 docs: fix ryu module import 
readthedocs.org complains about the failure about ryu module import.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-23 07:46:59 +09:00
YAMADA Hideki
cc6fc59e1d tests/unit/packet/test_vrrp: add tests for is_valid() 
Signed-off-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-23 07:46:10 +09:00
YAMADA Hideki
1ece4717b9 lib/packet/vrrp: fix is_valid() 
Signed-off-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-23 07:46:08 +09:00
YAMADA Hideki
524f79ebb2 test_parser_v10: remove tests for __str__ 
Following errors occur at current master
(commit 21692141dc7e8be2d44338ce4eff5af584e4ff8f)

======================================================================
ERROR: test_parser (ryu.tests.unit.ofproto.test_parser_v10.TestOFPFlowRemoved)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/hideki/ryu/ryu/tests/unit/ofproto/test_parser_v10.py", line 4080, in test_parser
    eq_(str(cookie['val']), check['cookie'])
KeyError: 'cookie'

======================================================================
ERROR: test_parser (ryu.tests.unit.ofproto.test_parser_v10.TestOFPPacketIn)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/hideki/ryu/ryu/tests/unit/ofproto/test_parser_v10.py", line 3782, in test_parser
    ok_(self._test_parser())
  File "/home/hideki/ryu/ryu/tests/unit/ofproto/test_parser_v10.py", line 3774, in _test_parser
    eq_(str(buffer_id['val']), check['buffer_id'])
KeyError: 'buffer_id'

======================================================================
ERROR: test_parser_padding (ryu.tests.unit.ofproto.test_parser_v10.TestOFPPacketIn)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/hideki/ryu/ryu/tests/unit/ofproto/test_parser_v10.py", line 3785, in test_parser_padding
    ok_(self._test_parser(True))
  File "/home/hideki/ryu/ryu/tests/unit/ofproto/test_parser_v10.py", line 3774, in _test_parser
    eq_(str(buffer_id['val']), check['buffer_id'])
KeyError: 'buffer_id'

======================================================================
ERROR: test_str (ryu.tests.unit.ofproto.test_parser_v10.TestOFPQueuePropMinRate)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/hideki/ryu/ryu/tests/unit/ofproto/test_parser_v10.py", line 2615, in test_str
    eq_(check['rate'], str(self.rate['val']))
KeyError: 'rate'

======================================================================
ERROR: test_str (ryu.tests.unit.ofproto.test_parser_v10.TestOFPQueuePropNone)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/hideki/ryu/ryu/tests/unit/ofproto/test_parser_v10.py", line 2564, in test_str
    eq_(check['property'], str(self.property['val']))
KeyError: 'property'

======================================================================
ERROR: test_parser (ryu.tests.unit.ofproto.test_parser_v10.TestOFPSwitchFeatures)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/hideki/ryu/ryu/tests/unit/ofproto/test_parser_v10.py", line 3580, in test_parser
    eq_(check['ports'].find('OFPPhyPort'), 0)
KeyError: 'ports'

Signed-off-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-23 07:42:46 +09:00
FUJITA Tomonori
ce48a7da70 Merge branch 'master' of github.com:osrg/ryu 2013-05-23 07:40:02 +09:00
Philipp Aeschlimann
21692141dc of13: Fix for OFPQueueGetConfigReply/Request 
Signed-off-by: Philipp Aeschlimann <aepp@zhaw.ch>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-18 06:22:45 +09:00
YAMAMOTO Takashi
3b7d91e922 run_tests: make python interpreter overridable 
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-18 05:55:05 +09:00
Isaku Yamahata
688f196724 app/gre_tunnel: pylint 
> E: 60,18:PortSet.EventTunnelKeyDel.__init__: Undefined variable 'EventTunnelKeyDel'
> W: 18,0: Unused import logging

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-18 05:55:04 +09:00
Isaku Yamahata
66e2e848cf app/quantum_adapter: unbreak quantum change 
Now quantum checks attributes strictly on REST request by
the changeset of 61bdda62e8950a9747073e2be7b81cdea0af2f25
Don't send non-standard attribute.

> commit 61bdda62e8950a9747073e2be7b81cdea0af2f25
> Author: Jason Zhang <zhesen@nttmcl.com>
> Date:   Tue Feb 12 18:40:12 2013 -0800
>
>     Raising error if invalid attribute passed in.
>
>     400 will be returned when invalid attributes
>     are passed into Quantum API.
>
>     Fixed the some test cases failed since the
>     enforcement of invalid attribute checking
>
>     Fixes: bug #1076179
>
>     Change-Id: I4e9e2891c444f9dcd051f7b325d3c9403b28db86

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-18 05:55:02 +09:00
YAMAMOTO Takashi
b836696d31 of10: sprinkle StringifyMixin 
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-18 05:03:44 +09:00
YAMAMOTO Takashi
2ef11073e5 of: StringifyMixin 
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-18 05:03:40 +09:00
YAMAMOTO Takashi
2caf583a7e use dpid_to_str in some places 
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-18 04:43:22 +09:00
Isaku Yamahata
9afd1a8d35 tests/ofproto: add unit test for ofproto automatic detection 
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-14 12:49:32 -07:00
Isaku Yamahata
d00268a6fe ofproto: exception during startup related ofp module detaction 
This patch fixes the following exception.

ryu/controller/ofp_event.py: update
cd /opt/stack/ryu && /opt/stack/ryu/bin/ryu-mana ^Mger --config-file /etc/ryu/ryu.conf || touch "/opt/stack/status/stack/ryu.failur ^Me"
> Traceback (most recent call last):
>   File "/opt/stack/ryu/bin/ryu-manager", line 41, in <module>
>     from ryu.base.app_manager import AppManager
>   File "/opt/stack/ryu/ryu/base/app_manager.py", line 22, in <module>
>     from ryu.controller.handler import register_instance
>   File "/opt/stack/ryu/ryu/controller/handler.py", line 20, in <module>
>     from ryu.controller import ofp_event
>   File "/opt/stack/ryu/ryu/controller/ofp_event.py", line 69, in <module>
>     for ofp_mods in ofproto.get_ofp_module():
> TypeError: get_ofp_module() takes exactly 1 argument (0 given)

Reported-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-14 12:49:30 -07:00
Isaku Yamahata
608ae016f5 tests/ofproto: add unit test for ofproto automatic detection 
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-15 04:01:25 +09:00
Isaku Yamahata
eae62b42ac ofproto: exception during startup related ofp module detaction 
This patch fixes the following exception.

ryu/controller/ofp_event.py: update
cd /opt/stack/ryu && /opt/stack/ryu/bin/ryu-mana ^Mger --config-file /etc/ryu/ryu.conf || touch "/opt/stack/status/stack/ryu.failur ^Me"
> Traceback (most recent call last):
>   File "/opt/stack/ryu/bin/ryu-manager", line 41, in <module>
>     from ryu.base.app_manager import AppManager
>   File "/opt/stack/ryu/ryu/base/app_manager.py", line 22, in <module>
>     from ryu.controller.handler import register_instance
>   File "/opt/stack/ryu/ryu/controller/handler.py", line 20, in <module>
>     from ryu.controller import ofp_event
>   File "/opt/stack/ryu/ryu/controller/ofp_event.py", line 69, in <module>
>     for ofp_mods in ofproto.get_ofp_module():
> TypeError: get_ofp_module() takes exactly 1 argument (0 given)

Reported-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-15 04:01:24 +09:00
YAMAMOTO Takashi
9d06333da0 of13: add missing UINTxx_MAX 
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-14 22:47:01 +09:00
Isaku Yamahata
4006436f9a controller/ofp_event: don't hardcode supported OFP parser module 
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-14 00:43:18 +09:00
Isaku Yamahata
84449fae1a ofproto: detect supported OFP versions automatically. 
And add helper functions to get OFP modules/class for a given OFP version.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-14 00:43:16 +09:00
Isaku Yamahata
0fb2bbae4f ofproto_parser: simplify msg_str_attr() a bit 
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-14 00:43:11 +09:00
YAMAMOTO Takashi
ed06fbd397 update requirements 
netaddr is used by:
	ryu/app/tunnel_port_updater.py
	ryu/lib/packet/vrrp.py

Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-13 08:40:34 +09:00
Can Zhang
d359677e9d Support bind IPv6 addresses in StreamServer 
Use a very loose condition to determine if the address is an IPv6
address or not.

Signed-off-by: Can Zhang <can@canx.me>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-11 14:53:09 -07:00
FUJITA Tomonori
7c184ce8e2 Revert "add eventlet to test requirement" 
This reverts commit e93a3f2d99133422e51fbd531dd58052e8e261a3.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-11 14:53:06 -07:00
YAMAMOTO Takashi
edd7048be2 ofproto: change the way __str__ is implemented for of-wire messages 
instead of explicit listing of of-wire attributes, use a heuristics
to exclude internal attributes. (eg. buf, datapath, etc)

this commit changes __str__ outputs.  update a test case accordingly.

Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-12 06:30:27 +09:00
YAMAMOTO Takashi
359efd73aa controller: stop catching GreenletExit 
no longer necessary after the hub changes.

Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-10 00:36:34 +09:00
YAMAMOTO Takashi
5003c1634c hub: add some more tests 
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-10 00:36:32 +09:00
YAMAMOTO Takashi
47bc96ef98 hub: handle GreenletExit internally 
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-10 00:36:31 +09:00
YAMAMOTO Takashi
6955c13e4e hub: comment 
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-10 00:36:30 +09:00
Isaku Yamahata
aa7518a073 of1.0: simplify NXAction initialization 
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-10 00:32:08 +09:00
Isaku Yamahata
9e25097748 of1.0: simplify OFPActionVendor 
vendor value is available as cls_vendor.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-10 00:31:58 +09:00
Isaku Yamahata
77414c1cc2 of1.0: NXActionHeader should be subclass of OFPActionVendor 
Because NXActionHeader is extention to OFPActionVendor.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-10 00:31:46 +09:00
Yoshihiro Kaneko
95963e3ced of1.3: fix OFPPortStatus parser 
A correction same as OF1.2.

Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-04 08:55:24 +09:00
Yoshihiro Kaneko
4dd3028d9c of1.3: fix parser of OFPGetAsyncReply 
The (un)pack format of OFPGetAsycnReply extracts 6 values.

Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-04 08:54:52 +09:00
Yoshihiro Kaneko
deccd3151a of1.3: fix serializer of OFPSetAsync 
The pack format of OFPSetAsync requires 6 arguments.

Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-04 08:53:06 +09:00
Yoshihiro Kaneko
c78d174a63 of1.3: fix wrong method name in OFPQueueGetConfigRequest 
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-04 08:51:20 +09:00
Yoshihiro Kaneko
0c7b42a174 of1.3: fix pack string of OFPMeterStatsRequest 
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-04 08:50:40 +09:00
Yoshihiro Kaneko
76b271461b of1.3: fix wrong class name in OFPGroupFeaturesStatsRequest.__init__() 
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-04 08:48:43 +09:00
Yoshihiro Kaneko
bc78776f40 of1.3: fix attribute name of OFPGroupDescStats 
accord with OF1.3.0/1.3.1 spec.

Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-04 08:47:23 +09:00
Yoshihiro Kaneko
0f83d74065 of1.3: fix lacking argument in OFPAggregateStatsRequest.__init__() 
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-04 08:46:06 +09:00
FUJITA Tomonori
e93a3f2d99 add eventlet to test requirement 
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-02 16:38:19 +09:00
Isaku Yamahata
26134311d3 lib/hub: Event.wait should return its internal flag 
'pydoc gevent.event.Event' says

> Help on method wait in gevent.event.Event:
>
> gevent.event.Event.wait = wait(self, timeout=None) unbound gevent.event.Event method
>     Block until the internal flag is true.
>     If the internal flag is true on entry, return immediately. Otherwise,
>     block until another thread calls :meth:`set` to set the flag to true,
>     or until the optional timeout occurs.
>
>     When the *timeout* argument is present and not ``None``, it should be a
>     floating point number specifying a timeout for the operation in seconds
>     (or fractions thereof).
>
>     Return the value of the internal flag (``True`` or ``False``).

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-02 14:17:43 +09:00
FUJITA Tomonori
ca1372ad1a of1.0: match accepts partial parameters 
You can pass some of the parameters for OFPMatch.

match = OFPMatch(in_port=in_port)

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 2013-05-01 22:29:44 +09:00