openstack/openstacksdk
Code Issues Proposed changes

Fix proxy delete error

Browse Source 
I discovered with the functional tests that the delete proxy
was broken.  It should pass ignore_missing as a keyword argument
rather than positional.

Change-Id: I9281f5477a42428b301b2af019bb5ccc2684100d
This commit is contained in:
TerryHowe 2015-05-29 09:04:47 -06:00 committed by Terry Howe
parent 8793800fa5
commit aeeae00445
12 changed files with 68 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openstack/compute/v2/_proxy.py
View File

@ -74,7 +74,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(flavor.Flavor, value, ignore_missing)
self._delete(flavor.Flavor, value, ignore_missing=ignore_missing)
def get_flavor(self, value):
"""Get a single flavor
@ -129,7 +129,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(image.Image, value, ignore_missing)
self._delete(image.Image, value, ignore_missing=ignore_missing)
def find_image(self, name_or_id):
"""Find a single image
@ -191,7 +191,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(keypair.Keypair, value, ignore_missing)
self._delete(keypair.Keypair, value, ignore_missing=ignore_missing)
def get_keypair(self, value):
"""Get a single keypair
@ -269,7 +269,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(server.Server, value, ignore_missing)
self._delete(server.Server, value, ignore_missing=ignore_missing)
def find_server(self, name_or_id):
"""Find a single server
@ -382,7 +382,8 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(server_interface.ServerInterface, value, ignore_missing)
self._delete(server_interface.ServerInterface, value,
ignore_missing=ignore_missing)
def find_server_interface(self, name_or_id):
"""Find a single server interface

6
openstack/database/v1/_proxy.py
View File

@ -44,7 +44,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(database.Database, value, ignore_missing)
self._delete(database.Database, value, ignore_missing=ignore_missing)
def find_database(self, name_or_id):
"""Find a single database
@ -128,7 +128,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(instance.Instance, value, ignore_missing)
self._delete(instance.Instance, value, ignore_missing=ignore_missing)
def find_instance(self, name_or_id):
"""Find a single instance
@ -198,7 +198,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(user.User, value, ignore_missing)
self._delete(user.User, value, ignore_missing=ignore_missing)
def find_user(self, name_or_id):
"""Find a single user

6
openstack/identity/v2/_proxy.py
View File

@ -43,7 +43,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(role.Role, value, ignore_missing)
self._delete(role.Role, value, ignore_missing=ignore_missing)
def find_role(self, name_or_id):
"""Find a single role
@ -111,7 +111,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(tenant.Tenant, value, ignore_missing)
self._delete(tenant.Tenant, value, ignore_missing=ignore_missing)
def find_tenant(self, name_or_id):
"""Find a single tenant
@ -179,7 +179,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(user.User, value, ignore_missing)
self._delete(user.User, value, ignore_missing=ignore_missing)
def find_user(self, name_or_id):
"""Find a single user

31
openstack/identity/v3/_proxy.py
View File

@ -49,7 +49,8 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(credential.Credential, value, ignore_missing)
self._delete(credential.Credential, value,
ignore_missing=ignore_missing)
def find_credential(self, name_or_id):
"""Find a single credential
@ -120,7 +121,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(domain.Domain, value, ignore_missing)
self._delete(domain.Domain, value, ignore_missing=ignore_missing)
def find_domain(self, name_or_id):
"""Find a single domain
@ -188,7 +189,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(endpoint.Endpoint, value, ignore_missing)
self._delete(endpoint.Endpoint, value, ignore_missing=ignore_missing)
def find_endpoint(self, name_or_id):
"""Find a single endpoint
@ -258,7 +259,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(group.Group, value, ignore_missing)
self._delete(group.Group, value, ignore_missing=ignore_missing)
def find_group(self, name_or_id):
"""Find a single group
@ -327,7 +328,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(policy.Policy, value, ignore_missing)
self._delete(policy.Policy, value, ignore_missing=ignore_missing)
def find_policy(self, name_or_id):
"""Find a single policy
@ -395,7 +396,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(project.Project, value, ignore_missing)
self._delete(project.Project, value, ignore_missing=ignore_missing)
def find_project(self, name_or_id):
"""Find a single project
@ -463,7 +464,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(service.Service, value, ignore_missing)
self._delete(service.Service, value, ignore_missing=ignore_missing)
def find_service(self, name_or_id):
"""Find a single service
@ -531,7 +532,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(user.User, value, ignore_missing)
self._delete(user.User, value, ignore_missing=ignore_missing)
def find_user(self, name_or_id):
"""Find a single user
@ -587,7 +588,19 @@ class Proxy(proxy.BaseProxy):
return self._create(trust.Trust, **attrs)
def delete_trust(self, value, ignore_missing=True):
self._delete(trust.Trust, value, ignore_missing)
"""Delete a trust
:param value: The value can be either the ID of a trust or a
:class:`~openstack.identity.v3.trust.Trust` instance.
:param bool ignore_missing: When set to ``False``
:class:`~openstack.exceptions.ResourceNotFound` will be
raised when the credential does not exist.
When set to ``True``, no exception will be set when
attempting to delete a nonexistent credential.
:returns: ``None``
"""
self._delete(trust.Trust, value, ignore_missing=ignore_missing)
def find_trust(self, name_or_id):
"""Find a single trust

2
openstack/image/v1/_proxy.py
View File

@ -41,7 +41,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(image.Image, value, ignore_missing)
self._delete(image.Image, value, ignore_missing=ignore_missing)
def find_image(self, name_or_id):
"""Find a single image

6
openstack/image/v2/_proxy.py
View File

@ -43,7 +43,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(image.Image, value, ignore_missing)
self._delete(image.Image, value, ignore_missing=ignore_missing)
def find_image(self, name_or_id):
"""Find a single image
@ -111,7 +111,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(member.Member, value, ignore_missing)
self._delete(member.Member, value, ignore_missing=ignore_missing)
def find_member(self, name_or_id):
"""Find a single member
@ -179,4 +179,4 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(tag.Tag, value, ignore_missing)
self._delete(tag.Tag, value, ignore_missing=ignore_missing)

6
openstack/keystore/v1/_proxy.py
View File

@ -43,7 +43,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(container.Container, value, ignore_missing)
self._delete(container.Container, value, ignore_missing=ignore_missing)
def find_container(self, name_or_id):
"""Find a single container
@ -114,7 +114,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(order.Order, value, ignore_missing)
self._delete(order.Order, value, ignore_missing=ignore_missing)
def find_order(self, name_or_id):
"""Find a single order
@ -183,7 +183,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(secret.Secret, value, ignore_missing)
self._delete(secret.Secret, value, ignore_missing=ignore_missing)
def find_secret(self, name_or_id):
"""Find a single secret

34
openstack/network/v2/_proxy.py
View File

@ -73,7 +73,8 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(floating_ip.FloatingIP, value, ignore_missing)
self._delete(floating_ip.FloatingIP, value,
ignore_missing=ignore_missing)
def find_available_ip(self):
"""Find an available IP
@ -153,7 +154,8 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(health_monitor.HealthMonitor, value, ignore_missing)
self._delete(health_monitor.HealthMonitor, value,
ignore_missing=ignore_missing)
def find_health_monitor(self, name_or_id):
"""Find a single health monitor
@ -225,7 +227,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(listener.Listener, value, ignore_missing)
self._delete(listener.Listener, value, ignore_missing=ignore_missing)
def find_listener(self, name_or_id):
"""Find a single listener
@ -296,7 +298,8 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(load_balancer.LoadBalancer, value, ignore_missing)
self._delete(load_balancer.LoadBalancer, value,
ignore_missing=ignore_missing)
def find_load_balancer(self, name_or_id):
"""Find a single load balancer
@ -368,7 +371,8 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(metering_label.MeteringLabel, value, ignore_missing)
self._delete(metering_label.MeteringLabel, value,
ignore_missing=ignore_missing)
def find_metering_label(self, name_or_id):
"""Find a single metering label
@ -444,7 +448,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(metering_label_rule.MeteringLabelRule,
value, ignore_missing)
value, ignore_missing=ignore_missing)
def find_metering_label_rule(self, name_or_id):
"""Find a single metering label rule
@ -521,7 +525,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(network.Network, value, ignore_missing)
self._delete(network.Network, value, ignore_missing=ignore_missing)
def find_network(self, name_or_id):
"""Find a single network
@ -589,7 +593,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(pool.Pool, value, ignore_missing)
self._delete(pool.Pool, value, ignore_missing=ignore_missing)
def find_pool(self, name_or_id):
"""Find a single pool
@ -658,7 +662,8 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(pool_member.PoolMember, value, ignore_missing)
self._delete(pool_member.PoolMember, value,
ignore_missing=ignore_missing)
def find_pool_member(self, name_or_id):
"""Find a single pool member
@ -729,7 +734,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(port.Port, value, ignore_missing)
self._delete(port.Port, value, ignore_missing=ignore_missing)
def find_port(self, name_or_id):
"""Find a single port
@ -822,7 +827,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(router.Router, value, ignore_missing)
self._delete(router.Router, value, ignore_missing=ignore_missing)
def find_router(self, name_or_id):
"""Find a single router
@ -897,7 +902,8 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(security_group.SecurityGroup, value, ignore_missing)
self._delete(security_group.SecurityGroup, value,
ignore_missing=ignore_missing)
def find_security_group(self, name_or_id):
"""Find a single security group
@ -997,7 +1003,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(security_group_rule.SecurityGroupRule,
value, ignore_missing)
value, ignore_missing=ignore_missing)
def find_security_group_rule(self, name_or_id):
"""Find a single security group rule
@ -1073,7 +1079,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(subnet.Subnet, value, ignore_missing)
self._delete(subnet.Subnet, value, ignore_missing=ignore_missing)
def find_subnet(self, name_or_id):
"""Find a single subnet

2
openstack/orchestration/v1/_proxy.py
View File

@ -71,7 +71,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(stack.Stack, value, ignore_missing)
self._delete(stack.Stack, value, ignore_missing=ignore_missing)
def wait_for_stack(self, value, status='CREATE_COMPLETE',
failures=['CREATE_FAILED'], interval=2, wait=120):

2
openstack/telemetry/v2/_proxy.py
View File

@ -47,7 +47,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(alarm.Alarm, value, ignore_missing)
self._delete(alarm.Alarm, value, ignore_missing=ignore_missing)
def find_alarm(self, name_or_id):
"""Find a single alarm

3
openstack/tests/unit/test_proxy_base.py
View File

@ -85,7 +85,8 @@ class TestProxyBase(base.TestCase):
method,
method_args=["resource_or_id"],
method_kwargs={"ignore_missing": ignore},
expected_args=[resource, "resource_or_id", ignore])
expected_args=[resource, "resource_or_id"],
expected_kwargs={'ignore_missing': ignore})
def verify_delete3(self, resource, method, **kwargs):
print(kwargs)

6
openstack/volume/v2/_proxy.py
View File

@ -55,7 +55,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(snapshot.Snapshot, value, ignore_missing)
self._delete(snapshot.Snapshot, value, ignore_missing=ignore_missing)
def get_type(self, value):
"""Get a single type
@ -94,7 +94,7 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(type.Type, value, ignore_missing)
self._delete(type.Type, value, ignore_missing=ignore_missing)
def get_volume(self, value):
"""Get a single volume
@ -133,4 +133,4 @@ class Proxy(proxy.BaseProxy):
:returns: ``None``
"""
self._delete(volume.Volume, value, ignore_missing)
self._delete(volume.Volume, value, ignore_missing=ignore_missing)