add a space for acl function descriptions

Author: abaez

consulate/api/acl.py

@@ -26,13 +26,15 @@ class ACL(base.Endpoint):
     """
     def list_policies(self):
         """List all ACL policies available in cluster.
+
         :param rtype: list
 
         """
         return self._get(["policies"])
 
     def read_policy(self, id):
         """Read an existing policy with the given ID.
+
         :param str id: The ID of the policy.
         :param rtype: dict
 
@@ -68,6 +70,7 @@ def update_policy(self,
                       description=None,
                       rules=None):
         """Update policy with id given.
+
         :param str id: A UUID for the policy to update.
         :param str name: name of the policy
         :param list() datacenters: A list of datacenters to filter on policy.
@@ -86,6 +89,7 @@ def update_policy(self,
 
     def delete_policy(self, id):
         """Delete an existing policy with the given ID.
+
         :param str id: The ID of the policy.
         :param rtype: bool
 
@@ -101,6 +105,7 @@ def list_roles(self):
 
     def read_role(self, id=None, name=None):
         """Read an existing role with the given ID or Name.
+
         :param str id: The ID of the role.
         :param str name: The name of the role.
         :param rtype: dict
@@ -119,6 +124,7 @@ def create_role(self,
                     policies=None,
                     service_identities=None):
         """Create an ACL role from a list of policies or service identities.
+
         :param str name: The name of the ACL role. Must be unique.
         :param str description: The description of the ACL role.
         :param PolicyLinks policies: An array of PolicyLink.
@@ -141,6 +147,7 @@ def update_role(self,
                     policies=None,
                     service_identities=None):
         """Update role with id given.
+
         :param str id: A UUID for the policy to update.
         :param str name: name of the policy
         :param list() datacenters: A list of datacenters to filter on policy.
@@ -159,6 +166,7 @@ def update_role(self,
 
     def delete_role(self, id):
         """Delete an existing role with the given ID.
+
         :param str id: The ID of the role.
         :param rtype: bool
 
@@ -167,13 +175,15 @@ def delete_role(self, id):
 
     def list_tokens(self):
         """List all ACL tokens available in cluster.
+
         :param rtype: list
 
         """
         return self._get(["tokens"])
 
     def read_token(self, accessor_id):
         """Read an existing token with the given ID.
+
         :param str id: The ID of the role.
         :param rtype: dict
 
@@ -182,6 +192,7 @@ def read_token(self, accessor_id):
 
     def read_self_token(self):
         """Retrieve the currently used token.
+
         :param rtype: dict
 
         """
@@ -199,6 +210,7 @@ def create_token(self,
                      service_identities=None):
         """Create a token from the roles, policies, and service identities
         provided.
+
         :param str accessor_id: A UUID for accessing the token.
         :param str description: A human-readable description of the token.
         :param str expiration_time: The amount of time till the token expires.
@@ -225,6 +237,15 @@ def create_token(self,
                                roles=roles,
                                service_identities=service_identities)))
 
+    def delete_token(self, accessor_id):
+        """Delete an existing token with the given AcccessorID.
+
+        :param str id: The AccessorID of the token.
+        :param rtype: bool
+
+        """
+        return self._delete(["token", accessor_id])
+
     # NOTE: Everything below here is deprecated post consul-1.4.0.
 
     def bootstrap(self):

consulate/models/acl.py

@@ -7,6 +7,7 @@
 
 def _validate_link_array(value, model):
     """ Validate the policies or roles links are formatted correctly.
+
     :param list(dict()) value: An array of PolicyLink or RoleLink.
     :param rtype: bool
     :param consulate.models.agent.Check model: The model instance.
@@ -19,6 +20,7 @@ def _validate_link_array(value, model):
 
 def _validate_service_identities(value, model):
     """ Validate service_identities is formatted correctly.
+
     :param list(dict()) value: A ServiceIdentity list
     :param rtype: bool