Move orphaned api test - deux

According to changes [1,2], API tests' new home is under neutron/tests/api.
Change 92d2054f8a slipped through the cracks. It seems also that wrong
imports lead to tests silently dropped (i.e. not executed). This patch
rectifies the issue.

 [1] https://review.openstack.org/#/c/169850/
 [2] https://review.openstack.org/#/c/167320/

Change-Id: I64be376d7cff9512bd027720116dc039831e7955

diff --git a/neutron/tests/api/admin/test_shared_network_extension.py b/neutron/tests/api/admin/test_shared_network_extension.py
index 7cb5798e3d117855c79d35b0eb3acc1b76603d50..2d8889a433cded8dd7083bc5369a010a329955be 100644 (file)
--- a/neutron/tests/api/admin/test_shared_network_extension.py
+++ b/neutron/tests/api/admin/test_shared_network_extension.py
@@ -14,7 +14,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 config
 from neutron.tests.tempest import test
 from tempest_lib.common.utils import data_utils

diff --git a/neutron/tests/tempest/api/network/test_subnetpools.py b/neutron/tests/api/test_subnetpools.py
similarity index 98%
rename from neutron/tests/tempest/api/network/test_subnetpools.py
rename to neutron/tests/api/test_subnetpools.py
index 51e846e5a0ff0ec0d82bc9c419863ee55c32f8d9..9acc38892823bc7d72a190c801943e9774f5bd28 100644 (file)
--- a/neutron/tests/tempest/api/network/test_subnetpools.py
+++ b/neutron/tests/api/test_subnetpools.py
@@ -17,8 +17,8 @@ import copy
 
 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/test_subnetpools_negative.py b/neutron/tests/api/test_subnetpools_negative.py
similarity index 98%
rename from neutron/tests/tempest/api/network/test_subnetpools_negative.py
rename to neutron/tests/api/test_subnetpools_negative.py
index 5f66138bb3475f4a5ffea476f55ca565655864ae..52424499a0e76ad233a8868dff180a7ed10e3ab3 100644 (file)
--- a/neutron/tests/tempest/api/network/test_subnetpools_negative.py
+++ b/neutron/tests/api/test_subnetpools_negative.py
@@ -18,8 +18,8 @@ import copy
 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.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