Switch to using in-tree tempest lib

As a result of change db9672e3473cd, tempest_lib is no
longer a thing we should be using.

Change-Id: I47f368fdce477d7419cc8fc23eb17264df42932d

neutron/tests/api/admin/test_extension_driver_port_security_admin.py

@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib import exceptions as lib_exc
 
 from neutron.tests.api import base
 from neutron.tests.api import base_security_groups as base_security

neutron/tests/api/admin/test_external_network_extension.py

@@ -10,8 +10,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.lib.common.utils import data_utils
 from tempest import test
-from tempest_lib.common.utils import data_utils
 
 from neutron.tests.api import base
 

neutron/tests/api/admin/test_external_networks_negative.py

@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib import exceptions as lib_exc
 
 from neutron.tests.api import base
 from neutron.tests.tempest import config

neutron/tests/api/admin/test_floating_ips_admin_actions.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib.common.utils import data_utils
-from tempest_lib import exceptions as lib_exc
 import testtools
 
 from neutron.tests.api import base

neutron/tests/api/admin/test_l3_agent_scheduler.py

@@ -12,8 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.lib.common.utils import data_utils
 from tempest import test
-from tempest_lib.common.utils import data_utils
 
 from neutron.tests.api import base
 from neutron.tests.tempest import exceptions

neutron/tests/api/admin/test_quotas.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 import six
+from tempest.lib.common.utils import data_utils
 from tempest import test
-from tempest_lib.common.utils import data_utils
 
 from neutron.tests.api import base
 

neutron/tests/api/admin/test_routers_dvr.py

@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.lib.common.utils import data_utils
 from tempest import test
-from tempest_lib.common.utils import data_utils
 
 from neutron.tests.api import base_routers as base
 

neutron/tests/api/admin/test_shared_network_extension.py

@@ -16,9 +16,9 @@
 
 import uuid
 
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib.common.utils import data_utils
-from tempest_lib import exceptions as lib_exc
 import testtools
 
 from neutron.tests.api import base

neutron/tests/api/base.py

@@ -14,9 +14,9 @@
 #    under the License.
 
 import netaddr
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib.common.utils import data_utils
-from tempest_lib import exceptions as lib_exc
 
 from neutron.tests.api import clients
 from neutron.tests.tempest import config

neutron/tests/api/base_security_groups.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from tempest_lib.common.utils import data_utils
+from tempest.lib.common.utils import data_utils
 
 from neutron.tests.api import base
 

neutron/tests/api/test_address_scopes.py

@@ -12,9 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib.common.utils import data_utils
-from tempest_lib import exceptions as lib_exc
 
 from neutron.tests.api import base
 

neutron/tests/api/test_address_scopes_negative.py

@@ -12,9 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib.common.utils import data_utils
-from tempest_lib import exceptions as lib_exc
 
 from neutron.tests.api import test_address_scopes
 

neutron/tests/api/test_bgp_speaker_extensions.py

@@ -13,8 +13,8 @@
 #    under the License.
 
 from tempest import config
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib import exceptions as lib_exc
 
 from neutron.tests.api import base
 from tempest.common import tempest_fixtures as fixtures

neutron/tests/api/test_bgp_speaker_extensions_negative.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from tempest_lib import exceptions as lib_exc
+from tempest.lib import exceptions as lib_exc
 
 from neutron.tests.api import test_bgp_speaker_extensions as test_base
 from tempest import test

neutron/tests/api/test_dhcp_ipv6.py

@@ -17,9 +17,9 @@ import random
 
 import netaddr
 import six
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib.common.utils import data_utils
-from tempest_lib import exceptions as lib_exc
 
 from neutron.common import constants
 from neutron.tests.api import base

neutron/tests/api/test_extension_driver_port_security.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 import ddt
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib import exceptions as lib_exc
 
 from neutron.tests.api import base
 from neutron.tests.api import base_security_groups as base_security

neutron/tests/api/test_extra_dhcp_options.py

@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.lib.common.utils import data_utils
 from tempest import test
-from tempest_lib.common.utils import data_utils
 
 from neutron.tests.api import base
 

neutron/tests/api/test_flavors_extensions.py

@@ -12,8 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib import exceptions as lib_exc
 
 from neutron.tests.api import base
 

neutron/tests/api/test_floating_ips.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 import netaddr
+from tempest.lib.common.utils import data_utils
 from tempest import test
-from tempest_lib.common.utils import data_utils
 
 from neutron.tests.api import base
 from neutron.tests.tempest import config

neutron/tests/api/test_floating_ips_negative.py

@@ -14,9 +14,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib.common.utils import data_utils
-from tempest_lib import exceptions as lib_exc
 
 from neutron.tests.api import base
 from neutron.tests.tempest import config

neutron/tests/api/test_metering_extensions.py

@@ -12,8 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from tempest.lib.common.utils import data_utils
 from tempest import test
-from tempest_lib.common.utils import data_utils
 
 from neutron.tests.api import base
 

neutron/tests/api/test_networks.py

@@ -18,9 +18,9 @@ import itertools
 import netaddr
 import six
 from tempest.common import custom_matchers
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib.common.utils import data_utils
-from tempest_lib import exceptions as lib_exc
 
 from neutron.tests.api import base
 from neutron.tests.tempest import config

neutron/tests/api/test_networks_negative.py

@@ -14,9 +14,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib.common.utils import data_utils
-from tempest_lib import exceptions as lib_exc
 
 from neutron.tests.api import base
 

neutron/tests/api/test_ports.py

@@ -17,8 +17,8 @@ import socket
 
 import netaddr
 from tempest.common import custom_matchers
+from tempest.lib.common.utils import data_utils
 from tempest import test
-from tempest_lib.common.utils import data_utils
 
 from neutron.tests.api import base
 from neutron.tests.api import base_security_groups as sec_base

neutron/tests/api/test_qos.py

@@ -12,8 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.lib import exceptions
 from tempest import test
-from tempest_lib import exceptions
 import testtools
 
 from neutron.services.qos import qos_consts
@@ -112,7 +112,7 @@ class QosTestJSON(base.BaseAdminNetworkTest):
         # In theory, we could make the test conditional on which ml2 drivers
         # are enabled in gate (or more specifically, on which supported qos
         # rules are claimed by core plugin), but that option doesn't seem to be
-        # available thru tempest_lib framework
+        # available thru tempest.lib framework
         expected_rule_types = []
         expected_rule_details = ['type']
 

neutron/tests/api/test_routers.py

@@ -15,8 +15,8 @@
 
 import netaddr
 import six
+from tempest.lib.common.utils import data_utils
 from tempest import test
-from tempest_lib.common.utils import data_utils
 
 from neutron.tests.api import base_routers as base
 from neutron.tests.tempest import config

neutron/tests/api/test_routers_negative.py

@@ -14,9 +14,9 @@
 #    under the License.
 
 import netaddr
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib.common.utils import data_utils
-from tempest_lib import exceptions as lib_exc
 import testtools
 
 from neutron.tests.api import base_routers as base

neutron/tests/api/test_security_groups.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 import six
+from tempest.lib.common.utils import data_utils
 from tempest import test
-from tempest_lib.common.utils import data_utils
 
 from neutron.tests.api import base_security_groups as base
 from neutron.tests.tempest import config

neutron/tests/api/test_security_groups_negative.py

@@ -15,8 +15,8 @@
 
 import uuid
 
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib import exceptions as lib_exc
 
 from neutron.tests.api import base_security_groups as base
 from neutron.tests.tempest import config

neutron/tests/api/test_subnetpools.py

@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.lib.common.utils import data_utils
 from tempest import test
-from tempest_lib.common.utils import data_utils
 
 from neutron.tests.api import base
 

neutron/tests/api/test_subnetpools_negative.py

@@ -16,9 +16,9 @@
 import uuid
 
 import netaddr
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib.common.utils import data_utils
-from tempest_lib import exceptions as lib_exc
 
 from neutron.tests.api import test_subnetpools
 

neutron/tests/retargetable/rest_fixture.py

@@ -17,7 +17,7 @@ configuration and Neutron configuration requires that
 neutron.tests.tempest imports be isolated in this module for now.
 """
 
-from tempest_lib import exceptions as tlib_exceptions
+from tempest.lib import exceptions as tlib_exceptions
 
 from neutron.tests import base
 from neutron.tests.retargetable import client_fixtures

neutron/tests/tempest/README.rst

@@ -2,9 +2,9 @@ WARNING
 =======
 
 The files under this path were copied from tempest as part of the move
-of the api tests, and they will be removed as the required
-functionality is transitioned from tempest to tempest-lib.  While it
-exists, only neutron.tests.api and neutron.tests.retargetable should
+of the api tests, and they will be removed as required over time to
+minimize the depedency on the tempest testing framework.
+While it exists, only neutron.tests.api and neutron.tests.retargetable should
 be importing files from this path.  neutron.tests.tempest.config uses
 the global cfg.CONF instance and importing it outside of the api tests
 has the potential to break Neutron's use of cfg.CONF.

neutron/tests/tempest/exceptions.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from tempest_lib import exceptions
+from tempest.lib import exceptions
 
 TempestException = exceptions.TempestException
 

neutron/tests/tempest/services/network/json/network_client.py

@@ -15,7 +15,7 @@ import time
 from oslo_serialization import jsonutils as json
 from six.moves.urllib import parse as urlparse
 from tempest.common import service_client
-from tempest_lib import exceptions as lib_exc
+from tempest.lib import exceptions as lib_exc
 
 from neutron.tests.tempest import exceptions
 

test-requirements.txt

@@ -18,7 +18,6 @@ testscenarios>=0.4 # Apache-2.0/BSD
 WebTest>=2.0 # MIT
 oslotest>=1.10.0 # Apache-2.0
 os-testr>=0.4.1 # Apache-2.0
-tempest-lib>=0.14.0 # Apache-2.0
 ddt>=1.0.1 # MIT
 pylint==1.4.5 # GNU GPL v2
 reno>=0.1.1 # Apache2