Removing broken & redundant code (bug 933555)

Change-Id: I6618487885bcb930a28373bc86d07c537f7a1fe1
openstack · Feb 22, 2012 · 510061e · 510061e
1 parent 9742dc0
commit 510061e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/keystone/service.py b/keystone/service.py
@@ -345,17 +345,8 @@ def delete_token(self, context, token_id):
         self.token_api.delete_token(context=context, token_id=token_id)
 
     def endpoints(self, context, token_id):
-        """Return service catalog endpoints."""
-        try:
-            token_ref = self.token_api.get_token(context=context,
-                                                 token_id=token_id)
-        except exception.NotFound:
-            raise exception.Unauthorized()
-
-        catalog_ref = self.catalog_api.get_catalog(context,
-                                                   token_ref['user']['id'],
-                                                   token_ref['tenant']['id'])
-        return {'token': {'serviceCatalog': self._format_catalog(catalog_ref)}}
+        """Return a list of endpoints available to the token."""
+        raise NotImplementedError()
 
     def _format_authenticate(self, token_ref, roles_ref, catalog_ref):
         o = self._format_token(token_ref, roles_ref)

diff --git a/tests/test_keystoneclient.py b/tests/test_keystoneclient.py
@@ -177,6 +177,8 @@ def test_authenticate_no_username(self):
 
     # TODO(termie): I'm not really sure that this is testing much
     def test_endpoints(self):
+        raise nose.exc.SkipTest('Not implemented due to bug 933555')
+
         client = self.get_client(admin=True)
         token = client.auth_token
         endpoints = client.tokens.endpoints(token=token)