openstack/python-keystoneclient
Code Issues Proposed changes

Use /v3/auth/projects and /v3/auth/domains

Browse Source 
The OS-FEDERATION/projects and OS-FEDERATION/domains APIs are deprecated. We
should switch python-keystoneclient to use the correct API before they are
removed.

Change-Id: Id58a62d538e8d6f70af420bd6c98278522720466
Closes-Bug: 1590037
This commit is contained in:
Lance Bragstad
2016-06-13 21:29:25 +00:00
parent b5a39da7ce
commit 60e8f0d57f
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
keystoneclient/tests/unit/v3/saml2_fixtures.py
View File

@@ -145,7 +145,7 @@ PROJECTS = {
} }
], ],
"links": { "links": {
"self": "http://identity:35357/v3/OS-FEDERATION/projects", "self": "http://identity:35357/v3/auth/projects",
"previous": 'null', "previous": 'null',
"next": 'null' "next": 'null'
} }
@@ -164,7 +164,7 @@ DOMAINS = {
} }
], ],
"links": { "links": {
"self": "http://identity:35357/v3/OS-FEDERATION/domains", "self": "http://identity:35357/v3/auth/domains",
"previous": 'null', "previous": 'null',
"next": 'null' "next": 'null'
} }

6
keystoneclient/tests/unit/v3/test_federation.py
View File

@@ -347,7 +347,7 @@ class FederationProjectTests(utils.ClientTestCase):
self.collection_key = 'projects' self.collection_key = 'projects'
self.model = projects.Project self.model = projects.Project
self.manager = self.client.federation.projects self.manager = self.client.federation.projects
self.URL = "%s%s" % (self.TEST_URL, '/OS-FEDERATION/projects') self.URL = "%s%s" % (self.TEST_URL, '/auth/projects')
def new_ref(self, **kwargs): def new_ref(self, **kwargs):
kwargs.setdefault('id', uuid.uuid4().hex) kwargs.setdefault('id', uuid.uuid4().hex)
@@ -391,7 +391,7 @@ class K2KFederatedProjectTests(utils.TestCase):
self.session = session.Session() self.session = session.Session()
self.collection_key = 'projects' self.collection_key = 'projects'
self.model = projects.Project self.model = projects.Project
self.URL = '%s%s' % (self.SP_ROOT_URL, '/OS-FEDERATION/projects') self.URL = '%s%s' % (self.SP_ROOT_URL, '/auth/projects')
self.k2kplugin = self.get_plugin() self.k2kplugin = self.get_plugin()
self._mock_k2k_flow_urls() self._mock_k2k_flow_urls()
@@ -473,7 +473,7 @@ class FederationDomainTests(utils.ClientTestCase):
self.model = domains.Domain self.model = domains.Domain
self.manager = self.client.federation.domains self.manager = self.client.federation.domains
self.URL = "%s%s" % (self.TEST_URL, '/OS-FEDERATION/domains') self.URL = "%s%s" % (self.TEST_URL, '/auth/domains')
def new_ref(self, **kwargs): def new_ref(self, **kwargs):
kwargs.setdefault('id', uuid.uuid4().hex) kwargs.setdefault('id', uuid.uuid4().hex)

2
keystoneclient/v3/contrib/federation/base.py
View File

@@ -30,7 +30,7 @@ class EntityManager(base.Manager):
raise exceptions.MethodNotImplemented raise exceptions.MethodNotImplemented
def list(self): def list(self):
url = '/OS-FEDERATION/%s' % self.object_type url = '/auth/%s' % self.object_type
try: try:
tenant_list = self._list(url, self.object_type) tenant_list = self._list(url, self.object_type)
except exceptions.EndpointException: except exceptions.EndpointException: