1492 Commits

Author SHA1 Message Date
FUJITA Tomonori
5ab61a2945 Ryu 3.6
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
v3.6
2014-02-03 15:15:33 +09:00
FUJITA Tomonori
1368fd6899 of13: set default attributes for OFPMultipartRequest subclasses
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-02 00:50:13 +09:00
FUJITA Tomonori
0b8e9885aa of12: set default attributes for OFPStatsRequest subclasses
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-02 00:49:43 +09:00
FUJITA Tomonori
9f30e7d23a allow application to specify its logger name
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-01 23:57:13 +09:00
FUJITA Tomonori
bd074ef2b3 fix syslogd usage on OSX
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-02-01 23:57:13 +09:00
Satoshi Kobayashi
1b62801f49 vrrp: fix busy timer by the default parameter
Currently, default 'vrrp_statistics' is zero. Thereby
TimerEventSender() kicks VRRPRouter._EventStatisticsOut() without
waiting. Since CPU usage will be 100%, this is an unsuitable default
value.

Signed-off-by: Satoshi Kobayashi <satoshi-k@stratosphere.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-31 11:25:46 +09:00
FUJITA Tomonori
29716083b9 of14: fix OFPMatch from_jsondict method
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reviewed-by: Simon Horman <horms@verge.net.au>
2014-01-29 16:31:21 +09:00
FUJITA Tomonori
49b84f4d2c of14: Fix OFPInstructionMeter json format
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reviewed-by: Simon Horman <horms@verge.net.au>
2014-01-29 14:52:25 +09:00
FUJITA Tomonori
7ac5282974 of14: default ethernet type for PUSH_VLAN action
0x8100 in most cases.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reviewed-by: Simon Horman <horms@verge.net.au>
2014-01-29 14:51:56 +09:00
FUJITA Tomonori
1f590c0411 of14: set default ethernet types for MPLS actions
0x8847 (MPLS) for PUSH_MPLS
0x0800 (IP) for POP_MPLS

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reviewed-by: Simon Horman <horms@verge.net.au>
2014-01-29 14:51:33 +09:00
FUJITA Tomonori
84202a8561 of14: remove of1.2/1.3 old SetField aciton API
No reason to support the old awkward API for shiny OF1.4.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reviewed-by: Simon Horman <horms@verge.net.au>
2014-01-29 14:51:10 +09:00
FUJITA Tomonori
1356d2c7c0 doc: announce OF1.4 support in README
We support good a good portion of OF1.4.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 14:50:40 +09:00
Simon Horman
affd4ccc4d Add OF1.4 set async message support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:43:55 +09:00
Simon Horman
5752b25739 Add OF1.4 get async request and reply support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:43:55 +09:00
Simon Horman
c6bea4f028 Add OF1.4 meter features stats request and reply message support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:43:55 +09:00
Simon Horman
9d87fc08d9 Add OF1.4 meter stats request and reply message support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:43:55 +09:00
Simon Horman
7b0699cda5 Add OF1.4 meter config stats request and reply message support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:43:55 +09:00
Simon Horman
8daae74fa9 Add OF1.4 meter band drop
This will be used by meter statistics messages

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:43:55 +09:00
Simon Horman
2f36dd628f Add OF1.4 group mod message supoort
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:43:55 +09:00
Simon Horman
e59f9acc16 Add OF1.4 table mod message support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:43:25 +09:00
Simon Horman
557af7f991 Add OF1.4 flow removed message support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:43:25 +09:00
Simon Horman
58458a37db Add OF1.4 group desc stats request and reply message support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:43:25 +09:00
Simon Horman
d2c7855c54 Add OF1.4 OFPBucket
This will be used by support for messages that have buckets

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:43:25 +09:00
Simon Horman
e91473016b Add OF1.4 group features stats request and reply message support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:43:25 +09:00
Simon Horman
4612d635e4 Add OF1.4 table stats request and reply message support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:43:25 +09:00
Simon Horman
6094d723b3 Add OF1.4 aggregate stats request and reply message support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:43:25 +09:00
Simon Horman
fd0f72b40d Add OF1.4 role request and reply message support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:43:15 +09:00
Simon Horman
3043c90437 Add OF1.4 barrier request and reply message support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:43:15 +09:00
Simon Horman
845333136f Add OF1.4 experimenter message support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:42:56 +09:00
Simon Horman
0d0bd4592f Add OF1.4 error message support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:42:56 +09:00
Simon Horman
c8440ab494 Add OF1.4 echo request and reply message support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:42:56 +09:00
Simon Horman
688b26e858 Add OF1.4 SetNwTtl action support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:42:56 +09:00
Simon Horman
ec6438d1ee Add OF1.4 DecNwTtl action support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:42:56 +09:00
Simon Horman
b7455bc353 Add OF1.4 DecMplsTtl action support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:42:56 +09:00
Simon Horman
281be18dcc Add OF1.4 PushVlan action support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:42:56 +09:00
Simon Horman
7ab4ce13b5 Add OF1.4 PopVlan action support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:42:56 +09:00
Simon Horman
2cf3a6ee4f Add OF1.4 PushMpls action support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:42:56 +09:00
Simon Horman
12f03a09e5 Add OF1.4 PopMpls action support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:42:56 +09:00
Simon Horman
2235def21b Add OF1.4 PushPbb action support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:42:54 +09:00
Simon Horman
bb65f94a07 Add OF1.4 PopPbb action support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:42:54 +09:00
Simon Horman
3de81a208f Add OF1.4 CopyTtlIn action support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:42:54 +09:00
Simon Horman
384adb3919 Add OF1.4 CopyTtlOut action support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:42:54 +09:00
Simon Horman
5231ba3b38 Add OF1.4 SetField action support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:42:54 +09:00
Simon Horman
ec18b3f0f1 Add OF1.4 OFPMatchField support
This covers fields that are also present in OF1.3.
In particular it does not cover PBB_UCA.
I plan to address this in a subsequent patch.

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:42:53 +09:00
Simon Horman
4a52daee65 Add OF1.4 desc stats request and reply message support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:42:53 +09:00
Simon Horman
fd98c4a225 Add OF1.4 group stats request and reply message support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:42:53 +09:00
Simon Horman
19ff713d2c Add OF1.4 multipart experimenter request and reply message support
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:42:53 +09:00
Simon Horman
e7882b9b31 packet_data_generator: Remove OF1.4 queue set config request and reply message support
These messages do not exist in OF1.4

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:42:53 +09:00
Simon Horman
5b8afbba9e Correct OF1.4 OFPMatch JSON serialisation and formatting
Prior to this patch the code serialises an OFPMatch as:

   "OFPMatch": {
      "oxm_fields": {
         "arp_op": 1,
         ...
      }
   }

But the parser fails, complaining that "oxm_fields" is an unknown field name.

Resolve this by using the same JSON format as OF1.3:

   "OFPMatch": {
      "length": 329,
      "oxm_fields": [
         {
            "OXMTlv": {
               "field": "in_port",
               "mask": null,
               "value": 84281096
            }
         },
         ...
      }
   }

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:42:49 +09:00
Simon Horman
f5289a08b0 Correct OF1.4 OFP_ACTION_HEADER_PACK_STR
As per parsers for earlier OF versions,
include 4 trailing bytes in the header.

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
2014-01-29 12:42:48 +09:00