From 3dcb33bb1ef0085abc2b09fe47cbd0e22f211026 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Thu, 22 Nov 2012 16:33:24 +0900 Subject: [PATCH] enable OF1.3 support Ryu sucessfully connects to CPqD OF1.3 switch. https://github.com/CPqD/ofsoftswitch13 Signed-off-by: FUJITA Tomonori --- README.rst | 2 +- ryu/controller/controller.py | 4 ++++ ryu/controller/ofp_event.py | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index db249ef1..acd94435 100644 --- a/README.rst +++ b/README.rst @@ -6,7 +6,7 @@ Ryu aims to provide a logically centralized control and well defined API that make it easy for operators to create new network management and control applications. Currently, Ryu manages network devices by using OpenFlow. You can say that Ryu is an OpenFlow Controller, which -support OpenFlow v1.0, v1.2, and Nicira Extensions. +support OpenFlow v1.0, v1.2, v1.3, and Nicira Extensions. All of the code is freely available under the Apache 2.0 license. Ryu is fully written in Python. diff --git a/ryu/controller/controller.py b/ryu/controller/controller.py index 1e456bff..1811d8ca 100644 --- a/ryu/controller/controller.py +++ b/ryu/controller/controller.py @@ -31,6 +31,8 @@ from ryu.ofproto import ofproto_v1_0 from ryu.ofproto import ofproto_v1_0_parser from ryu.ofproto import ofproto_v1_2 from ryu.ofproto import ofproto_v1_2_parser +from ryu.ofproto import ofproto_v1_3 +from ryu.ofproto import ofproto_v1_3_parser from ryu.ofproto import nx_match from ryu.controller import dispatcher @@ -106,6 +108,8 @@ class Datapath(object): ofproto_v1_0_parser), ofproto_v1_2.OFP_VERSION: (ofproto_v1_2, ofproto_v1_2_parser), + ofproto_v1_3.OFP_VERSION: (ofproto_v1_3, + ofproto_v1_3_parser), } def __init__(self, socket, address): diff --git a/ryu/controller/ofp_event.py b/ryu/controller/ofp_event.py index cb2edeba..ed9f1b38 100644 --- a/ryu/controller/ofp_event.py +++ b/ryu/controller/ofp_event.py @@ -69,7 +69,8 @@ def _create_ofp_msg_ev_from_module(modname): # TODO:XXX _PARSER_MODULE_LIST = ['ryu.ofproto.ofproto_v1_0_parser', - 'ryu.ofproto.ofproto_v1_2_parser'] + 'ryu.ofproto.ofproto_v1_2_parser', + 'ryu.ofproto.ofproto_v1_3_parser'] for m in _PARSER_MODULE_LIST: # print 'loading module %s' % m