Skip to content

Commit e33ae46

Browse files
TerryHoweTerryHowe
committed
Add query params to all the proxy list calls
Change-Id: Ib2baa319593dae81206695c15c02574b24b17473
1 parent 900ce11 commit e33ae46

15 files changed

Lines changed: 287 additions & 126 deletions

File tree

‎openstack/compute/v2/_proxy.py‎

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,16 @@ def find_extension(self, name_or_id, ignore_missing=True):
3939
return extension.Extension.find(self.session, name_or_id,
4040
ignore_missing=ignore_missing)
4141

42-
def extensions(self):
42+
def extensions(self, **query):
4343
"""Retrieve a generator of extensions
4444
45+
:param kwargs \*\*query: Optional query parameters to be sent to limit
46+
the resources being returned.
47+
4548
:returns: A generator of extension instances.
4649
:rtype: :class:`~openstack.compute.v2.extension.Extension`
4750
"""
48-
return self._list(extension.Extension, paginated=False)
51+
return self._list(extension.Extension, paginated=False, **query)
4952

5053
def find_flavor(self, name_or_id, ignore_missing=True):
5154
"""Find a single flavor
@@ -177,7 +180,7 @@ def images(self, details=True, **query):
177180
otherwise :class:`~openstack.compute.v2.image.Image`.
178181
*Default: ``True``*
179182
:param kwargs \*\*query: Optional query parameters to be sent to limit
180-
the flavors being returned.
183+
the resources being returned.
181184
182185
:returns: A generator of image objects
183186
"""
@@ -237,13 +240,16 @@ def find_keypair(self, name_or_id, ignore_missing=True):
237240
return keypair.Keypair.find(self.session, name_or_id,
238241
ignore_missing=ignore_missing)
239242

240-
def keypairs(self):
243+
def keypairs(self, **query):
241244
"""Return a generator of keypairs
242245
246+
:param kwargs \*\*query: Optional query parameters to be sent to limit
247+
the resources being returned.
248+
243249
:returns: A generator of keypair objects
244250
:rtype: :class:`~openstack.compute.v2.keypair.Keypair`
245251
"""
246-
return self._list(keypair.Keypair, paginated=False)
252+
return self._list(keypair.Keypair, paginated=False, **query)
247253

248254
def update_keypair(self, value, **attrs):
249255
"""Update a keypair
@@ -363,8 +369,7 @@ def servers(self, details=True, **query):
363369
# Server expects changes-since, but we use an underscore
364370
# so it can be a proper Python name.
365371
if "changes_since" in query:
366-
val = query.pop("changes_since")
367-
query["changes-since"] = val
372+
query["changes-since"] = query.pop("changes_since")
368373

369374
return self._list(srv, paginated=True, **query)
370375

@@ -444,13 +449,17 @@ def get_server_interface(self, value):
444449
"""
445450
return self._get(server_interface.ServerInterface, value)
446451

447-
def server_interfaces(self):
452+
def server_interfaces(self, **query):
448453
"""Return a generator of server interfaces
449454
455+
:param kwargs \*\*query: Optional query parameters to be sent to limit
456+
the resources being returned.
457+
450458
:returns: A generator of ServerInterface objects
451459
:rtype: :class:`~openstack.compute.v2.server_interface.ServerInterface`
452460
"""
453-
return self._list(server_interface.ServerInterface, paginated=False)
461+
return self._list(server_interface.ServerInterface, paginated=False,
462+
**query)
454463

455464
def update_server_interface(self, value, **attrs):
456465
"""Update a server interface
@@ -481,10 +490,13 @@ def find_server_ip(self, name_or_id, ignore_missing=True):
481490
return server_ip.ServerIP.find(self.session, name_or_id,
482491
ignore_missing=ignore_missing)
483492

484-
def server_ips(self):
493+
def server_ips(self, **query):
485494
"""Return a generator of server IPs
486495
496+
:param kwargs \*\*query: Optional query parameters to be sent to limit
497+
the resources being returned.
498+
487499
:returns: A generator of ServerIP objects
488500
:rtype: :class:`~openstack.compute.v2.server_ip.ServerIP`
489501
"""
490-
return self._list(server_ip.ServerIP, paginated=False)
502+
return self._list(server_ip.ServerIP, paginated=False, **query)

‎openstack/database/v1/_proxy.py‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,16 @@ def find_database(self, name_or_id, ignore_missing=True):
6060
return database.Database.find(self.session, name_or_id,
6161
ignore_missing=ignore_missing)
6262

63-
def databases(self):
63+
def databases(self, **query):
6464
"""Return a generator of databases
6565
66+
:param kwargs \*\*query: Optional query parameters to be sent to limit
67+
the resources being returned.
68+
6669
:returns: A generator of database objects
6770
:rtype: :class:`~openstack.database.v1.database.Database`
6871
"""
69-
return self._list(database.Database, paginated=False)
72+
return self._list(database.Database, paginated=False, **query)
7073

7174
def get_database(self, value):
7275
"""Get a single database
@@ -107,13 +110,16 @@ def get_flavor(self, value):
107110
"""
108111
return self._get(flavor.Flavor, value)
109112

110-
def flavors(self):
113+
def flavors(self, **query):
111114
"""Return a generator of flavors
112115
116+
:param kwargs \*\*query: Optional query parameters to be sent to limit
117+
the resources being returned.
118+
113119
:returns: A generator of flavor objects
114120
:rtype: :class:`~openstack.database.v1.flavor.Flavor`
115121
"""
116-
return self._list(flavor.Flavor, paginated=False)
122+
return self._list(flavor.Flavor, paginated=False, **query)
117123

118124
def create_instance(self, **attrs):
119125
"""Create a new instance from attributes
@@ -169,13 +175,16 @@ def get_instance(self, value):
169175
"""
170176
return self._get(instance.Instance, value)
171177

172-
def instances(self):
178+
def instances(self, **query):
173179
"""Return a generator of instances
174180
181+
:param kwargs \*\*query: Optional query parameters to be sent to limit
182+
the resources being returned.
183+
175184
:returns: A generator of instance objects
176185
:rtype: :class:`~openstack.database.v1.instance.Instance`
177186
"""
178-
return self._list(instance.Instance, paginated=False)
187+
return self._list(instance.Instance, paginated=False, **query)
179188

180189
def update_instance(self, value, **attrs):
181190
"""Update a instance
@@ -232,13 +241,16 @@ def find_user(self, name_or_id, ignore_missing=True):
232241
return user.User.find(self.session, name_or_id,
233242
ignore_missing=ignore_missing)
234243

235-
def users(self):
244+
def users(self, **query):
236245
"""Return a generator of users
237246
247+
:param kwargs \*\*query: Optional query parameters to be sent to limit
248+
the resources being returned.
249+
238250
:returns: A generator of user objects
239251
:rtype: :class:`~openstack.database.v1.user.User`
240252
"""
241-
return self._list(user.User, paginated=False)
253+
return self._list(user.User, paginated=False, **query)
242254

243255
def get_user(self, value):
244256
"""Get a single user

‎openstack/identity/v2/_proxy.py‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,16 @@ def get_role(self, value):
7171
"""
7272
return self._get(role.Role, value)
7373

74-
def roles(self):
74+
def roles(self, **query):
7575
"""Retrieve a generator of roles
7676
77+
:param kwargs \*\*query: Optional query parameters to be sent to limit
78+
the resources being returned.
79+
7780
:returns: A generator of role instances.
7881
:rtype: :class:`~openstack.identity.v2.role.Role`
7982
"""
80-
return self._list(role.Role, paginated=True)
83+
return self._list(role.Role, paginated=True, **query)
8184

8285
def update_role(self, value, **attrs):
8386
"""Update a role
@@ -145,13 +148,16 @@ def get_tenant(self, value):
145148
"""
146149
return self._get(tenant.Tenant, value)
147150

148-
def tenants(self):
151+
def tenants(self, **query):
149152
"""Retrieve a generator of tenants
150153
154+
:param kwargs \*\*query: Optional query parameters to be sent to limit
155+
the resources being returned.
156+
151157
:returns: A generator of tenant instances.
152158
:rtype: :class:`~openstack.identity.v2.tenant.Tenant`
153159
"""
154-
return self._list(tenant.Tenant, paginated=True)
160+
return self._list(tenant.Tenant, paginated=True, **query)
155161

156162
def update_tenant(self, value, **attrs):
157163
"""Update a tenant
@@ -219,13 +225,16 @@ def get_user(self, value):
219225
"""
220226
return self._get(user.User, value)
221227

222-
def users(self):
228+
def users(self, **query):
223229
"""Retrieve a generator of users
224230
231+
:param kwargs \*\*query: Optional query parameters to be sent to limit
232+
the resources being returned.
233+
225234
:returns: A generator of user instances.
226235
:rtype: :class:`~openstack.identity.v2.user.User`
227236
"""
228-
return self._list(user.User, paginated=True)
237+
return self._list(user.User, paginated=True, **query)
229238

230239
def update_user(self, value, **attrs):
231240
"""Update a user

0 commit comments

Comments
 (0)