From: Maru Newby <marun@redhat.com>
Date: Tue, 24 Mar 2015 16:21:57 +0000 (+0000)
Subject: Move API tests to neutron.test.api
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=57a445d6c8deab47a9e8615ca7a99da3654fb3de;p=openstack-build%2Fneutron-build.git

Move API tests to neutron.test.api

To make api test development simpler, move the tests to
neutron.tests.api.  The neutron.tests.tempest subtree will remain
while work continues to transition the required functionality to
tempest-lib.

Change-Id: Ie90671fbfe2f633e851da82728e152482133fd87
---

diff --git a/neutron/tests/api/__init__.py b/neutron/tests/api/__init__.py
index 740001b53..0f4ba3681 100644
--- a/neutron/tests/api/__init__.py
+++ b/neutron/tests/api/__init__.py
@@ -14,8 +14,7 @@ import unittest
 
 
 # Allow the retargetable and tempest api tests to be executed as part
-# of the same job by ensuring that tests from both tests are
-# discovered.
+# of the same job by ensuring that tests from both paths are discovered.
 
 
 def _discover(loader, path, pattern):
@@ -28,10 +27,6 @@ def load_tests(_, tests, pattern):
 
     loader = unittest.loader.TestLoader()
     suite.addTests(_discover(loader, "./neutron/tests/api", pattern))
-    # TODO(marun) Remove once the tempest tests have been moved to api/
-    suite.addTests(_discover(loader,
-                             "./neutron/tests/tempest/api/network",
-                             pattern))
     suite.addTests(_discover(loader,
                              "./neutron/tests/retargetable",
                              pattern))
diff --git a/neutron/tests/api/contrib/__init__.py b/neutron/tests/api/admin/__init__.py
similarity index 100%
rename from neutron/tests/api/contrib/__init__.py
rename to neutron/tests/api/admin/__init__.py
diff --git a/neutron/tests/tempest/api/network/admin/test_agent_management.py b/neutron/tests/api/admin/test_agent_management.py
similarity index 98%
rename from neutron/tests/tempest/api/network/admin/test_agent_management.py
rename to neutron/tests/api/admin/test_agent_management.py
index d875515a5..a883c7be9 100644
--- a/neutron/tests/tempest/api/network/admin/test_agent_management.py
+++ b/neutron/tests/api/admin/test_agent_management.py
@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from neutron.tests.tempest.api.network import base
+from neutron.tests.api import base
 from neutron.tests.tempest.common import tempest_fixtures as fixtures
 from neutron.tests.tempest import test
 
diff --git a/neutron/tests/tempest/api/network/admin/test_dhcp_agent_scheduler.py b/neutron/tests/api/admin/test_dhcp_agent_scheduler.py
similarity index 98%
rename from neutron/tests/tempest/api/network/admin/test_dhcp_agent_scheduler.py
rename to neutron/tests/api/admin/test_dhcp_agent_scheduler.py
index 181206254..befd2ef11 100644
--- a/neutron/tests/tempest/api/network/admin/test_dhcp_agent_scheduler.py
+++ b/neutron/tests/api/admin/test_dhcp_agent_scheduler.py
@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from neutron.tests.tempest.api.network import base
+from neutron.tests.api import base
 from neutron.tests.tempest import test
 
 
diff --git a/neutron/tests/tempest/api/network/admin/test_external_network_extension.py b/neutron/tests/api/admin/test_external_network_extension.py
similarity index 99%
rename from neutron/tests/tempest/api/network/admin/test_external_network_extension.py
rename to neutron/tests/api/admin/test_external_network_extension.py
index 7935a8d3f..b996dab8d 100644
--- a/neutron/tests/tempest/api/network/admin/test_external_network_extension.py
+++ b/neutron/tests/api/admin/test_external_network_extension.py
@@ -12,7 +12,7 @@
 
 from tempest_lib.common.utils import data_utils
 
-from neutron.tests.tempest.api.network import base
+from neutron.tests.api import base
 from neutron.tests.tempest import test
 
 
diff --git a/neutron/tests/tempest/api/network/admin/test_external_networks_negative.py b/neutron/tests/api/admin/test_external_networks_negative.py
similarity index 97%
rename from neutron/tests/tempest/api/network/admin/test_external_networks_negative.py
rename to neutron/tests/api/admin/test_external_networks_negative.py
index d9135a1f4..35d12f0cc 100644
--- a/neutron/tests/tempest/api/network/admin/test_external_networks_negative.py
+++ b/neutron/tests/api/admin/test_external_networks_negative.py
@@ -15,7 +15,7 @@
 
 from tempest_lib import exceptions as lib_exc
 
-from neutron.tests.tempest.api.network import base
+from neutron.tests.api import base
 from neutron.tests.tempest import config
 from neutron.tests.tempest import test
 
diff --git a/neutron/tests/tempest/api/network/admin/test_floating_ips_admin_actions.py b/neutron/tests/api/admin/test_floating_ips_admin_actions.py
similarity index 98%
rename from neutron/tests/tempest/api/network/admin/test_floating_ips_admin_actions.py
rename to neutron/tests/api/admin/test_floating_ips_admin_actions.py
index be1e8d6fc..72abb32b7 100644
--- a/neutron/tests/tempest/api/network/admin/test_floating_ips_admin_actions.py
+++ b/neutron/tests/api/admin/test_floating_ips_admin_actions.py
@@ -15,8 +15,8 @@
 
 from tempest_lib.common.utils import data_utils
 
-from neutron.tests.tempest.api.network import base
-from neutron.tests.api.contrib import clients
+from neutron.tests.api import base
+from neutron.tests.api import clients
 from neutron.tests.tempest import config
 from neutron.tests.tempest import test
 
diff --git a/neutron/tests/tempest/api/network/admin/test_l3_agent_scheduler.py b/neutron/tests/api/admin/test_l3_agent_scheduler.py
similarity index 98%
rename from neutron/tests/tempest/api/network/admin/test_l3_agent_scheduler.py
rename to neutron/tests/api/admin/test_l3_agent_scheduler.py
index a17b9b40b..2d077675e 100644
--- a/neutron/tests/tempest/api/network/admin/test_l3_agent_scheduler.py
+++ b/neutron/tests/api/admin/test_l3_agent_scheduler.py
@@ -14,7 +14,7 @@
 
 from tempest_lib.common.utils import data_utils
 
-from neutron.tests.tempest.api.network import base
+from neutron.tests.api import base
 from neutron.tests.tempest import test
 
 
diff --git a/neutron/tests/tempest/api/network/admin/test_lbaas_agent_scheduler.py b/neutron/tests/api/admin/test_lbaas_agent_scheduler.py
similarity index 98%
rename from neutron/tests/tempest/api/network/admin/test_lbaas_agent_scheduler.py
rename to neutron/tests/api/admin/test_lbaas_agent_scheduler.py
index 0cd9239a8..e4dfa33e0 100644
--- a/neutron/tests/tempest/api/network/admin/test_lbaas_agent_scheduler.py
+++ b/neutron/tests/api/admin/test_lbaas_agent_scheduler.py
@@ -14,7 +14,7 @@
 
 from tempest_lib.common.utils import data_utils
 
-from neutron.tests.tempest.api.network import base
+from neutron.tests.api import base
 from neutron.tests.tempest import test
 
 
diff --git a/neutron/tests/tempest/api/network/admin/test_load_balancer_admin_actions.py b/neutron/tests/api/admin/test_load_balancer_admin_actions.py
similarity index 99%
rename from neutron/tests/tempest/api/network/admin/test_load_balancer_admin_actions.py
rename to neutron/tests/api/admin/test_load_balancer_admin_actions.py
index d05061d56..5dcafef0b 100644
--- a/neutron/tests/tempest/api/network/admin/test_load_balancer_admin_actions.py
+++ b/neutron/tests/api/admin/test_load_balancer_admin_actions.py
@@ -15,7 +15,7 @@
 
 from tempest_lib.common.utils import data_utils
 
-from neutron.tests.tempest.api.network import base
+from neutron.tests.api import base
 from neutron.tests.tempest import test
 
 
diff --git a/neutron/tests/tempest/api/network/admin/test_quotas.py b/neutron/tests/api/admin/test_quotas.py
similarity index 98%
rename from neutron/tests/tempest/api/network/admin/test_quotas.py
rename to neutron/tests/api/admin/test_quotas.py
index 6bac99100..7e04e0306 100644
--- a/neutron/tests/tempest/api/network/admin/test_quotas.py
+++ b/neutron/tests/api/admin/test_quotas.py
@@ -15,7 +15,7 @@
 
 from tempest_lib.common.utils import data_utils
 
-from neutron.tests.tempest.api.network import base
+from neutron.tests.api import base
 from neutron.tests.tempest import test
 
 
diff --git a/neutron/tests/tempest/api/network/admin/test_routers_dvr.py b/neutron/tests/api/admin/test_routers_dvr.py
similarity index 98%
rename from neutron/tests/tempest/api/network/admin/test_routers_dvr.py
rename to neutron/tests/api/admin/test_routers_dvr.py
index 54db06602..34301ce74 100644
--- a/neutron/tests/tempest/api/network/admin/test_routers_dvr.py
+++ b/neutron/tests/api/admin/test_routers_dvr.py
@@ -15,7 +15,7 @@
 
 from tempest_lib.common.utils import data_utils
 
-from neutron.tests.tempest.api.network import base_routers as base
+from neutron.tests.api import base_routers as base
 from neutron.tests.tempest import test
 
 
diff --git a/neutron/tests/tempest/api/network/base.py b/neutron/tests/api/base.py
similarity index 99%
rename from neutron/tests/tempest/api/network/base.py
rename to neutron/tests/api/base.py
index 1efec9637..8f38be085 100644
--- a/neutron/tests/tempest/api/network/base.py
+++ b/neutron/tests/api/base.py
@@ -18,7 +18,7 @@ from oslo_log import log as logging
 from tempest_lib.common.utils import data_utils
 from tempest_lib import exceptions as lib_exc
 
-from neutron.tests.api.contrib import clients
+from neutron.tests.api import clients
 from neutron.tests.tempest import config
 from neutron.tests.tempest import exceptions
 import neutron.tests.tempest.test
diff --git a/neutron/tests/tempest/api/network/base_routers.py b/neutron/tests/api/base_routers.py
similarity index 97%
rename from neutron/tests/tempest/api/network/base_routers.py
rename to neutron/tests/api/base_routers.py
index 4f0250175..c800a2e72 100644
--- a/neutron/tests/tempest/api/network/base_routers.py
+++ b/neutron/tests/api/base_routers.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from neutron.tests.tempest.api.network import base
+from neutron.tests.api import base
 
 
 class BaseRouterTest(base.BaseAdminNetworkTest):
diff --git a/neutron/tests/tempest/api/network/base_security_groups.py b/neutron/tests/api/base_security_groups.py
similarity index 97%
rename from neutron/tests/tempest/api/network/base_security_groups.py
rename to neutron/tests/api/base_security_groups.py
index 019eca4e1..37b0aaa85 100644
--- a/neutron/tests/tempest/api/network/base_security_groups.py
+++ b/neutron/tests/api/base_security_groups.py
@@ -15,7 +15,7 @@
 
 from tempest_lib.common.utils import data_utils
 
-from neutron.tests.tempest.api.network import base
+from neutron.tests.api import base
 
 
 class BaseSecGroupTest(base.BaseNetworkTest):
diff --git a/neutron/tests/api/contrib/clients.py b/neutron/tests/api/clients.py
similarity index 100%
rename from neutron/tests/api/contrib/clients.py
rename to neutron/tests/api/clients.py
diff --git a/neutron/tests/api/contrib/README.rst b/neutron/tests/api/contrib/README.rst
deleted file mode 100644
index 79967da77..000000000
--- a/neutron/tests/api/contrib/README.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-This path contains artifacts from tempest that have been modified to
-support the execution of api tests from the neutron tree.  These
-artifacts are intended to be a stop-gap to support test migration, and
-it is hoped that changes to tempest and tempest-lib will render it
-unnecessary at some point in the future.
diff --git a/neutron/tests/tempest/api/network/test_allowed_address_pair.py b/neutron/tests/api/test_allowed_address_pair.py
similarity index 99%
rename from neutron/tests/tempest/api/network/test_allowed_address_pair.py
rename to neutron/tests/api/test_allowed_address_pair.py
index 641223e40..5302912eb 100644
--- a/neutron/tests/tempest/api/network/test_allowed_address_pair.py
+++ b/neutron/tests/api/test_allowed_address_pair.py
@@ -15,7 +15,7 @@
 
 import netaddr
 
-from neutron.tests.tempest.api.network import base
+from neutron.tests.api import base
 from neutron.tests.tempest import config
 from neutron.tests.tempest import test
 
diff --git a/neutron/tests/tempest/api/network/test_dhcp_ipv6.py b/neutron/tests/api/test_dhcp_ipv6.py
similarity index 99%
rename from neutron/tests/tempest/api/network/test_dhcp_ipv6.py
rename to neutron/tests/api/test_dhcp_ipv6.py
index cb292b896..5323ed704 100644
--- a/neutron/tests/tempest/api/network/test_dhcp_ipv6.py
+++ b/neutron/tests/api/test_dhcp_ipv6.py
@@ -19,7 +19,7 @@ import random
 from tempest_lib.common.utils import data_utils
 from tempest_lib import exceptions as lib_exc
 
-from neutron.tests.tempest.api.network import base
+from neutron.tests.api import base
 from neutron.tests.tempest import config
 from neutron.tests.tempest import test
 
diff --git a/neutron/tests/tempest/api/network/test_extensions.py b/neutron/tests/api/test_extensions.py
similarity index 98%
rename from neutron/tests/tempest/api/network/test_extensions.py
rename to neutron/tests/api/test_extensions.py
index 455d7e2b0..56be8189f 100644
--- a/neutron/tests/tempest/api/network/test_extensions.py
+++ b/neutron/tests/api/test_extensions.py
@@ -14,7 +14,7 @@
 #    under the License.
 
 
-from neutron.tests.tempest.api.network import base
+from neutron.tests.api import base
 from neutron.tests.tempest import test
 
 
diff --git a/neutron/tests/tempest/api/network/test_extra_dhcp_options.py b/neutron/tests/api/test_extra_dhcp_options.py
similarity index 98%
rename from neutron/tests/tempest/api/network/test_extra_dhcp_options.py
rename to neutron/tests/api/test_extra_dhcp_options.py
index 1907ccfc4..57e4329c8 100644
--- a/neutron/tests/tempest/api/network/test_extra_dhcp_options.py
+++ b/neutron/tests/api/test_extra_dhcp_options.py
@@ -15,7 +15,7 @@
 
 from tempest_lib.common.utils import data_utils
 
-from neutron.tests.tempest.api.network import base
+from neutron.tests.api import base
 from neutron.tests.tempest import test
 
 
diff --git a/neutron/tests/tempest/api/network/test_floating_ips.py b/neutron/tests/api/test_floating_ips.py
similarity index 99%
rename from neutron/tests/tempest/api/network/test_floating_ips.py
rename to neutron/tests/api/test_floating_ips.py
index 3fb652db4..78ea35b54 100644
--- a/neutron/tests/tempest/api/network/test_floating_ips.py
+++ b/neutron/tests/api/test_floating_ips.py
@@ -16,7 +16,7 @@
 import netaddr
 from tempest_lib.common.utils import data_utils
 
-from neutron.tests.tempest.api.network import base
+from neutron.tests.api import base
 from neutron.tests.tempest import config
 from neutron.tests.tempest import test
 
diff --git a/neutron/tests/tempest/api/network/test_floating_ips_negative.py b/neutron/tests/api/test_floating_ips_negative.py
similarity index 98%
rename from neutron/tests/tempest/api/network/test_floating_ips_negative.py
rename to neutron/tests/api/test_floating_ips_negative.py
index 6037a8435..c7e9e9a9c 100644
--- a/neutron/tests/tempest/api/network/test_floating_ips_negative.py
+++ b/neutron/tests/api/test_floating_ips_negative.py
@@ -17,7 +17,7 @@
 from tempest_lib.common.utils import data_utils
 from tempest_lib import exceptions as lib_exc
 
-from neutron.tests.tempest.api.network import base
+from neutron.tests.api import base
 from neutron.tests.tempest import config
 from neutron.tests.tempest import test
 
diff --git a/neutron/tests/tempest/api/network/test_fwaas_extensions.py b/neutron/tests/api/test_fwaas_extensions.py
similarity index 99%
rename from neutron/tests/tempest/api/network/test_fwaas_extensions.py
rename to neutron/tests/api/test_fwaas_extensions.py
index 5989c0a22..e7fead279 100644
--- a/neutron/tests/tempest/api/network/test_fwaas_extensions.py
+++ b/neutron/tests/api/test_fwaas_extensions.py
@@ -15,7 +15,7 @@
 from tempest_lib.common.utils import data_utils
 from tempest_lib import exceptions as lib_exc
 
-from neutron.tests.tempest.api.network import base
+from neutron.tests.api import base
 from neutron.tests.tempest import config
 from neutron.tests.tempest import exceptions
 from neutron.tests.tempest import test
diff --git a/neutron/tests/tempest/api/network/test_load_balancer.py b/neutron/tests/api/test_load_balancer.py
similarity index 99%
rename from neutron/tests/tempest/api/network/test_load_balancer.py
rename to neutron/tests/api/test_load_balancer.py
index 31082fdec..fde60dc00 100644
--- a/neutron/tests/tempest/api/network/test_load_balancer.py
+++ b/neutron/tests/api/test_load_balancer.py
@@ -16,7 +16,7 @@
 from tempest_lib.common.utils import data_utils
 from tempest_lib import decorators
 
-from neutron.tests.tempest.api.network import base
+from neutron.tests.api import base
 from neutron.tests.tempest import test
 
 
diff --git a/neutron/tests/tempest/api/network/test_metering_extensions.py b/neutron/tests/api/test_metering_extensions.py
similarity index 99%
rename from neutron/tests/tempest/api/network/test_metering_extensions.py
rename to neutron/tests/api/test_metering_extensions.py
index 7f2a3fada..f26b0b2d0 100644
--- a/neutron/tests/tempest/api/network/test_metering_extensions.py
+++ b/neutron/tests/api/test_metering_extensions.py
@@ -15,7 +15,7 @@
 from oslo_log import log as logging
 from tempest_lib.common.utils import data_utils
 
-from neutron.tests.tempest.api.network import base
+from neutron.tests.api import base
 from neutron.tests.tempest import test
 
 
diff --git a/neutron/tests/tempest/api/network/test_networks.py b/neutron/tests/api/test_networks.py
similarity index 99%
rename from neutron/tests/tempest/api/network/test_networks.py
rename to neutron/tests/api/test_networks.py
index b838ce947..6300c0797 100644
--- a/neutron/tests/tempest/api/network/test_networks.py
+++ b/neutron/tests/api/test_networks.py
@@ -18,7 +18,7 @@ import netaddr
 from tempest_lib.common.utils import data_utils
 from tempest_lib import exceptions as lib_exc
 
-from neutron.tests.tempest.api.network import base
+from neutron.tests.api import base
 from neutron.tests.tempest.common import custom_matchers
 from neutron.tests.tempest import config
 from neutron.tests.tempest import test
diff --git a/neutron/tests/tempest/api/network/test_networks_negative.py b/neutron/tests/api/test_networks_negative.py
similarity index 97%
rename from neutron/tests/tempest/api/network/test_networks_negative.py
rename to neutron/tests/api/test_networks_negative.py
index 7fada6e58..c4a30f5f3 100644
--- a/neutron/tests/tempest/api/network/test_networks_negative.py
+++ b/neutron/tests/api/test_networks_negative.py
@@ -17,7 +17,7 @@
 from tempest_lib.common.utils import data_utils
 from tempest_lib import exceptions as lib_exc
 
-from neutron.tests.tempest.api.network import base
+from neutron.tests.api import base
 from neutron.tests.tempest import test
 
 
diff --git a/neutron/tests/tempest/api/network/test_ports.py b/neutron/tests/api/test_ports.py
similarity index 99%
rename from neutron/tests/tempest/api/network/test_ports.py
rename to neutron/tests/api/test_ports.py
index 044f109c0..6db8d2190 100644
--- a/neutron/tests/tempest/api/network/test_ports.py
+++ b/neutron/tests/api/test_ports.py
@@ -18,8 +18,8 @@ import socket
 import netaddr
 from tempest_lib.common.utils import data_utils
 
-from neutron.tests.tempest.api.network import base
-from neutron.tests.tempest.api.network import base_security_groups as sec_base
+from neutron.tests.api import base
+from neutron.tests.api import base_security_groups as sec_base
 from neutron.tests.tempest.common import custom_matchers
 from neutron.tests.tempest import config
 from neutron.tests.tempest import test
diff --git a/neutron/tests/tempest/api/network/test_routers.py b/neutron/tests/api/test_routers.py
similarity index 99%
rename from neutron/tests/tempest/api/network/test_routers.py
rename to neutron/tests/api/test_routers.py
index dcaba2205..fc5efceda 100644
--- a/neutron/tests/tempest/api/network/test_routers.py
+++ b/neutron/tests/api/test_routers.py
@@ -16,8 +16,8 @@
 import netaddr
 from tempest_lib.common.utils import data_utils
 
-from neutron.tests.tempest.api.network import base_routers as base
-from neutron.tests.api.contrib import clients
+from neutron.tests.api import base_routers as base
+from neutron.tests.api import clients
 from neutron.tests.tempest import config
 from neutron.tests.tempest import test
 
diff --git a/neutron/tests/tempest/api/network/test_routers_negative.py b/neutron/tests/api/test_routers_negative.py
similarity index 98%
rename from neutron/tests/tempest/api/network/test_routers_negative.py
rename to neutron/tests/api/test_routers_negative.py
index c62467d4a..0688e15ff 100644
--- a/neutron/tests/tempest/api/network/test_routers_negative.py
+++ b/neutron/tests/api/test_routers_negative.py
@@ -17,7 +17,7 @@ import netaddr
 from tempest_lib.common.utils import data_utils
 from tempest_lib import exceptions as lib_exc
 
-from neutron.tests.tempest.api.network import base_routers as base
+from neutron.tests.api import base_routers as base
 from neutron.tests.tempest import config
 from neutron.tests.tempest import test
 
diff --git a/neutron/tests/tempest/api/network/test_security_groups.py b/neutron/tests/api/test_security_groups.py
similarity index 99%
rename from neutron/tests/tempest/api/network/test_security_groups.py
rename to neutron/tests/api/test_security_groups.py
index a2d3a7c2a..1e4d7ce10 100644
--- a/neutron/tests/tempest/api/network/test_security_groups.py
+++ b/neutron/tests/api/test_security_groups.py
@@ -16,7 +16,7 @@
 import six
 from tempest_lib.common.utils import data_utils
 
-from neutron.tests.tempest.api.network import base_security_groups as base
+from neutron.tests.api import base_security_groups as base
 from neutron.tests.tempest import config
 from neutron.tests.tempest import test
 
diff --git a/neutron/tests/tempest/api/network/test_security_groups_negative.py b/neutron/tests/api/test_security_groups_negative.py
similarity index 99%
rename from neutron/tests/tempest/api/network/test_security_groups_negative.py
rename to neutron/tests/api/test_security_groups_negative.py
index b36eec672..b45c11db0 100644
--- a/neutron/tests/tempest/api/network/test_security_groups_negative.py
+++ b/neutron/tests/api/test_security_groups_negative.py
@@ -17,7 +17,7 @@ import uuid
 
 from tempest_lib import exceptions as lib_exc
 
-from neutron.tests.tempest.api.network import base_security_groups as base
+from neutron.tests.api import base_security_groups as base
 from neutron.tests.tempest import config
 from neutron.tests.tempest import test
 
diff --git a/neutron/tests/tempest/api/network/test_service_type_management.py b/neutron/tests/api/test_service_type_management.py
similarity index 96%
rename from neutron/tests/tempest/api/network/test_service_type_management.py
rename to neutron/tests/api/test_service_type_management.py
index cef620b29..7c68e8dd6 100644
--- a/neutron/tests/tempest/api/network/test_service_type_management.py
+++ b/neutron/tests/api/test_service_type_management.py
@@ -12,7 +12,7 @@
 
 from tempest_lib import decorators
 
-from neutron.tests.tempest.api.network import base
+from neutron.tests.api import base
 from neutron.tests.tempest import test
 
 
diff --git a/neutron/tests/tempest/api/network/test_vpnaas_extensions.py b/neutron/tests/api/test_vpnaas_extensions.py
similarity index 99%
rename from neutron/tests/tempest/api/network/test_vpnaas_extensions.py
rename to neutron/tests/api/test_vpnaas_extensions.py
index 6abe0a9dc..03b5cc1e1 100644
--- a/neutron/tests/tempest/api/network/test_vpnaas_extensions.py
+++ b/neutron/tests/api/test_vpnaas_extensions.py
@@ -16,7 +16,7 @@
 from tempest_lib.common.utils import data_utils
 from tempest_lib import exceptions as lib_exc
 
-from neutron.tests.tempest.api.network import base
+from neutron.tests.api import base
 from neutron.tests.tempest import config
 from neutron.tests.tempest import test
 
diff --git a/neutron/tests/tempest/README.rst b/neutron/tests/tempest/README.rst
index 6f50970c2..5b3600a95 100644
--- a/neutron/tests/tempest/README.rst
+++ b/neutron/tests/tempest/README.rst
@@ -1,10 +1,10 @@
 WARNING
 =======
 
-The files under this path are maintained automatically by the script
-tools/copy_api_tests_from_tempest.sh.  It's contents should not be
-manually modified until further notice.
-
-Note that neutron.tests.tempest.config uses the global cfg.CONF
-instance for now and importing it outside of the api tests has the
-potential to break Neutron's use of cfg.CONF.
+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
+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.
diff --git a/neutron/tests/tempest/api/__init__.py b/neutron/tests/tempest/api/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/neutron/tests/tempest/api/network/__init__.py b/neutron/tests/tempest/api/network/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/neutron/tests/tempest/api/network/admin/__init__.py b/neutron/tests/tempest/api/network/admin/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/neutron/tests/tempest/common/isolated_creds.py b/neutron/tests/tempest/common/isolated_creds.py
index 5c94289a6..b4de93b62 100644
--- a/neutron/tests/tempest/common/isolated_creds.py
+++ b/neutron/tests/tempest/common/isolated_creds.py
@@ -17,7 +17,7 @@ from oslo_log import log as logging
 from tempest_lib.common.utils import data_utils
 from tempest_lib import exceptions as lib_exc
 
-from neutron.tests.api.contrib import clients
+from neutron.tests.api import clients
 from neutron.tests.tempest.common import cred_provider
 from neutron.tests.tempest import config
 from neutron.tests.tempest import exceptions
diff --git a/neutron/tests/tempest/test.py b/neutron/tests/tempest/test.py
index 2f3571007..4bb196038 100644
--- a/neutron/tests/tempest/test.py
+++ b/neutron/tests/tempest/test.py
@@ -30,7 +30,7 @@ import six
 import testscenarios
 import testtools
 
-from neutron.tests.api.contrib import clients
+from neutron.tests.api import clients
 from neutron.tests.tempest.common import credentials
 import neutron.tests.tempest.common.generator.valid_generator as valid
 from neutron.tests.tempest import config
diff --git a/tools/copy_api_tests_from_tempest.sh b/tools/copy_api_tests_from_tempest.sh
index 88c53f25f..6a3b9f209 100755
--- a/tools/copy_api_tests_from_tempest.sh
+++ b/tools/copy_api_tests_from_tempest.sh
@@ -19,14 +19,12 @@ if [ ! -f "$TEMPEST_PATH/run_tempest.sh" ]; then
   exit 1
 fi
 
-NEUTRON_PATH=${NEUTRON_PATH:-$(cd $(dirname "$0")/.. && pwd)}
+NEUTRON_PATH=${NEUTRON_PATH:-$(cd "$(dirname "$0")/.." && pwd)}
 NEUTRON_TEST_PATH=$NEUTRON_PATH/neutron/tests
 
 function copy_files {
     local tempest_dep_paths=(
         'tempest'
-        'tempest/api/network'
-        'tempest/api/network/admin'
         'tempest/common'
         'tempest/common/generator'
         'tempest/common/utils'
@@ -42,34 +40,38 @@ function copy_files {
     for tempest_dep_path in ${tempest_dep_paths[@]}; do
         local target_path=$NEUTRON_TEST_PATH/$tempest_dep_path
         if [[ ! -d "$target_path" ]]; then
-            mkdir -p $target_path
+            mkdir -p "$target_path"
         fi
-        cp $TEMPEST_PATH/$tempest_dep_path/*.py $target_path
+        cp $TEMPEST_PATH/$tempest_dep_path/*.py "$target_path"
     done
-    touch $NEUTRON_TEST_PATH/tempest/api/__init__.py
-
     local paths_to_remove=(
         "$NEUTRON_TEST_PATH/tempest/clients.py"
     )
     for path_to_remove in ${paths_to_remove[@]}; do
         if [ -f "$path_to_remove" ]; then
-            rm ${path_to_remove}
+            rm "$path_to_remove"
         fi
     done
+
+    # Tests are now maintained in neutron/tests/api
+    cp $TEMPEST_PATH/tempest/api/network/*.py $NEUTRON_TEST_PATH/api
+    cp $TEMPEST_PATH/tempest/api/network/admin/*.py \
+        $NEUTRON_TEST_PATH/api/admin
 }
 
 function rewrite_imports {
     regexes=(
         's/tempest.common.generator/neutron.tests.tempest.common.generator/'
+        "s/tempest.api.network/neutron.tests.api/"
         's/tempest.test/neutron.tests.tempest.test/'
         's/from tempest.openstack.common import lockutils/from oslo_concurrency import lockutils/'
         's/from tempest.openstack.common import importutils/from oslo_utils import importutils/'
         's/tempest.openstack.common/neutron.openstack.common/'
-        's/from tempest(?!_lib) import clients/from neutron.tests.api.contrib import clients/'
+        's/from tempest(?!_lib) import clients/from neutron.tests.api import clients/'
         's/from tempest(?!_lib)/from neutron.tests.tempest/'
         's/CONF.lock_path/CONF.oslo_concurrency.lock_path/'
     )
-    files=$(find $NEUTRON_TEST_PATH/tempest -name '*.py')
+    files=$(find "$NEUTRON_TEST_PATH/tempest" "$NEUTRON_TEST_PATH/api" -name '*.py')
     for ((i = 0; i < ${#regexes[@]}; i++)); do
         perl -p -i -e "${regexes[$i]}" $files
     done