From: Ihar Hrachyshka <ihrachys@redhat.com>
Date: Fri, 19 Jun 2015 09:34:12 +0000 (+0200)
Subject: lb: stop handling Havana device updates
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=4f2f619a6394cfc2e6f4a0ce02408610d47428b1;p=openstack-build%2Fneutron-build.git

lb: stop handling Havana device updates

In Havana, device details did not contain segmentation_id but vlan_id.
Those times are long gone.

Change-Id: I7ea5d2cb114371692439c0518ce6bf497837e485
---

diff --git a/neutron/plugins/ml2/drivers/linuxbridge/agent/common/constants.py b/neutron/plugins/ml2/drivers/linuxbridge/agent/common/constants.py
index 4e5f65146..aa970af2e 100644
--- a/neutron/plugins/ml2/drivers/linuxbridge/agent/common/constants.py
+++ b/neutron/plugins/ml2/drivers/linuxbridge/agent/common/constants.py
@@ -12,10 +12,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-
-from neutron.plugins.common import constants as p_const
-
-
 FLAT_VLAN_ID = -1
 LOCAL_VLAN_ID = -2
 
@@ -23,16 +19,3 @@ LOCAL_VLAN_ID = -2
 VXLAN_NONE = 'not_supported'
 VXLAN_MCAST = 'multicast_flooding'
 VXLAN_UCAST = 'unicast_flooding'
-
-
-# TODO(rkukura): Eventually remove this function, which provides
-# temporary backward compatibility with pre-Havana RPC and DB vlan_id
-# encoding.
-def interpret_vlan_id(vlan_id):
-    """Return (network_type, segmentation_id) tuple for encoded vlan_id."""
-    if vlan_id == LOCAL_VLAN_ID:
-        return (p_const.TYPE_LOCAL, None)
-    elif vlan_id == FLAT_VLAN_ID:
-        return (p_const.TYPE_FLAT, None)
-    else:
-        return (p_const.TYPE_VLAN, vlan_id)
diff --git a/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py b/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
index 41503b00e..f370b5f9c 100644
--- a/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
+++ b/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
@@ -935,13 +935,7 @@ class LinuxBridgeNeutronAgentRPC(service.Service):
                 if device_details['admin_state_up']:
                     # create the networking for the port
                     network_type = device_details.get('network_type')
-                    if network_type:
-                        segmentation_id = device_details.get('segmentation_id')
-                    else:
-                        # compatibility with pre-Havana RPC vlan_id encoding
-                        vlan_id = device_details.get('vlan_id')
-                        (network_type,
-                         segmentation_id) = lconst.interpret_vlan_id(vlan_id)
+                    segmentation_id = device_details.get('segmentation_id')
                     if self.br_mgr.add_interface(
                         device_details['network_id'],
                         network_type,