259 Commits

Author SHA1 Message Date
Can Zhang
4ed1379fee nx_match: support IPv4 mask
Signed-off-by: Can Zhang <can@canx.me>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-04-24 19:20:07 +09:00
Isaku Yamahata
97c1aad368 of1.3: parser should return msg, not implicit None
And OFPSetConfig should have serializer, not parser Because the message
is sent by controller to OF switch.

Cc: nitish nagesh <nagesh.nitish@gmail.com>
Cc: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-04-24 19:17:44 +09:00
YAMAMOTO Takashi
ec38a0233a nx_match: remove an unnecessary import
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-04-24 19:15:12 +09:00
Yoshihiro Kaneko
ca5292e477 of1.3: remove port_no argument
These request bodies are empty on OF1.3/1.3.1 spec.

Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-04-24 19:13:36 +09:00
Yoshihiro Kaneko
4dfaf65f86 of1.3: fix typos in ofproto_v1_3.py
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-04-24 19:11:52 +09:00
OHMURA Kei
fc161ff848 of1.0: add nx_match to NXFlowStatsRequest
Signed-off-by: OHMURA Kei <ohmura.kei@lab.ntt.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-04-18 09:38:35 +09:00
Isaku Yamahata
d2322882eb ofproto/inet: add VRRP protocol number
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-04-16 02:47:46 +09:00
Isaku Yamahata
3f3b683d20 ofproto/nx_match: pep8
> $ pep8 --version
> 1.4.5
> ryu/ofproto/nx_match.py:743:20: E128 continuation line under-indented for visual indent
>                    ofproto_v1_0.NXM_NX_IPV6_SRC_W])
>                    ^
> ryu/ofproto/nx_match.py:764:20: E128 continuation line under-indented for visual indent
>                    ofproto_v1_0.NXM_NX_IPV6_DST_W])
>                    ^

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-04-16 02:43:52 +09:00
Eder Leão Fernandes
7f5bd07a8c of1.3: Add special group identifier values defined on OpenFlow 1.3.1
This patch add missing group special values of OpenFlow 1.3, added to
the 1.3.1 version.

It is useful to create a flow_mod message with an out_group with no >
group restrictions and for flow_stats messages.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-04-13 04:34:51 +09:00
blacksheeep
1e9c9c38f4 nx: match_tuple() function now handles nw src/dst
match_tuple() function now handles nw src/dst correctly. FIX:
match_tuple function now handles the nw src/dst masks correctly. If
the mask is not valid, because there is no NX, it will be ignored.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-04-09 07:10:48 +09:00
Can Zhang
7a4a384fb7 nx: make pack string of IPv6 address consistent with OF1.2/1.3
Changed pack string of IPv6 address in NXM from former '!4I' to
'!8H'. Registered IPv6 src/dst field header so we could parse IPv6
addresses now.

Signed-off-by: Can Zhang <can@canx.me>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-04-09 07:03:33 +09:00
Yoshihiro Kaneko
adb4e3e66b of1.0: fix import error
Fix the  533fd972519871afe441d365f911a2970fe0875f commit.

This patch fixes the following issue.

Traceback (most recent call last):
  File "/opt/stack/ryu/bin/ryu-manager", line 42, in <module>
    from ryu.base.app_manager import AppManager
  File "/opt/stack/ryu/ryu/base/app_manager.py", line 25, 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 75, in <module>
    _create_ofp_msg_ev_from_module(m)
  File "/opt/stack/ryu/ryu/controller/ofp_event.py", line 60, in _create_ofp_msg_ev_from_module
    mod = utils.import_module(modname)
  File "/opt/stack/ryu/ryu/utils.py", line 35, in import_module
    __import__(name)
  File "/opt/stack/ryu/ryu/ofproto/ofproto_v1_0_parser.py", line 26, in <module>
    import utils.round_up
ImportError: No module named utils.round_up

Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-04-01 13:59:42 +09:00
Can Zhang
533fd97251 of1.0: utils.round_up cleanup
Signed-off-by: Can Zhang <can@canx.me>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-04-01 10:32:42 +09:00
Can Zhang
128b125f06 support parse OFPAction in NXFlowStats
Signed-off-by: Can Zhang <can@canx.me>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-30 15:32:30 +09:00
Can Zhang
65aba13864 of1.0: fix NXActionHeader typo
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-28 19:27:49 +09:00
OHMURA Kei
366da0b919 ofproto_v1_0_parser: add nx_flow_stats_{request, reply}
Signed-off-by: OHMURA Kei <ohmura.kei@lab.ntt.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-28 19:20:40 +09:00
OHMURA Kei
0bfc3cdee2 ofproto_v1_0: add nx_stats constants
Signed-off-by: OHMURA Kei <ohmura.kei@lab.ntt.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-28 19:20:38 +09:00
OHMURA Kei
e4ed8f7f60 nx_match: add MFField parser
Signed-off-by: OHMURA Kei <ohmura.kei@lab.ntt.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-28 19:20:35 +09:00
Christopher Scherb
322e0cfc9e nx_match: add vlan and vlan_pop
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-24 14:15:35 -07:00
Zhang Dongya
db27b8f171 of1.3: fix error in group_mod
Signed-off-by: Zhang Dongya <fortitude.zhang@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-06 01:28:20 +09:00
YAMAMOTO Takashi
d1a87e87c1 of1.3: fix a comment typo
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-04 21:42:21 +09:00
Zhang Dongya
8c52463f89 fix missing parameter in calling 'msg_pack_info' of OFPActionPushMpls/PopMpls
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-03 14:07:26 +09:00
Zhang Dongya
fc00f7c9cf add missing 'field' parameter to __init__ function of OFPActionSetField
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-03 13:59:53 +09:00
Zhang Dongya
93ae92dca0 fix incorrect naming '__serialize_body' in OFPRoleRequest
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-03 13:59:48 +09:00
Zhang Dongya
a119198f7a fix OFPMatch decode error in 'parser' function of OFPFlowRemoved
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-03 13:59:41 +09:00
Zhang Dongya
c4ddf50b68 add missing 'length' field of OFPPort when decoding
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-03 13:59:34 +09:00
Zhang Dongya
11659aeb09 add missing 'match' parameter to __init__ function of OFPAggregateStatsRequest
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-03 13:59:13 +09:00
Zhang Dongya
cef3ca93a9 fix error in OFP_DESC_PACK_STR (change 'c' to 's')
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-03 13:59:03 +09:00
YAMAMOTO Takashi
6a43111074 remove port_no argument of OFPPortDescStatsRequest.__init__
according to OF1.3/1.3.1 spec, the request body is empty.

Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-02 13:28:32 +09:00
YAMAMOTO Takashi
632e454616 fix OFPMultipartRequest._serialize_stats_body
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-03-02 13:28:29 +09:00
KONDOH Tasuku
0fab6cdf2f of1.2: fix OFPErrorExperimenterMsg
- add OFPErrorExperimenterMsg.

Signed-off-by: KONDOH Tasuku <kondoh.tasuku@po.ntts.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-27 00:23:05 +09:00
张东亚
a3cc10b8ec of1.3: fix error in port_mod and get_config_reply logic
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-24 12:48:18 +09:00
KONDOH Tasuku
7518f396e6 of1.2: fix OFPGroupDescStats parser
- add action's size to offset of bucket.

Signed-off-by: KONDOH Tasuku <kondoh.tasuku@po.ntts.co.jp>
Reviewed-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-24 07:50:39 +09:00
FUJITA Tomonori
f7eed1547c of1.3: fix ACTION_POP_MPLS
Fix a typo.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-15 07:47:45 +09:00
KONDOH Tasuku
d4822f6da8 of1.2: fix OFPQueueProp parser
- add OFP_QUEUE_PROP_HEADER_SIZE to offset of argument of propreties class.

Signed-off-by: KONDOH Tasuku <kondoh.tasuku@po.ntts.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-13 18:05:18 +09:00
YAMADA Hideki
76996337bb packet lib: add LLDP support.
See "ryu/tests/unit/packet/test_lldp.py" to use this library.

This patch is based on Yamahata's topology discovery patch series.
http://thread.gmane.org/gmane.network.ryu.devel/467

Signed-off-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-02-05 16:14:30 +09:00
Krzysztof Rutka
2e3c0c0a9e of1.3: Fix a typo in OFPPacketOut
- in_port was missing an underscore

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2013-01-10 10:59:06 +09:00
Isaku Yamahata
2f3d989475 of1.3: improve OFPHello and OFPHelloElemVerionsBitmap
- fix bitmap offset calculation
- un-tuple bitmap. The result of struct.unpack is a tuple
- OFPHelloElemVerionsBitmap parser needs to be aware padding
- make OFPHelloElemVerionsBitmap parse bitmap into the list of versions
- make OFPHello always have elements attribute

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-12-20 20:14:42 +09:00
FUJITA Tomonori
65e7cf4b77 of1.3: fix OFPMultipartReply parser
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-12-18 14:12:13 +09:00
FUJITA Tomonori
aa3ab7d30f of1.3: support OFPHET_VERSIONBITMAP
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-12-15 06:36:48 +09:00
FUJITA Tomonori
3e98bf7aac of1.3: fix OFPT_PACKET_IN parser
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-12-07 11:49:11 +09:00
FUJITA Tomonori
91df9a3890 of1.3: fix OFPMP_FLOW
FlowStats works now.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-11-23 11:38:05 +09:00
FUJITA Tomonori
fad94da2d4 of1.3: support OFPMatch
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-11-23 11:38:05 +09:00
FUJITA Tomonori
2bd4e3003c of1.3: fix OFPPacketQueue
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>
2012-11-23 11:38:05 +09:00
FUJITA Tomonori
11dad834a0 of1.3: fix OFPSetAsyn
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>
2012-11-23 11:38:05 +09:00
FUJITA Tomonori
569756639b of1.3: fix OFPQueueProp
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>
2012-11-23 11:38:04 +09:00
FUJITA Tomonori
cdf42180a6 of1.3: fix OFPMeterFeaturesStatsRequest
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>
2012-11-23 11:38:04 +09:00
FUJITA Tomonori
4498217d79 of1.3: fix OFPMeterConfigStatsReply
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>
2012-11-23 11:38:04 +09:00
FUJITA Tomonori
eaf7d478a2 of1.3: fix OFPPortStatsReply
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>
2012-11-23 11:38:04 +09:00
FUJITA Tomonori
183b624638 of1.3: fix OFPMP_AGGREGATE
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>
2012-11-23 11:38:04 +09:00