From 67322c3ba239db8e9284040479681221faff087b Mon Sep 17 00:00:00 2001
From: Boden R <bodenvmw@gmail.com>
Date: Wed, 7 Feb 2018 14:45:07 -0700
Subject: [PATCH] use is_extension_supported from neutron-lib

The is_extension_supported function now lives in neutron-lib. This patch
uses lib's version rather than neutron's in prep for commit
Iccb72e00f85043b3dff0299df7eb1279655e313e

Change-Id: Icdfab398a452b4c1ee98863e88dbb6708e42a12c
---
 vmware_nsx/plugins/nsx_v/plugin.py  | 3 ++-
 vmware_nsx/plugins/nsx_v3/plugin.py | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/vmware_nsx/plugins/nsx_v/plugin.py b/vmware_nsx/plugins/nsx_v/plugin.py
index 1d8f3a5623..c8224d7fd3 100644
--- a/vmware_nsx/plugins/nsx_v/plugin.py
+++ b/vmware_nsx/plugins/nsx_v/plugin.py
@@ -29,6 +29,7 @@ from neutron_lib.api.definitions import port_security as psec
 from neutron_lib.api.definitions import provider_net as pnet
 from neutron_lib.api.definitions import subnet as subnet_def
 from neutron_lib.api.definitions import vlantransparent as vlan_apidef
+from neutron_lib.api import extensions
 from neutron_lib.api import validators
 from neutron_lib.api.validators import availability_zone as az_validator
 from neutron_lib.callbacks import events
@@ -1179,7 +1180,7 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
         # Update the transparent vlan if configured
         self._validate_network_qos(net_data, backend_network)
         vlt = False
-        if n_utils.is_extension_supported(self, 'vlan-transparent'):
+        if extensions.is_extension_supported(self, 'vlan-transparent'):
             vlt = vlan_apidef.get_vlan_transparent(net_data)
 
         if backend_network or external_backend_network:
diff --git a/vmware_nsx/plugins/nsx_v3/plugin.py b/vmware_nsx/plugins/nsx_v3/plugin.py
index 370c291003..62f33b4e26 100644
--- a/vmware_nsx/plugins/nsx_v3/plugin.py
+++ b/vmware_nsx/plugins/nsx_v3/plugin.py
@@ -19,6 +19,7 @@ from neutron_lib.api.definitions import availability_zone as az_def
 from neutron_lib.api.definitions import external_net as extnet_apidef
 from neutron_lib.api.definitions import l3 as l3_apidef
 from neutron_lib.api.definitions import port_security as psec
+from neutron_lib.api import extensions
 from neutron_lib.api import faults
 from neutron_lib.api.validators import availability_zone as az_validator
 from neutron_lib.exceptions import allowedaddresspairs as addr_exc
@@ -33,7 +34,6 @@ from neutron.api.rpc.handlers import dhcp_rpc
 from neutron.api.rpc.handlers import metadata_rpc
 from neutron.common import rpc as n_rpc
 from neutron.common import topics
-from neutron.common import utils as nc_utils
 from neutron.db import _resource_extend as resource_extend
 from neutron.db import _utils as db_utils
 from neutron.db import agents_db
@@ -1060,7 +1060,7 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
 
         # Update the transparent vlan if configured
         vlt = False
-        if nc_utils.is_extension_supported(self, 'vlan-transparent'):
+        if extensions.is_extension_supported(self, 'vlan-transparent'):
             vlt = vlan_apidef.get_vlan_transparent(net_data)
 
         nsx_net_id = None
@@ -1113,7 +1113,7 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
                         neutron_net_id,
                         nsx_net_id)
 
-                if nc_utils.is_extension_supported(self, 'vlan-transparent'):
+                if extensions.is_extension_supported(self, 'vlan-transparent'):
                     super(NsxV3Plugin, self).update_network(context,
                         created_net['id'],
                         {'network': {'vlan_transparent': vlt}})