Merge "Delete queue"

openstack/message/v1/_proxy.py

@@ -27,3 +27,18 @@ class Proxy(proxy.BaseProxy):
         :rtype: :class:`~openstack.message.v1.queue.Queue`
         """
         return self._create(queue.Queue, **attrs)
+
+    def delete_queue(self, value, ignore_missing=True):
+        """Delete a queue
+
+        :param value: The value can be either the name of a queue or a
+                      :class:`~openstack.message.v1.queue.Queue` instance.
+        :param bool ignore_missing: When set to ``False``
+                    :class:`~openstack.exceptions.ResourceNotFound` will be
+                    raised when the queue does not exist.
+                    When set to ``True``, no exception will be set when
+                    attempting to delete a nonexistent queue.
+
+        :returns: ``None``
+        """
+        return self._delete(queue.Queue, value, ignore_missing=ignore_missing)

openstack/message/v1/queue.py

@@ -24,7 +24,7 @@ class Queue(resource.Resource):
     allow_create = True
     allow_list = False
     allow_retrieve = False
-    allow_delete = False
+    allow_delete = True
 
     @classmethod
     def create_by_id(cls, session, attrs, resource_id=None, path_args=None):

openstack/tests/unit/message/v1/test_proxy.py

@@ -27,3 +27,11 @@ class TestMessageProxy(test_proxy_base.TestProxyBase):
                             method_kwargs=kwargs,
                             expected_args=[queue.Queue],
                             expected_kwargs=kwargs)
+
+    def test_queue_delete(self):
+        self.verify_delete3(queue.Queue, self.proxy.delete_queue,
+                            ignore_missing=False)
+
+    def test_queue_delete_ignore(self):
+        self.verify_delete3(queue.Queue, self.proxy.delete_queue,
+                            ignore_missing=True)

openstack/tests/unit/message/v1/test_queue.py

@@ -32,7 +32,7 @@ class TestQueue(testtools.TestCase):
         self.assertTrue(sot.allow_create)
         self.assertFalse(sot.allow_retrieve)
         self.assertFalse(sot.allow_update)
-        self.assertFalse(sot.allow_delete)
+        self.assertTrue(sot.allow_delete)
         self.assertFalse(sot.allow_list)
 
     def test_make_it(self):