fix errors on role and validate

Author: abaez

consulate/api/acl.py

@@ -135,10 +135,10 @@ def create_role(self,
         return self._put_response_body(
             ["role"], {},
             dict(
-                model.ACLPolicy(name=name,
-                                description=description,
-                                policies=policies,
-                                service_identities=service_identities)))
+                model.ACLRole(name=name,
+                              description=description,
+                              policies=policies,
+                              service_identities=service_identities)))
 
     def update_role(self,
                     id,
@@ -159,10 +159,10 @@ def update_role(self,
         return self._put_response_body(
             ["role", id], {},
             dict(
-                model.ACLPolicy(name=name,
-                                description=description,
-                                policies=policies,
-                                service_identities=service_identities)))
+                model.ACLRole(name=name,
+                              description=description,
+                              policies=policies,
+                              service_identities=service_identities)))
 
     def delete_role(self, id):
         """Delete an existing role with the given ID.

consulate/models/acl.py

@@ -8,26 +8,22 @@
 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.
+    :param list value: An array of PolicyLink or RoleLink.
     :param rtype: bool
 
     """
-    return all(['ID' in link or 'Name' in link
-                for link in value]) and not model.args
+    return all(['ID' in link or 'Name' in link for link in value])
 
 
 def _validate_service_identities(value, model):
     """ Validate service_identities is formatted correctly.
 
-    :param list(dict()) value: A ServiceIdentity list
+    :param ServiceIdentities value: A ServiceIdentity list
     :param rtype: bool
 
     """
     return all(
-        ['ServiceName' in service_identity
-         for service_identity in value]) and not model.args
+        ['ServiceName' in service_identity for service_identity in value])
 
 
 class ACLPolicy(base.Model):

tests/acl_tests.py

@@ -37,17 +37,17 @@
 """
 
 POLICYLINKS_SAMPLE = [
-    dict(ID="783beef3-783f-f41f-7422-7087dc272765"),
+    dict(Name="policylink_sample"),
 ]
 
 POLICYLINKS_UPDATE_SAMPLE = [
-    dict(ID="783beef3-783f-f41f-7422-7087dc272765"),
-    dict(Name="some_policy_name")
+    dict(Name="policylink_sample"),
+    dict(Name="policylink_update_sample")
 ]
 
 SERVICE_IDENTITIES_SAMPLE = [dict(ServiceName="db", Datacenters=["dc1"])]
 
-ROLELINKS_SAMPLE = [dict(Name="some_role_name")]
+ROLELINKS_SAMPLE = [dict(Name="role_sample")]
 
 
 class TestCase(base.TestCase):

tests/base.py

@@ -52,11 +52,11 @@ def tearDown(self):
         for name in services:
             self.consul.agent.service.deregister(services[name]['ID'])
 
-        for acl in self.consul.acl.list():
-            if acl['ID'] == CONSUL_CONFIG['acl']['tokens']['master']:
+        for acl in self.consul.acl.list_tokens():
+            if acl['AccessorID'] == CONSUL_CONFIG['acl']['tokens']['master']:
                 continue
             try:
-                uuid.UUID(acl['ID'])
-                self.consul.acl.destroy(acl['ID'])
+                uuid.UUID(acl['AccessorID'])
+                self.consul.acl.delete_token(acl['AccessorID'])
             except (ValueError, exceptions.ConsulateException):
                 pass