From e302f962cfbece54751a949227ee1e7f32c32674 Mon Sep 17 00:00:00 2001 From: Thomas Morin Date: Thu, 12 Apr 2018 10:29:31 +0200 Subject: [PATCH] ovs_lib: add support for OpenFlow 1.5 This change add support for OpenFlow 1.5 for OVSBridge.use_at_least_protocol(). This will allow, in particular, the use of bucket_id in Id8f5318746cdee507beb112ba69800a43c7f6f20 . Change-Id: If8f2374e1bff42ff4b1030bbb17e284f31c6ce45 Needed-By: Id8f5318746cdee507beb112ba69800a43c7f6f20 --- neutron/agent/common/ovs_lib.py | 3 ++- .../plugins/ml2/drivers/openvswitch/agent/common/constants.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/neutron/agent/common/ovs_lib.py b/neutron/agent/common/ovs_lib.py index eaaa9b8434c..6abdfd102ef 100644 --- a/neutron/agent/common/ovs_lib.py +++ b/neutron/agent/common/ovs_lib.py @@ -200,7 +200,8 @@ OF_PROTOCOL_TO_VERSION = { constants.OPENFLOW11: 2, constants.OPENFLOW12: 3, constants.OPENFLOW13: 4, - constants.OPENFLOW14: 5 + constants.OPENFLOW14: 5, + constants.OPENFLOW15: 6, } diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/common/constants.py b/neutron/plugins/ml2/drivers/openvswitch/agent/common/constants.py index 27dd3878d2d..dced2ccefee 100644 --- a/neutron/plugins/ml2/drivers/openvswitch/agent/common/constants.py +++ b/neutron/plugins/ml2/drivers/openvswitch/agent/common/constants.py @@ -150,6 +150,7 @@ OPENFLOW11 = "OpenFlow11" OPENFLOW12 = "OpenFlow12" OPENFLOW13 = "OpenFlow13" OPENFLOW14 = "OpenFlow14" +OPENFLOW15 = "OpenFlow15" # A placeholder for dead vlans. DEAD_VLAN_TAG = p_const.MAX_VLAN_TAG + 1