diff --git a/openstack/keystore/v1/_proxy.py b/openstack/keystore/v1/_proxy.py index 73149f97..03b3854b 100644 --- a/openstack/keystore/v1/_proxy.py +++ b/openstack/keystore/v1/_proxy.py @@ -21,8 +21,20 @@ class Proxy(proxy.BaseProxy): def create_container(self, **data): return container.Container(data).create(self.session) - def delete_container(self, **data): - container.Container(data).delete(self.session) + def delete_container(self, value, ignore_missing=True): + """Delete a container + + :param value: The value can be either the ID of a container or a + :class:`~openstack.keystore.v2.container.Container` instance. + :param bool ignore_missing: When set to ``False`` + :class:`~openstack.exceptions.ResourceNotFound` will be + raised when the container does not exist. + When set to ``True``, no exception will be set when + attempting to delete a nonexistent server. + + :returns: ``None`` + """ + self._delete(container.Container, value, ignore_missing) def find_container(self, name_or_id): return container.Container.find(self.session, name_or_id) @@ -39,8 +51,20 @@ class Proxy(proxy.BaseProxy): def create_order(self, **data): return order.Order(data).create(self.session) - def delete_order(self, **data): - order.Order(data).delete(self.session) + def delete_order(self, value, ignore_missing=True): + """Delete an order + + :param value: The value can be either the ID of a order or a + :class:`~openstack.keystore.v2.order.Order` instance. + :param bool ignore_missing: When set to ``False`` + :class:`~openstack.exceptions.ResourceNotFound` will be + raised when the order does not exist. + When set to ``True``, no exception will be set when + attempting to delete a nonexistent server. + + :returns: ``None`` + """ + self._delete(order.Order, value, ignore_missing) def find_order(self, name_or_id): return order.Order.find(self.session, name_or_id) @@ -57,8 +81,20 @@ class Proxy(proxy.BaseProxy): def create_secret(self, **data): return secret.Secret(data).create(self.session) - def delete_secret(self, **data): - secret.Secret(data).delete(self.session) + def delete_secret(self, value, ignore_missing=True): + """Delete a secret + + :param value: The value can be either the ID of a secret or a + :class:`~openstack.keystore.v2.secret.Secret` instance. + :param bool ignore_missing: When set to ``False`` + :class:`~openstack.exceptions.ResourceNotFound` will be + raised when the secret does not exist. + When set to ``True``, no exception will be set when + attempting to delete a nonexistent server. + + :returns: ``None`` + """ + self._delete(secret.Secret, value, ignore_missing) def find_secret(self, name_or_id): return secret.Secret.find(self.session, name_or_id) diff --git a/openstack/tests/unit/keystore/v1/test_proxy.py b/openstack/tests/unit/keystore/v1/test_proxy.py index f4eccce3..ccb2ab29 100644 --- a/openstack/tests/unit/keystore/v1/test_proxy.py +++ b/openstack/tests/unit/keystore/v1/test_proxy.py @@ -11,6 +11,9 @@ # under the License. from openstack.keystore.v1 import _proxy +from openstack.keystore.v1 import container +from openstack.keystore.v1 import order +from openstack.keystore.v1 import secret from openstack.tests.unit import test_proxy_base @@ -24,8 +27,12 @@ class TestKeystoreProxy(test_proxy_base.TestProxyBase): self.proxy.create_container) def test_container_delete(self): - self.verify_delete('openstack.keystore.v1.container.Container.delete', - self.proxy.delete_container) + self.verify_delete2(container.Container, + self.proxy.delete_container, False) + + def test_container_delete_ignore(self): + self.verify_delete2(container.Container, + self.proxy.delete_container, True) def test_container_find(self): self.verify_find('openstack.keystore.v1.container.Container.find', @@ -48,8 +55,10 @@ class TestKeystoreProxy(test_proxy_base.TestProxyBase): self.proxy.create_order) def test_order_delete(self): - self.verify_delete('openstack.keystore.v1.order.Order.delete', - self.proxy.delete_order) + self.verify_delete2(order.Order, self.proxy.delete_order, False) + + def test_order_delete_ignore(self): + self.verify_delete2(order.Order, self.proxy.delete_order, True) def test_order_find(self): self.verify_find('openstack.keystore.v1.order.Order.find', @@ -72,8 +81,10 @@ class TestKeystoreProxy(test_proxy_base.TestProxyBase): self.proxy.create_secret) def test_secret_delete(self): - self.verify_delete('openstack.keystore.v1.secret.Secret.delete', - self.proxy.delete_secret) + self.verify_delete2(secret.Secret, self.proxy.delete_secret, False) + + def test_secret_delete_ignore(self): + self.verify_delete2(secret.Secret, self.proxy.delete_secret, True) def test_secret_find(self): self.verify_find('openstack.keystore.v1.secret.Secret.find',