1656 Commits

Author SHA1 Message Date
FUJITA Tomonori
9fe033fd91 Fix OFPVendorStats parser method
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-24 09:37:38 +09:00
FUJITA Tomonori
cd8da96cfd Fix OFPSwitchFeatures parser (of 1.2)
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-24 09:37:36 +09:00
FUJITA Tomonori
1b67d922f4 Fix the commit 458042d4032ad52dff93deb0f78d94cadb4f2d37 messup
Add Nicira Extension NXAST_POP_QUEUE constants

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-24 06:55:47 +09:00
FUJITA Tomonori
fd55c3f8d7 Fix the commit eea434b8e45bc8ee91aa02096903a66af898ae35 messup
Add Nicira Extension NXAST_SET_QUEUE constants

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-24 06:52:58 +09:00
FUJITA Tomonori
c41dca6e2b Fix OFPFlowStats parser
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-23 13:50:10 +09:00
FUJITA Tomonori
458042d403 Add Nicira Extension NXAST_POP_QUEUE support
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reviewed-by: Isaku Yamahata <yamahata@valinux.co.jp>
Reviewed-by: Simon Horman <horms@verge.net.au>
2012-05-22 16:16:16 +09:00
FUJITA Tomonori
eea434b8e4 Add Nicira Extension NXAST_SET_QUEUE support
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reviewed-by: Isaku Yamahata <yamahata@valinux.co.jp>
Reviewed-by: Simon Horman <horms@verge.net.au>
2012-05-22 16:15:09 +09:00
FUJITA Tomonori
8082e3f174 add Nicira Extension NXAST_AUTOPATH support
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-22 08:50:21 +09:00
FUJITA Tomonori
79189bd1f8 add Nicira Extension NXAST_EXIT support
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-22 08:50:20 +09:00
FUJITA Tomonori
4d93ca62cf Fix NXActionSetTunnel64 parser
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-21 20:59:24 +09:00
FUJITA Tomonori
f68cdbfc04 Fix NXAactionOutputReg parser
Pass the proper variable.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-21 20:59:12 +09:00
FUJITA Tomonori
9b8c61f47a rename NXTRequest to NiciraHeader
We use NXTRequest for Switch-to-Controller messages so let's rename it
to an appropriate name.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reviewed-by: Isaku Yamahata <yamahata@valinux.co.jp>
2012-05-21 18:01:10 +09:00
FUJITA Tomonori
2670733009 add NXT_ROLE_REQUEST support
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reviewed-by: Isaku Yamahata <yamahata@valinux.co.jp>
2012-05-21 17:59:45 +09:00
FUJITA Tomonori
8dff2cb058 Add NXT_ROLE_REQUEST/REPLY constants
NXT_ROLE_REQUEST/REPLY use the same on-wire format (NX_ROLE_PACK_STR).

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reviewed-by: Isaku Yamahata <yamahata@valinux.co.jp>
2012-05-21 17:59:05 +09:00
Isaku Yamahata
97cbf8412c ryu/controller/dpset.py: code simplification
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-20 19:51:03 +09:00
Isaku Yamahata
396fda8bc8 lib/dpid: dpid formatter/parser
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-20 19:51:01 +09:00
FUJITA Tomonori
b5592b08ea Kill parser_stats_body_array method in OFPFlowStats class
OFPStatsReply needs to handle variable-length bodys so having two
parsers (parser_stats_body_array and parser_stats_body) doesn't make
sense. Just kill parser_stats_body_array().

cls_stats_body_cls_size is also pointless since OFPStatsReply needs to
handle variable-length bodys. OFPStatsReply class needs to know if a
stats class is array or not. So register_stats_type takes
'body_single_struct' instead of body_cls_size. We need to change this
scheme if we need to handle VendorStats in the same way (both array
and single struct). But currently we don't even have any VendorStats
implementation so let's invent something more complicated when it
becomes necessary.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reviewed-by: Isaku Yamahata <yamahata@valinux.co.jp>
2012-05-20 12:29:21 +09:00
FUJITA Tomonori
936635a1a9 fix OFPQueueGetConfigReply parser
msg.port should not be a tuple.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-20 09:41:36 +09:00
FUJITA Tomonori
fcc066d9cb fix OFPVendor parser
msg.vendor should not be tuple.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-20 09:41:34 +09:00
FUJITA Tomonori
5089fdf1dc fix typo in ofproto_v1_0_parser comment
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-20 09:41:33 +09:00
FUJITA Tomonori
c778b545a7 fix StatsReply parser
OFPStatsReply parser_stats_body_array needs body classes to have
length field.

We could set length as class-wide constants for classes having a fixed
length however we have two classes that need a variable length so
let's set the length in the same way for all the stats classes.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-19 21:55:44 +09:00
FUJITA Tomonori
7df808edec Fix OFPQueuePropMinRate class
- __str__ method: needs to pass a tuple to msg_str_attr
- parser method: rate shouldn't be a tuple.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-18 17:44:50 +09:00
FUJITA Tomonori
e817357a3b fix OFPPacketQueue class parser
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-18 17:44:48 +09:00
Isaku Yamahata
49214f61ee ryu/app/wsapi: make json_parse_message_body work
json_parse_message_body() didn't work. This patch fixes it.

>  File "ryu/app/wsapi.py", line 129, in json_parse_message_body
>    content = request.content.read()
> AttributeError: WSRequest instance has no attribute 'content'
> Traceback (most recent call last):

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-15 22:11:08 +09:00
FUJITA Tomonori
54bdba9349 Pretty NXAcationBundleBase parser up
Use '()' instead of '\'

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-14 22:16:02 +09:00
FUJITA Tomonori
af6d24c7b7 fix NXActionRegLoad parser
fix a syntax bug and typo.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-14 22:15:55 +09:00
FUJITA Tomonori
50df478ce5 fix NXActionRegMove parser
fix a syntax bug and typo.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-14 22:15:42 +09:00
FUJITA Tomonori
2b5511b91c fix NXActionMultipath parser
Fix a syntax bug.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-14 22:15:15 +09:00
FUJITA Tomonori
ffe34d0b6e add Nicira Extension NXAST_OUTPUT_REG support
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reviewed-by: Simon Horman <horms@verge.net.au>
2012-05-14 13:53:25 +09:00
FUJITA Tomonori
17979ffefa add Nicira Extension NXAST_BUNDLE and NXAST_BUNDLE_LOAD support
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-14 12:48:42 +09:00
FUJITA Tomonori
37b633d832 add Nicira Extension NXAST_REG_LOAD support
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reviewed-by: Simon Horman <horms@verge.net.au>
2012-05-14 11:06:36 +09:00
FUJITA Tomonori
8761cba5e5 add Nicira Extension NXAST_REG_MOVE support
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reviewed-by: Simon Horman <horms@verge.net.au>
2012-05-14 11:05:41 +09:00
FUJITA Tomonori
15951cd8ff Fix OFPStatsReply parser
ryu crashes when it gets OFPT_STATS_REPLY including OFP actions.

ofp_flow_stats can include ofp_action_header(s) so
parser_stats_body_array method can't use the entry_size argument (the
minimum size, 88 bytes). It needs to use the size that body_cls's
parser returns.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-10 14:40:25 +09:00
FUJITA Tomonori
4c2a1922a6 Add NXAction parser support
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-08 20:39:25 +09:00
FUJITA Tomonori
23c7ea0551 Add OFPActionStripVlan class
Avoid hitting the assert in OFPAction class' parser method.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-08 20:37:20 +09:00
Isaku Yamahata
ed75589dcd lib/mac: improve helper functions
- docstring
- add sanity check as haddr_to_bin() is used to parse user-giving string

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-07 21:54:16 +09:00
Isaku Yamahata
c7059d2e82 ofproto/ofproto_v1_0_parser: PacketIn parser
frame data can contain padding of ofp packet. Discard padding.
Otherwise packet parser can get confused which can rely on frame length.
This is a preparation for LLDP TLV parser.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-07 21:53:50 +09:00
Isaku Yamahata
4887c1d2cb ofproto_v1_0_parser: fix OFPPacketOut serializer
0xffffffff == -1 as uint32_t.
However python integer representation isn't sized integer.
So assert buffer_id == -1 doesn't hold. use 0xffffffff explicitly instead
of -1.

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 "/ryu/bin/ryu/app/discovery.py", line 421, in lldp_loop
    self.send_lldp_packet(dp, port_no)
  File "/ryu/bin/ryu/app/discovery.py", line 390, in send_lldp_packet
    dp.send_packet_out(actions=actions, data=port_data.data)
  File "/ryu/bin/ryu/controller/controller.py", line 211, in send_packet_out
    self.send_msg(packet_out)
  File "/ryu/bin/ryu/controller/controller.py", line 181, in send_msg
    self.serialize_msg(msg)
  File "/ryu/bin/ryu/controller/controller.py", line 178, in serialize_msg
    msg.serialize()
  File "/ryu/bin/ryu/ofproto/ofproto_parser.py", line 119, in serialize
    self._serialize_body()
  File "/ryu/bin/ryu/ofproto/ofproto_v1_0_parser.py", line 1210, in _serialize_body
    assert self.buffer_id == -1
AssertionError

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-07 21:53:33 +09:00
Isaku Yamahata
ca19f4654f remote COPYRIGHT file from MANIFEST.in
711301abb3ab338e68411823e10ec40d0663d757 removed COPYRIGHT file
So remove it from MANIFEST.in.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-07 21:52:52 +09:00
Isaku Yamahata
824af801a3 README: added the pointer to Gmane ML archive
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-07 21:52:38 +09:00
FUJITA Tomonori
3e84089d2c add Nicira Extension NXAST_MULTIPATH action
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-07 21:34:45 +09:00
FUJITA Tomonori
875ebcb901 Added test framework, ported from Quantum
* Added test result format for Jenkins
* Added some test code for ryu/ofproto/

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-07 21:29:47 +09:00
Isaku Yamahata
3cf1b23b0e doc/source/step_by_step.rst: add item to setup quantum db
The step to create quantum db was missing.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-07 15:57:25 +09:00
FUJITA Tomonori
fc02e997a6 Fix OFP_ACTION_DL_ADDR_PACK_STR
Use '6s' for a mac address. It's consistent with nx code and works
with mac.haddr_to_bin helper function.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reviewed-by: Simon Horman <horms@verge.net.au>
2012-05-07 15:52:24 +09:00
FUJITA Tomonori
81a894f83a Fix OFPActionHeader class 'serialize' method
OFPActionHeader class should have 'serialize' method.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reviewed-by: Simon Horman <horms@verge.net.au>
2012-05-07 15:51:38 +09:00
Isaku Yamahata
10fcdec3b3 controller/controller: make send_flow_mod() allow default value for priority
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-01 08:48:33 +09:00
Isaku Yamahata
7d19e5c7df app: use symbol instead of 32678 for default priority
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-01 08:47:50 +09:00
Isaku Yamahata
c721e811c8 ofproto/ofproto_v1_0_parser: flowmod default parameter
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-01 08:45:54 +09:00
Isaku Yamahata
5eaf2ad32d ofproto/ofproto_v1_0_parser: make FlowMod allow meaningful default parameter
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Reviewed-by: Simon Horman <simon@horms.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-01 08:44:52 +09:00
Isaku Yamahata
57bd1abe5c controller, ofproto_v1_0: avoid format for argument
format is defined in builtin, so it should be avoid for argument.
use flow_format instead.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Reviewed-by: Simon Horman <simon@horms.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2012-05-01 08:44:02 +09:00