Skip to content

Commit 1ea6243

Browse files
author
Brian Curtin
committed
Add find support to BaseProxy
All other actions on the Resource class that are used in Proxy subclasses had been exposed in BaseProxy except for find. This change implements a simple `_find` in the base, which brings it in line with how everything else is done, and is the last piece to get knowledge of `self.session` out of proxy calls. Additionally, while moving the proxy implementations to all be the same, it's a chance to unify the find tests in the proxy. This change eliminates the need for there to have been two test methods and makes the tests look like how they're done for every other action. Change-Id: Ibea01bed4e4ecd76d96021f78db0116012448984 Closes-Bug: 1517149
1 parent e950fd2 commit 1ea6243

23 files changed

Lines changed: 222 additions & 262 deletions

File tree

‎openstack/cluster/v1/_proxy.py‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ def find_profile(self, value, ignore_missing=True):
5858
:returns: One :class:`~openstack.cluster.v1.profile.Profile` object
5959
or None
6060
"""
61-
return profile.Profile.find(self.session, value,
62-
ignore_missing=ignore_missing)
61+
return self._find(profile.Profile, value,
62+
ignore_missing=ignore_missing)
6363

6464
def get_profile(self, value):
6565
"""Get a single profile.
@@ -149,8 +149,8 @@ def find_cluster(self, value, ignore_missing=True):
149149
:returns: One :class:`~openstack.cluster.v1.cluster.Cluster` object
150150
or None
151151
"""
152-
return cluster.Cluster.find(self.session, value,
153-
ignore_missing=ignore_missing)
152+
return self._find(cluster.Cluster, value,
153+
ignore_missing=ignore_missing)
154154

155155
def get_cluster(self, value):
156156
"""Get a single cluster.
@@ -234,8 +234,7 @@ def find_node(self, value, ignore_missing=True):
234234
:param value: The name or ID of a node.
235235
:returns: One :class:`~openstack.cluster.v1.node.Node` object or None.
236236
"""
237-
return node.Node.find(self.session, value,
238-
ignore_missing=ignore_missing)
237+
return self._find(node.Node, value, ignore_missing=ignore_missing)
239238

240239
def get_node(self, value):
241240
"""Get a single node.
@@ -326,8 +325,7 @@ def find_policy(self, value, ignore_missing=True):
326325
:returns: A policy object or None.
327326
:rtype: :class:`~openstack.cluster.v1.policy.Policy`
328327
"""
329-
return policy.Policy.find(self.session, value,
330-
ignore_missing=ignore_missing)
328+
return self._find(policy.Policy, value, ignore_missing=ignore_missing)
331329

332330
def get_policy(self, value):
333331
"""Get a single policy.

‎openstack/compute/v2/_proxy.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ def find_extension(self, name_or_id, ignore_missing=True):
3636
:returns: One :class:`~openstack.compute.v2.extension.Extension` or
3737
None
3838
"""
39-
return extension.Extension.find(self.session, name_or_id,
40-
ignore_missing=ignore_missing)
39+
return self._find(extension.Extension, name_or_id,
40+
ignore_missing=ignore_missing)
4141

4242
def extensions(self, **query):
4343
"""Retrieve a generator of extensions
@@ -61,8 +61,8 @@ def find_flavor(self, name_or_id, ignore_missing=True):
6161
attempting to find a nonexistent resource.
6262
:returns: One :class:`~openstack.compute.v2.flavor.Flavor` or None
6363
"""
64-
return flavor.Flavor.find(self.session, name_or_id,
65-
ignore_missing=ignore_missing)
64+
return self._find(flavor.Flavor, name_or_id,
65+
ignore_missing=ignore_missing)
6666

6767
def create_flavor(self, **attrs):
6868
"""Create a new flavor from attributes
@@ -157,8 +157,8 @@ def find_image(self, name_or_id, ignore_missing=True):
157157
attempting to find a nonexistent resource.
158158
:returns: One :class:`~openstack.compute.v2.image.Image` or None
159159
"""
160-
return image.Image.find(self.session, name_or_id,
161-
ignore_missing=ignore_missing)
160+
return self._find(image.Image, name_or_id,
161+
ignore_missing=ignore_missing)
162162

163163
def get_image(self, value):
164164
"""Get a single image
@@ -237,8 +237,8 @@ def find_keypair(self, name_or_id, ignore_missing=True):
237237
attempting to find a nonexistent resource.
238238
:returns: One :class:`~openstack.compute.v2.keypair.Keypair` or None
239239
"""
240-
return keypair.Keypair.find(self.session, name_or_id,
241-
ignore_missing=ignore_missing)
240+
return self._find(keypair.Keypair, name_or_id,
241+
ignore_missing=ignore_missing)
242242

243243
def keypairs(self, **query):
244244
"""Return a generator of keypairs
@@ -312,8 +312,8 @@ def find_server(self, name_or_id, ignore_missing=True):
312312
attempting to find a nonexistent resource.
313313
:returns: One :class:`~openstack.compute.v2.server.Server` or None
314314
"""
315-
return server.Server.find(self.session, name_or_id,
316-
ignore_missing=ignore_missing)
315+
return self._find(server.Server, name_or_id,
316+
ignore_missing=ignore_missing)
317317

318318
def get_server(self, value):
319319
"""Get a single server
@@ -432,8 +432,8 @@ def find_server_interface(self, name_or_id, ignore_missing=True):
432432
:returns: One :class:`~openstack.compute.v2.server_interface.
433433
ServerInterface` or None
434434
"""
435-
return server_interface.ServerInterface.find(
436-
self.session, name_or_id, ignore_missing=ignore_missing)
435+
return self._find(server_interface.ServerInterface,
436+
name_or_id, ignore_missing=ignore_missing)
437437

438438
def get_server_interface(self, value):
439439
"""Get a single server interface
@@ -487,8 +487,8 @@ def find_server_ip(self, name_or_id, ignore_missing=True):
487487
attempting to find a nonexistent resource.
488488
:returns: One :class:`~openstack.compute.v2.server_ip.ServerIP` or None
489489
"""
490-
return server_ip.ServerIP.find(self.session, name_or_id,
491-
ignore_missing=ignore_missing)
490+
return self._find(server_ip.ServerIP, name_or_id,
491+
ignore_missing=ignore_missing)
492492

493493
def server_ips(self, **query):
494494
"""Return a generator of server IPs

‎openstack/database/v1/_proxy.py‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ def find_database(self, name_or_id, ignore_missing=True):
5757
attempting to find a nonexistent resource.
5858
:returns: One :class:`~openstack.database.v1.database.Database` or None
5959
"""
60-
return database.Database.find(self.session, name_or_id,
61-
ignore_missing=ignore_missing)
60+
return self._find(database.Database, name_or_id,
61+
ignore_missing=ignore_missing)
6262

6363
def databases(self, **query):
6464
"""Return a generator of databases
@@ -95,8 +95,8 @@ def find_flavor(self, name_or_id, ignore_missing=True):
9595
attempting to find a nonexistent resource.
9696
:returns: One :class:`~openstack.database.v1.flavor.Flavor` or None
9797
"""
98-
return flavor.Flavor.find(self.session, name_or_id,
99-
ignore_missing=ignore_missing)
98+
return self._find(flavor.Flavor, name_or_id,
99+
ignore_missing=ignore_missing)
100100

101101
def get_flavor(self, value):
102102
"""Get a single flavor
@@ -159,8 +159,8 @@ def find_instance(self, name_or_id, ignore_missing=True):
159159
attempting to find a nonexistent resource.
160160
:returns: One :class:`~openstack.database.v1.instance.Instance` or None
161161
"""
162-
return instance.Instance.find(self.session, name_or_id,
163-
ignore_missing=ignore_missing)
162+
return self._find(instance.Instance, name_or_id,
163+
ignore_missing=ignore_missing)
164164

165165
def get_instance(self, value):
166166
"""Get a single instance
@@ -238,8 +238,7 @@ def find_user(self, name_or_id, ignore_missing=True):
238238
attempting to find a nonexistent resource.
239239
:returns: One :class:`~openstack.database.v1.user.User` or None
240240
"""
241-
return user.User.find(self.session, name_or_id,
242-
ignore_missing=ignore_missing)
241+
return self._find(user.User, name_or_id, ignore_missing=ignore_missing)
243242

244243
def users(self, **query):
245244
"""Return a generator of users

‎openstack/identity/v2/_proxy.py‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ def find_role(self, name_or_id, ignore_missing=True):
5656
attempting to find a nonexistent resource.
5757
:returns: One :class:`~openstack.identity.v2.role.Role` or None
5858
"""
59-
return role.Role.find(self.session, name_or_id,
60-
ignore_missing=ignore_missing)
59+
return self._find(role.Role, name_or_id, ignore_missing=ignore_missing)
6160

6261
def get_role(self, value):
6362
"""Get a single role
@@ -133,8 +132,8 @@ def find_tenant(self, name_or_id, ignore_missing=True):
133132
attempting to find a nonexistent resource.
134133
:returns: One :class:`~openstack.identity.v2.tenant.Tenant` or None
135134
"""
136-
return tenant.Tenant.find(self.session, name_or_id,
137-
ignore_missing=ignore_missing)
135+
return self._find(tenant.Tenant, name_or_id,
136+
ignore_missing=ignore_missing)
138137

139138
def get_tenant(self, value):
140139
"""Get a single tenant
@@ -210,8 +209,7 @@ def find_user(self, name_or_id, ignore_missing=True):
210209
attempting to find a nonexistent resource.
211210
:returns: One :class:`~openstack.identity.v2.user.User` or None
212211
"""
213-
return user.User.find(self.session, name_or_id,
214-
ignore_missing=ignore_missing)
212+
return self._find(user.User, name_or_id, ignore_missing=ignore_missing)
215213

216214
def get_user(self, value):
217215
"""Get a single user

‎openstack/identity/v3/_proxy.py‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ def find_credential(self, name_or_id, ignore_missing=True):
6565
:returns: One :class:`~openstack.identity.v3.credential.Credential`
6666
or None
6767
"""
68-
return credential.Credential.find(self.session, name_or_id,
69-
ignore_missing=ignore_missing)
68+
return self._find(credential.Credential, name_or_id,
69+
ignore_missing=ignore_missing)
7070

7171
def get_credential(self, value):
7272
"""Get a single credential
@@ -145,8 +145,8 @@ def find_domain(self, name_or_id, ignore_missing=True):
145145
attempting to find a nonexistent resource.
146146
:returns: One :class:`~openstack.identity.v3.domain.Domain` or None
147147
"""
148-
return domain.Domain.find(self.session, name_or_id,
149-
ignore_missing=ignore_missing)
148+
return self._find(domain.Domain, name_or_id,
149+
ignore_missing=ignore_missing)
150150

151151
def get_domain(self, value):
152152
"""Get a single domain
@@ -223,8 +223,8 @@ def find_endpoint(self, name_or_id, ignore_missing=True):
223223
attempting to find a nonexistent resource.
224224
:returns: One :class:`~openstack.identity.v3.endpoint.Endpoint` or None
225225
"""
226-
return endpoint.Endpoint.find(self.session, name_or_id,
227-
ignore_missing=ignore_missing)
226+
return self._find(endpoint.Endpoint, name_or_id,
227+
ignore_missing=ignore_missing)
228228

229229
def get_endpoint(self, value):
230230
"""Get a single endpoint
@@ -303,8 +303,8 @@ def find_group(self, name_or_id, ignore_missing=True):
303303
attempting to find a nonexistent resource.
304304
:returns: One :class:`~openstack.identity.v3.group.Group` or None
305305
"""
306-
return group.Group.find(self.session, name_or_id,
307-
ignore_missing=ignore_missing)
306+
return self._find(group.Group, name_or_id,
307+
ignore_missing=ignore_missing)
308308

309309
def get_group(self, value):
310310
"""Get a single group
@@ -382,8 +382,8 @@ def find_policy(self, name_or_id, ignore_missing=True):
382382
attempting to find a nonexistent resource.
383383
:returns: One :class:`~openstack.identity.v3.policy.Policy` or None
384384
"""
385-
return policy.Policy.find(self.session, name_or_id,
386-
ignore_missing=ignore_missing)
385+
return self._find(policy.Policy, name_or_id,
386+
ignore_missing=ignore_missing)
387387

388388
def get_policy(self, value):
389389
"""Get a single policy
@@ -460,8 +460,8 @@ def find_project(self, name_or_id, ignore_missing=True):
460460
attempting to find a nonexistent resource.
461461
:returns: One :class:`~openstack.identity.v3.project.Project` or None
462462
"""
463-
return project.Project.find(self.session, name_or_id,
464-
ignore_missing=ignore_missing)
463+
return self._find(project.Project, name_or_id,
464+
ignore_missing=ignore_missing)
465465

466466
def get_project(self, value):
467467
"""Get a single project
@@ -538,8 +538,8 @@ def find_service(self, name_or_id, ignore_missing=True):
538538
attempting to find a nonexistent resource.
539539
:returns: One :class:`~openstack.identity.v3.service.Service` or None
540540
"""
541-
return service.Service.find(self.session, name_or_id,
542-
ignore_missing=ignore_missing)
541+
return self._find(service.Service, name_or_id,
542+
ignore_missing=ignore_missing)
543543

544544
def get_service(self, value):
545545
"""Get a single service
@@ -616,8 +616,7 @@ def find_user(self, name_or_id, ignore_missing=True):
616616
attempting to find a nonexistent resource.
617617
:returns: One :class:`~openstack.identity.v3.user.User` or None
618618
"""
619-
return user.User.find(self.session, name_or_id,
620-
ignore_missing=ignore_missing)
619+
return self._find(user.User, name_or_id, ignore_missing=ignore_missing)
621620

622621
def get_user(self, value):
623622
"""Get a single user
@@ -694,8 +693,8 @@ def find_trust(self, name_or_id, ignore_missing=True):
694693
attempting to find a nonexistent resource.
695694
:returns: One :class:`~openstack.identity.v3.trust.Trust` or None
696695
"""
697-
return trust.Trust.find(self.session, name_or_id,
698-
ignore_missing=ignore_missing)
696+
return self._find(trust.Trust, name_or_id,
697+
ignore_missing=ignore_missing)
699698

700699
def get_trust(self, value):
701700
"""Get a single trust
@@ -772,8 +771,8 @@ def find_region(self, name_or_id, ignore_missing=True):
772771
attempting to find a nonexistent region.
773772
:returns: One :class:`~openstack.identity.v3.region.Region` or None
774773
"""
775-
return region.Region.find(self.session, name_or_id,
776-
ignore_missing=ignore_missing)
774+
return self._find(region.Region, name_or_id,
775+
ignore_missing=ignore_missing)
777776

778777
def get_region(self, value):
779778
"""Get a single region

‎openstack/image/v1/_proxy.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ def find_image(self, name_or_id, ignore_missing=True):
5454
attempting to find a nonexistent resource.
5555
:returns: One :class:`~openstack.image.v1.image.Image` or None
5656
"""
57-
return image.Image.find(self.session, name_or_id,
58-
ignore_missing=ignore_missing)
57+
return self._find(image.Image, name_or_id,
58+
ignore_missing=ignore_missing)
5959

6060
def get_image(self, value):
6161
"""Get a single image

‎openstack/image/v2/_proxy.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ def find_image(self, name_or_id, ignore_missing=True):
6363
attempting to find a nonexistent resource.
6464
:returns: One :class:`~openstack.image.v2.image.Image` or None
6565
"""
66-
return image.Image.find(self.session, name_or_id,
67-
ignore_missing=ignore_missing)
66+
return self._find(image.Image, name_or_id,
67+
ignore_missing=ignore_missing)
6868

6969
def get_image(self, value):
7070
"""Get a single image
@@ -140,8 +140,8 @@ def find_member(self, name_or_id, ignore_missing=True):
140140
attempting to find a nonexistent resource.
141141
:returns: One :class:`~openstack.image.v2.member.Member` or None
142142
"""
143-
return member.Member.find(self.session, name_or_id,
144-
ignore_missing=ignore_missing)
143+
return self._find(member.Member, name_or_id,
144+
ignore_missing=ignore_missing)
145145

146146
def get_member(self, value):
147147
"""Get a single member

‎openstack/key_management/v1/_proxy.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ def find_container(self, name_or_id, ignore_missing=True):
5858
:returns: One :class:`~openstack.key_management.v1.container.Container`
5959
or None
6060
"""
61-
return container.Container.find(self.session, name_or_id,
62-
ignore_missing=ignore_missing)
61+
return self._find(container.Container, name_or_id,
62+
ignore_missing=ignore_missing)
6363

6464
def get_container(self, value):
6565
"""Get a single container
@@ -138,8 +138,8 @@ def find_order(self, name_or_id, ignore_missing=True):
138138
attempting to find a nonexistent resource.
139139
:returns: One :class:`~openstack.key_management.v1.order.Order` or None
140140
"""
141-
return order.Order.find(self.session, name_or_id,
142-
ignore_missing=ignore_missing)
141+
return self._find(order.Order, name_or_id,
142+
ignore_missing=ignore_missing)
143143

144144
def get_order(self, value):
145145
"""Get a single order
@@ -219,8 +219,8 @@ def find_secret(self, name_or_id, ignore_missing=True):
219219
:returns: One :class:`~openstack.key_management.v1.secret.Secret` or
220220
None
221221
"""
222-
return secret.Secret.find(self.session, name_or_id,
223-
ignore_missing=ignore_missing)
222+
return self._find(secret.Secret, name_or_id,
223+
ignore_missing=ignore_missing)
224224

225225
def get_secret(self, value):
226226
"""Get a single secret

0 commit comments

Comments
 (0)