Use neutron-lib portbindings api-def

This patch refactors vmware-nsx to use portbindings
from neutron-lib. For more details see [1].

NeutronLibImpact

[1] https://review.openstack.org/422210/

Change-Id: I4d9ab115714d31deee19eab7214552083a13ef5a

vmware_nsx/plugins/dvs/plugin.py

@@ -32,13 +32,13 @@ from neutron.db import portsecurity_db
 from neutron.db import securitygroups_db
 from neutron.extensions import allowedaddresspairs as addr_pair
 from neutron.extensions import multiprovidernet as mpnet
-from neutron.extensions import portbindings as pbin
 from neutron.extensions import portsecurity as psec
 from neutron.extensions import providernet
 from neutron.extensions import securitygroup as ext_sg
 from neutron.plugins.common import constants
 from neutron.plugins.common import utils
 from neutron.quota import resource_registry
+from neutron_lib.api.definitions import portbindings as pbin
 from neutron_lib.api.definitions import provider_net as pnet
 from neutron_lib.api import validators
 from neutron_lib import exceptions as n_exc

vmware_nsx/plugins/nsx_mh/plugin.py

@@ -57,13 +57,13 @@ from neutron.extensions import extra_dhcp_opt as edo_ext
 from neutron.extensions import extraroute
 from neutron.extensions import l3
 from neutron.extensions import multiprovidernet as mpnet
-from neutron.extensions import portbindings as pbin
 from neutron.extensions import portsecurity as psec
 from neutron.extensions import providernet
 from neutron.extensions import securitygroup as ext_sg
 from neutron.plugins.common import constants as plugin_const
 from neutron.plugins.common import utils
 from neutron.quota import resource_registry
+from neutron_lib.api.definitions import portbindings as pbin
 from neutron_lib.api.definitions import provider_net as pnet
 
 import vmware_nsx

vmware_nsx/plugins/nsx_v/plugin.py

@@ -67,7 +67,6 @@ from neutron.extensions import external_net as ext_net_extn
 from neutron.extensions import flavors
 from neutron.extensions import l3
 from neutron.extensions import multiprovidernet as mpnet
-from neutron.extensions import portbindings as pbin
 from neutron.extensions import portsecurity as psec
 from neutron.extensions import providernet
 from neutron.extensions import securitygroup as ext_sg
@@ -76,6 +75,7 @@ from neutron.plugins.common import utils
 from neutron.quota import resource_registry
 from neutron.services.flavors import flavors_plugin
 from neutron.services.qos import qos_consts
+from neutron_lib.api.definitions import portbindings as pbin
 from neutron_lib.api.definitions import provider_net as pnet
 from vmware_nsx.dvs import dvs
 from vmware_nsx.services.qos.common import utils as qos_com_utils

vmware_nsx/plugins/nsx_v3/plugin.py

@@ -54,7 +54,6 @@ from neutron.extensions import availability_zone as az_ext
 from neutron.extensions import external_net as ext_net_extn
 from neutron.extensions import extra_dhcp_opt as ext_edo
 from neutron.extensions import l3
-from neutron.extensions import portbindings as pbin
 from neutron.extensions import portsecurity as psec
 from neutron.extensions import providernet
 from neutron.extensions import securitygroup as ext_sg
@@ -62,6 +61,7 @@ from neutron.plugins.common import constants as plugin_const
 from neutron.plugins.common import utils as n_utils
 from neutron.quota import resource_registry
 from neutron.services.qos import qos_consts
+from neutron_lib.api.definitions import portbindings as pbin
 from neutron_lib.api.definitions import provider_net as pnet
 from neutron_lib.api import validators
 from neutron_lib import constants as const

vmware_nsx/services/trunk/nsx_v3/driver.py

@@ -20,9 +20,9 @@ from oslo_utils import excutils
 
 from neutron.callbacks import events
 from neutron.callbacks import registry
-from neutron.extensions import portbindings
 from neutron.services.trunk import constants as trunk_consts
 from neutron.services.trunk.drivers import base
+from neutron_lib.api.definitions import portbindings
 
 from vmware_nsx._i18n import _LE
 from vmware_nsx.common import nsx_constants as nsx_consts

vmware_nsx/tests/unit/dvs/test_plugin.py

@@ -18,9 +18,9 @@ from oslo_config import cfg
 from oslo_utils import uuidutils
 
 from neutron import context
-from neutron.extensions import portbindings
 from neutron.tests import base
 import neutron.tests.unit.db.test_db_base_plugin_v2 as test_plugin
+from neutron_lib.api.definitions import portbindings
 from neutron_lib import exceptions as exp
 from neutron_lib.plugins import directory
 from vmware_nsx.common import exceptions as nsx_exc

vmware_nsx/tests/unit/nsx_mh/test_plugin.py

@@ -22,7 +22,6 @@ from neutron.extensions import dvr
 from neutron.extensions import external_net
 from neutron.extensions import l3
 from neutron.extensions import l3_ext_gw_mode
-from neutron.extensions import portbindings
 from neutron.extensions import securitygroup as secgrp
 from neutron.tests.unit import _test_extension_portbindings as test_bindings
 import neutron.tests.unit.db.test_db_base_plugin_v2 as test_plugin
@@ -31,6 +30,7 @@ import neutron.tests.unit.extensions.test_l3 as test_l3_plugin
 import neutron.tests.unit.extensions.test_l3_ext_gw_mode as test_ext_gw_mode
 import neutron.tests.unit.extensions.test_securitygroup as ext_sg
 from neutron.tests.unit import testlib_api
+from neutron_lib.api.definitions import portbindings
 from neutron_lib.api.definitions import provider_net as pnet
 from neutron_lib import constants
 from neutron_lib import exceptions as ntn_exc

vmware_nsx/tests/unit/nsx_v/test_plugin.py

@@ -27,7 +27,6 @@ from neutron.extensions import external_net
 from neutron.extensions import l3
 from neutron.extensions import l3_ext_gw_mode
 from neutron.extensions import l3_flavors
-from neutron.extensions import portbindings
 from neutron.extensions import router_availability_zone
 from neutron.extensions import securitygroup as secgrp
 from neutron.objects.qos import policy as qos_pol
@@ -42,6 +41,7 @@ import neutron.tests.unit.extensions.test_l3_ext_gw_mode as test_ext_gw_mode
 import neutron.tests.unit.extensions.test_portsecurity as test_psec
 import neutron.tests.unit.extensions.test_securitygroup as ext_sg
 from neutron.tests.unit import testlib_api
+from neutron_lib.api.definitions import portbindings
 from neutron_lib.api.definitions import provider_net as pnet
 from neutron_lib.api import validators
 from neutron_lib import constants

vmware_nsx/tests/unit/nsx_v3/test_parent_tag.py

@@ -12,7 +12,8 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from neutron.extensions import portbindings as pbin
+
+from neutron_lib.api.definitions import portbindings as pbin
 from vmware_nsx.tests.unit.nsx_v3 import test_plugin as test_nsx_v3_plugin
 
 

vmware_nsx/tests/unit/nsx_v3/test_plugin.py

@@ -24,7 +24,6 @@ from neutron.extensions import external_net
 from neutron.extensions import extraroute
 from neutron.extensions import l3
 from neutron.extensions import l3_ext_gw_mode
-from neutron.extensions import portbindings
 from neutron.extensions import securitygroup as secgrp
 from neutron.tests.unit import _test_extension_portbindings as test_bindings
 from neutron.tests.unit.db import test_db_base_plugin_v2 as test_plugin
@@ -36,6 +35,7 @@ from neutron.tests.unit.extensions \
 from neutron.tests.unit.scheduler \
     import test_dhcp_agent_scheduler as test_dhcpagent
 
+from neutron_lib.api.definitions import portbindings
 from neutron_lib.api.definitions import provider_net as pnet
 from neutron_lib import constants
 from neutron_lib import exceptions as n_exc

vmware_nsx/tests/unit/services/flowclassifier/test_nsxv_driver.py

@@ -23,8 +23,8 @@ from vmware_nsx.tests.unit.nsx_v.vshield import fake_vcns
 from neutron.api import extensions as api_ext
 from neutron.common import config
 from neutron import context
-from neutron.extensions import portbindings
 from neutron.plugins.ml2.drivers import type_vxlan   # noqa
+from neutron_lib.api.definitions import portbindings
 from neutron_lib.plugins import directory
 
 from networking_sfc.db import flowclassifier_db as fdb