From: Cedric Brandily <zzelle@gmail.com>
Date: Mon, 17 Aug 2015 22:17:34 +0000 (+0200)
Subject: Remove VIF_TYPES constant
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=e8303ce77c27391213948573108be02a72c34027;p=openstack-build%2Fneutron-build.git

Remove VIF_TYPES constant

VIF_TYPES[1] lists all vif types including out-of-tree ones BUT was only
used by out-of-tree bigswitch code: dependent change defined VIF_TYPES
in bigswitch repo in order to allow VIF_TYPES removal from neutron code.

[1] in neutron.extensions.portbindings

Closes-Bug: #1486277
Related-Bug: #1486279
Depends-On: I79d0af975bb62a2ccea87eda5cf43f3f064b5078
Change-Id: I39fc344361c21332b947f21f157d4f2a27caad47
---

diff --git a/doc/source/devref/contribute.rst b/doc/source/devref/contribute.rst
index d83de01b0..30a1e31d5 100644
--- a/doc/source/devref/contribute.rst
+++ b/doc/source/devref/contribute.rst
@@ -520,9 +520,11 @@ the installer to configure this item in the ``[default]`` section. For example::
     interface_driver = networking_foo.agent.linux.interface.FooInterfaceDriver
 
 **ToDo: Interface Driver port bindings.**
-    These are currently defined by the ``VIF_TYPES`` in
-    ``neutron/extensions/portbindings.py``. We could make this config-driven
-    for agents. For Nova, selecting the VIF driver can be done outside of
+    ``VIF_TYPE_*`` constants in ``neutron/extensions/portbindings.py`` should be
+    moved from neutron core to the repositories where their drivers are
+    implemented. We need to provide some config or hook mechanism for VIF types
+    to be registered by external interface drivers. For Nova, selecting the VIF
+    driver can be done outside of
     Neutron (using the new `os-vif python library
     <https://review.openstack.org/193668>`_?). Armando and Akihiro to discuss.
 
diff --git a/neutron/extensions/portbindings.py b/neutron/extensions/portbindings.py
index a72033405..25cc4b0d2 100644
--- a/neutron/extensions/portbindings.py
+++ b/neutron/extensions/portbindings.py
@@ -81,12 +81,6 @@ VIF_TYPE_IB_HOSTDEV = 'ib_hostdev'
 VIF_TYPE_HW_VEB = 'hw_veb'
 VIF_TYPE_VROUTER = 'vrouter'
 VIF_TYPE_OTHER = 'other'
-VIF_TYPES = [VIF_TYPE_UNBOUND, VIF_TYPE_BINDING_FAILED, VIF_TYPE_OVS,
-             VIF_TYPE_IVS, VIF_TYPE_BRIDGE, VIF_TYPE_802_QBG,
-             VIF_TYPE_802_QBH, VIF_TYPE_HYPERV, VIF_TYPE_MIDONET,
-             VIF_TYPE_IB_HOSTDEV, VIF_TYPE_HW_VEB,
-             VIF_TYPE_DVS, VIF_TYPE_OTHER, VIF_TYPE_DISTRIBUTED,
-             VIF_TYPE_VROUTER]
 
 VNIC_NORMAL = 'normal'
 VNIC_DIRECT = 'direct'