summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2012-02-23 12:55:46 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2012-02-23 12:57:51 +0900
commit92b58c2a41ecfed00a9efc71e413cb3026b5a30a (patch)
treeaffad497250eaa20dee07b27c9ac0d3df3365453
parentbee5d55e8018a57d4bc810b1c81d3417bfc346f2 (diff)
enable OF1.2 support
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/controller/controller.py4
-rw-r--r--ryu/controller/ofp_event.py3
2 files changed, 6 insertions, 1 deletions
diff --git a/ryu/controller/controller.py b/ryu/controller/controller.py
index 9f6ef714..575e650d 100644
--- a/ryu/controller/controller.py
+++ b/ryu/controller/controller.py
@@ -25,6 +25,8 @@ from ryu.ofproto import ofproto
from ryu.ofproto import ofproto_parser
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.controller import dispatcher
from ryu.controller import handler
@@ -68,6 +70,8 @@ class Datapath(object):
supported_ofp_version = {
ofproto_v1_0.OFP_VERSION: (ofproto_v1_0,
ofproto_v1_0_parser),
+ ofproto_v1_2.OFP_VERSION: (ofproto_v1_2,
+ ofproto_v1_2_parser),
}
def __init__(self, socket, address):
diff --git a/ryu/controller/ofp_event.py b/ryu/controller/ofp_event.py
index 312848ec..7fb37efd 100644
--- a/ryu/controller/ofp_event.py
+++ b/ryu/controller/ofp_event.py
@@ -67,7 +67,8 @@ def _create_ofp_msg_ev_from_module(modname):
# TODO:XXX
-_PARSER_MODULE_LIST = ['ryu.ofproto.ofproto_v1_0_parser']
+_PARSER_MODULE_LIST = ['ryu.ofproto.ofproto_v1_0_parser',
+ 'ryu.ofproto.ofproto_v1_2_parser']
for m in _PARSER_MODULE_LIST:
# print 'loading module %s' % m