summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorBrian Waldon <brian.waldon@rackspace.com>2011-12-23 10:20:37 -0500
committerBrian Waldon <brian.waldon@rackspace.com>2011-12-26 17:36:50 -0500
commit5682d2a27b252c1aca294eb8a0749ff3fbb13b26 (patch)
tree9a78bdc5e178c7277f4c1e772f79f64db974b39b /nova/tests
parent686ec45dfd9dc7b1a830ec32accd3b68ab7adbbe (diff)
Convering /users to admin extension
Relates to blueprint separate-nova-adminapi Change-Id: I0ef13569586be022ba533c4e850793b37b098fea
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/api/openstack/v2/contrib/test_users.py (renamed from nova/tests/api/openstack/v2/test_users.py)6
-rw-r--r--nova/tests/api/openstack/v2/test_extensions.py1
2 files changed, 4 insertions, 3 deletions
diff --git a/nova/tests/api/openstack/v2/test_users.py b/nova/tests/api/openstack/v2/contrib/test_users.py
index b6af802f8..24a14e250 100644
--- a/nova/tests/api/openstack/v2/test_users.py
+++ b/nova/tests/api/openstack/v2/contrib/test_users.py
@@ -15,11 +15,11 @@
from lxml import etree
-from nova import test
-from nova import utils
-from nova.api.openstack.v2 import users
+from nova.api.openstack.v2.contrib import users
from nova.auth.manager import User, Project
+from nova import test
from nova.tests.api.openstack import fakes
+from nova import utils
def fake_init(self):
diff --git a/nova/tests/api/openstack/v2/test_extensions.py b/nova/tests/api/openstack/v2/test_extensions.py
index 7b9a46a93..ad017e665 100644
--- a/nova/tests/api/openstack/v2/test_extensions.py
+++ b/nova/tests/api/openstack/v2/test_extensions.py
@@ -118,6 +118,7 @@ class ExtensionControllerTest(ExtensionTestCase):
"ServerActionList",
"ServerDiagnostics",
"SimpleTenantUsage",
+ "Users",
"VSAs",
"VirtualInterfaces",
"Volumes",