diff --git a/tatuclient/v1/ca.py b/tatuclient/v1/ca.py index 1e23746..0602a3a 100644 --- a/tatuclient/v1/ca.py +++ b/tatuclient/v1/ca.py @@ -18,11 +18,11 @@ from tatuclient.v1.base import V1Controller class CAController(V1Controller): def create(self, auth_id): - return self._post('/noauth/authorities', data={ 'auth_id': auth_id }) + return self._post('/authorities', data={ 'auth_id': auth_id }) def list(self, criterion=None, marker=None, limit=None): - url = self.build_url('/noauth/authorities', criterion, marker, limit) + url = self.build_url('/authorities', criterion, marker, limit) return self._get(url, response_key='CAs') def get(self, auth_id): - return self._get('/noauth/authorities/%s' % auth_id) + return self._get('/authorities/%s' % auth_id) diff --git a/tatuclient/v1/cli/ca.py b/tatuclient/v1/cli/ca.py index f2c712f..e6bc1c1 100644 --- a/tatuclient/v1/cli/ca.py +++ b/tatuclient/v1/cli/ca.py @@ -25,8 +25,8 @@ from tatuclient.v1.utils import get_all LOG = logging.getLogger(__name__) -_columns = ['auth_id', 'user_pub_key', 'host_pub_key'] -_names = ['Project/CA ID', 'User Public Key', 'Host Public Key'] +_columns = ['auth_id', 'name', 'user_pub_key', 'host_pub_key'] +_names = ['Project/CA ID', 'Name', 'User Public Key', 'Host Public Key'] class ListCACommand(command.Lister): diff --git a/tatuclient/v1/cli/usercert.py b/tatuclient/v1/cli/usercert.py index 565ddb5..7fbcb8f 100644 --- a/tatuclient/v1/cli/usercert.py +++ b/tatuclient/v1/cli/usercert.py @@ -24,8 +24,8 @@ from tatuclient.v1.utils import get_all LOG = logging.getLogger(__name__) -_columns = ['serial', 'revoked', 'user_name', 'user_id', 'fingerprint', 'created_at', 'expires_at'] -_names = ['Serial Number', 'Revoked', 'User Name', 'User ID', 'Fingerprint', 'Created', 'Expires'] +_columns = ['serial', 'principals', 'revoked', 'user_name', 'user_id', 'fingerprint', 'created_at', 'expires_at'] +_names = ['Serial Number', 'Principals', 'Revoked', 'User Name', 'User ID', 'Fingerprint', 'Created', 'Expires'] class ListUserCertCommand(command.Lister): diff --git a/tatuclient/v1/host.py b/tatuclient/v1/host.py index 05eca7b..f3c3f13 100644 --- a/tatuclient/v1/host.py +++ b/tatuclient/v1/host.py @@ -18,8 +18,8 @@ from tatuclient.v1.base import V1Controller class PATController(V1Controller): def list(self, criterion=None, marker=None, limit=None): - url = self.build_url('/noauth/hosts', criterion, marker, limit) + url = self.build_url('/hosts', criterion, marker, limit) return self._get(url, response_key='pats') def get(self, host_id): - return self._get('/noauth/hosts/%s' % (host_id)) + return self._get('/hosts/%s' % (host_id)) diff --git a/tatuclient/v1/hostcert.py b/tatuclient/v1/hostcert.py index 827abd4..51a81d3 100644 --- a/tatuclient/v1/hostcert.py +++ b/tatuclient/v1/hostcert.py @@ -18,8 +18,8 @@ from tatuclient.v1.base import V1Controller class HostCertController(V1Controller): def list(self, criterion=None, marker=None, limit=None): - url = self.build_url('/noauth/hostcerts', criterion, marker, limit) + url = self.build_url('/hostcerts', criterion, marker, limit) return self._get(url, response_key='hosts') def get(self, host_id, fingerprint): - return self._get('/noauth/hostcerts/%s/%s' % (host_id, fingerprint)) + return self._get('/hostcerts/%s/%s' % (host_id, fingerprint)) diff --git a/tatuclient/v1/pat.py b/tatuclient/v1/pat.py index db77e87..cde827d 100644 --- a/tatuclient/v1/pat.py +++ b/tatuclient/v1/pat.py @@ -18,5 +18,5 @@ from tatuclient.v1.base import V1Controller class PATController(V1Controller): def list(self, criterion=None, marker=None, limit=None): - url = self.build_url('/noauth/pats', criterion, marker, limit) + url = self.build_url('/pats', criterion, marker, limit) return self._get(url, response_key='pats') diff --git a/tatuclient/v1/usercert.py b/tatuclient/v1/usercert.py index f3684f5..246e8f1 100644 --- a/tatuclient/v1/usercert.py +++ b/tatuclient/v1/usercert.py @@ -23,16 +23,16 @@ class UserCertController(V1Controller): 'auth_id': auth_id, 'pub_key': pub_key, } - return self._post('/noauth/usercerts', data=data) + return self._post('/usercerts', data=data) def list(self, criterion=None, marker=None, limit=None): - url = self.build_url('/noauth/usercerts', criterion, marker, limit) + url = self.build_url('/usercerts', criterion, marker, limit) return self._get(url, response_key='users') def get(self, serial): - return self._get('/noauth/usercerts/%s' % serial) + return self._get('/usercerts/%s' % serial) def revoke(self, auth_id, serial): - url = '/noauth/revokeduserkeys/%s' % auth_id + url = '/revokeduserkeys/%s' % auth_id data = { 'serial': serial } return self._post(url, data=data)