Merge branch 'delete-acl' of https://github.com/smashwilson/python-cl…

…ient into smashwilson-delete-acl

objectrocket/acls.py

@@ -7,6 +7,7 @@
 
 from objectrocket import bases
 from objectrocket import util
+from objectrocket import errors
 
 logger = logging.getLogger(__name__)
 
@@ -88,6 +89,24 @@ def get(self, instance, acl):
         data = self._get_response_data(response)
         return self._concrete_acl(data)
 
+    @util.token_auto_auth
+    def delete(self, instance, acl):
+        """Delete an ACL by ID belonging to the instance specified by name.
+
+        :param str instance: The name of the instance on which the ACL exists.
+        :param str acll: The ID of the ACL to delete.
+        """
+        base_url = self._url.format(instance=instance)
+        url = '{base}{aclid}/'.format(base=base_url, aclid=acl)
+        response = requests.delete(url, **self._default_request_kwargs)
+
+        if response.status_code == 200:
+            logger.info('Successfully deleted ACL {}'.format(acl))
+        else:
+            logger.info('Failed to delete ACL {}'.format(acl))
+            logger.info('Response: [{0}] {1}'.format(response.status_code, response.content))
+            raise errors.ObjectRocketException('Failed to delete ACL.')
+
     ######################
     # Private interface. #
     ######################

tests/test_acls.py

@@ -89,6 +89,23 @@ def test_get_makes_expected_api_request(client, acl_doc):
     assert output.id == expected_acl_object.id
     assert isinstance(output, Acl)
 
+# Tests for delete. #
+@responses.activate
+def test_delete_makes_expected_api_request(client, acl):
+    instance_name = 'test_instance'
+    expected_url = 'http://localhost:5050/v2/instances/{}/acls/{}/'.format(
+        instance_name,
+        acl.id
+    )
+    responses.add(
+        responses.DELETE,
+        expected_url,
+        status=200,
+        json={'data':{}},
+        content_type="application/json",
+    )
+
+    client.acls.delete(instance_name, acl.id)
 
 #####################################
 # Tests for Acls private interface. #