summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-04-20 13:56:55 +0000
committerGerrit Code Review <review@openstack.org>2018-04-20 13:56:55 +0000
commitfc8511cd540d7a356c4a0ade2ac6277fe2854c0d (patch)
tree53c0a976c9801de970a5fe016c6a380969752180
parentb6db5df451f3870199d123858fb0c330b0f78b17 (diff)
parente302f962cfbece54751a949227ee1e7f32c32674 (diff)
Merge "ovs_lib: add support for OpenFlow 1.5"
-rw-r--r--neutron/agent/common/ovs_lib.py3
-rw-r--r--neutron/plugins/ml2/drivers/openvswitch/agent/common/constants.py1
2 files changed, 3 insertions, 1 deletions
diff --git a/neutron/agent/common/ovs_lib.py b/neutron/agent/common/ovs_lib.py
index eaaa9b8..6abdfd1 100644
--- a/neutron/agent/common/ovs_lib.py
+++ b/neutron/agent/common/ovs_lib.py
@@ -200,7 +200,8 @@ OF_PROTOCOL_TO_VERSION = {
200 constants.OPENFLOW11: 2, 200 constants.OPENFLOW11: 2,
201 constants.OPENFLOW12: 3, 201 constants.OPENFLOW12: 3,
202 constants.OPENFLOW13: 4, 202 constants.OPENFLOW13: 4,
203 constants.OPENFLOW14: 5 203 constants.OPENFLOW14: 5,
204 constants.OPENFLOW15: 6,
204} 205}
205 206
206 207
diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/common/constants.py b/neutron/plugins/ml2/drivers/openvswitch/agent/common/constants.py
index 27dd387..dced2cc 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"
150OPENFLOW12 = "OpenFlow12" 150OPENFLOW12 = "OpenFlow12"
151OPENFLOW13 = "OpenFlow13" 151OPENFLOW13 = "OpenFlow13"
152OPENFLOW14 = "OpenFlow14" 152OPENFLOW14 = "OpenFlow14"
153OPENFLOW15 = "OpenFlow15"
153 154
154# A placeholder for dead vlans. 155# A placeholder for dead vlans.
155DEAD_VLAN_TAG = p_const.MAX_VLAN_TAG + 1 156DEAD_VLAN_TAG = p_const.MAX_VLAN_TAG + 1