Skip to content

Commit 16b870a

Browse files
author
Brian Curtin
committed
Refactor verify_list tests
Rework the verify_list testing to put more of the guts into the implementation instead of having a lot of common things passed in arguments. Additionally, this adds an explicit pagination argument in calls to _list, which is one of the steps we need to take in properly completing the pagination calls per bug #1465756. Partial-Bug: 1465756 Change-Id: If75813d28e915f7a62c23a0059afada7fb3e575f
1 parent 21819d6 commit 16b870a

22 files changed

Lines changed: 182 additions & 241 deletions

File tree

‎openstack/database/v1/_proxy.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def databases(self):
6060
:returns: A generator of database objects
6161
:rtype: :class:`~openstack.database.v1.database.Database`
6262
"""
63-
return self._list(database.Database)
63+
return self._list(database.Database, paginated=False)
6464

6565
def get_database(self, value):
6666
"""Get a single database
@@ -101,7 +101,7 @@ def flavors(self):
101101
:returns: A generator of flavor objects
102102
:rtype: :class:`~openstack.database.v1.flavor.Flavor`
103103
"""
104-
return self._list(flavor.Flavor)
104+
return self._list(flavor.Flavor, paginated=False)
105105

106106
def create_instance(self, **attrs):
107107
"""Create a new instance from attributes
@@ -157,7 +157,7 @@ def instances(self):
157157
:returns: A generator of instance objects
158158
:rtype: :class:`~openstack.database.v1.instance.Instance`
159159
"""
160-
return self._list(instance.Instance)
160+
return self._list(instance.Instance, paginated=False)
161161

162162
def update_instance(self, value, **attrs):
163163
"""Update a instance
@@ -214,7 +214,7 @@ def users(self):
214214
:returns: A generator of user objects
215215
:rtype: :class:`~openstack.database.v1.user.User`
216216
"""
217-
return self._list(user.User)
217+
return self._list(user.User, paginated=False)
218218

219219
def get_user(self, value):
220220
"""Get a single user

‎openstack/identity/v2/_proxy.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def roles(self):
7171
:returns: A generator of role instances.
7272
:rtype: :class:`~openstack.identity.v2.role.Role`
7373
"""
74-
return self._list(role.Role)
74+
return self._list(role.Role, paginated=True)
7575

7676
def update_role(self, value, **attrs):
7777
"""Update a role
@@ -139,7 +139,7 @@ def tenants(self):
139139
:returns: A generator of tenant instances.
140140
:rtype: :class:`~openstack.identity.v2.tenant.Tenant`
141141
"""
142-
return self._list(tenant.Tenant)
142+
return self._list(tenant.Tenant, paginated=True)
143143

144144
def update_tenant(self, value, **attrs):
145145
"""Update a tenant
@@ -207,7 +207,7 @@ def users(self):
207207
:returns: A generator of user instances.
208208
:rtype: :class:`~openstack.identity.v2.user.User`
209209
"""
210-
return self._list(user.User)
210+
return self._list(user.User, paginated=True)
211211

212212
def update_user(self, value, **attrs):
213213
"""Update a user

‎openstack/identity/v3/_proxy.py‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ def credentials(self):
8080
:returns: A generator of credentials instances.
8181
:rtype: :class:`~openstack.identity.v3.credential.Credential`
8282
"""
83-
return self._list(credential.Credential)
83+
# TODO(briancurtin): This is paginated but requires base list changes.
84+
return self._list(credential.Credential, paginated=False)
8485

8586
def update_credential(self, value, **attrs):
8687
"""Update a credential
@@ -149,7 +150,8 @@ def domains(self):
149150
:returns: A generator of domain instances.
150151
:rtype: :class:`~openstack.identity.v3.domain.Domain`
151152
"""
152-
return self._list(domain.Domain)
153+
# TODO(briancurtin): This is paginated but requires base list changes.
154+
return self._list(domain.Domain, paginated=False)
153155

154156
def update_domain(self, value, **attrs):
155157
"""Update a domain
@@ -218,7 +220,8 @@ def endpoints(self):
218220
:returns: A generator of endpoint instances.
219221
:rtype: :class:`~openstack.identity.v3.endpoint.Endpoint`
220222
"""
221-
return self._list(endpoint.Endpoint)
223+
# TODO(briancurtin): This is paginated but requires base list changes.
224+
return self._list(endpoint.Endpoint, paginated=False)
222225

223226
def update_endpoint(self, value, **attrs):
224227
"""Update a endpoint
@@ -288,7 +291,8 @@ def groups(self):
288291
:returns: A generator of group instances.
289292
:rtype: :class:`~openstack.identity.v3.group.Group`
290293
"""
291-
return self._list(group.Group)
294+
# TODO(briancurtin): This is paginated but requires base list changes.
295+
return self._list(group.Group, paginated=False)
292296

293297
def update_group(self, value, **attrs):
294298
"""Update a group
@@ -356,7 +360,8 @@ def policies(self):
356360
:returns: A generator of policy instances.
357361
:rtype: :class:`~openstack.identity.v3.policy.Policy`
358362
"""
359-
return self._list(policy.Policy)
363+
# TODO(briancurtin): This is paginated but requires base list changes.
364+
return self._list(policy.Policy, paginated=False)
360365

361366
def update_policy(self, value, **attrs):
362367
"""Update a policy
@@ -424,7 +429,8 @@ def projects(self):
424429
:returns: A generator of project instances.
425430
:rtype: :class:`~openstack.identity.v3.project.Project`
426431
"""
427-
return self._list(project.Project)
432+
# TODO(briancurtin): This is paginated but requires base list changes.
433+
return self._list(project.Project, paginated=False)
428434

429435
def update_project(self, value, **attrs):
430436
"""Update a project
@@ -492,7 +498,8 @@ def services(self):
492498
:returns: A generator of service instances.
493499
:rtype: :class:`~openstack.identity.v3.service.Service`
494500
"""
495-
return self._list(service.Service)
501+
# TODO(briancurtin): This is paginated but requires base list changes.
502+
return self._list(service.Service, paginated=False)
496503

497504
def update_service(self, value, **attrs):
498505
"""Update a service
@@ -560,7 +567,8 @@ def users(self):
560567
:returns: A generator of user instances.
561568
:rtype: :class:`~openstack.identity.v3.user.User`
562569
"""
563-
return self._list(user.User)
570+
# TODO(briancurtin): This is paginated but requires base list changes.
571+
return self._list(user.User, paginated=False)
564572

565573
def update_user(self, value, **attrs):
566574
"""Update a user
@@ -628,7 +636,8 @@ def trusts(self):
628636
:returns: A generator of trust instances.
629637
:rtype: :class:`~openstack.identity.v3.trust.Trust`
630638
"""
631-
return self._list(trust.Trust)
639+
# TODO(briancurtin): This is paginated but requires base list changes.
640+
return self._list(trust.Trust, paginated=False)
632641

633642
def update_trust(self, value, **attrs):
634643
"""Update a trust

‎openstack/image/v2/_proxy.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ def members(self, **params):
139139
:returns: A generator of member objects
140140
:rtype: :class:`~openstack.image.v2.member.Member`
141141
"""
142-
return self._list(member.Member)
142+
return self._list(member.Member, paginated=False)
143143

144144
def update_member(self, value, **attrs):
145145
"""Update a member

‎openstack/keystore/v1/_proxy.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def containers(self):
7373
:returns: A generator of container objects
7474
:rtype: :class:`~openstack.keystore.v1.container.Container`
7575
"""
76-
return self._list(container.Container)
76+
return self._list(container.Container, paginated=False)
7777

7878
def update_container(self, value, **attrs):
7979
"""Update a container
@@ -143,7 +143,7 @@ def orders(self):
143143
:returns: A generator of order objects
144144
:rtype: :class:`~openstack.keystore.v1.order.Order`
145145
"""
146-
return self._list(order.Order)
146+
return self._list(order.Order, paginated=False)
147147

148148
def update_order(self, value, **attrs):
149149
"""Update a order
@@ -212,7 +212,7 @@ def secrets(self):
212212
:returns: A generator of secret objects
213213
:rtype: :class:`~openstack.keystore.v1.secret.Secret`
214214
"""
215-
return self._list(secret.Secret)
215+
return self._list(secret.Secret, paginated=False)
216216

217217
def update_secret(self, value, **attrs):
218218
"""Update a secret

‎openstack/metric/v1/_proxy.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ def capabilities(self):
2222
:returns: A generator of capability objects
2323
:rtype: :class:`~openstack.metric.v1.capabilities.Capabilities`
2424
"""
25-
return self._list(capabilities.Capabilities)
25+
return self._list(capabilities.Capabilities, paginated=False)

‎openstack/network/v2/_proxy.py‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def extensions(self):
4747
:returns: A generator of extension objects
4848
:rtype: :class:`~openstack.network.v2.extension.Extension`
4949
"""
50-
return self._list(extension.Extension)
50+
return self._list(extension.Extension, paginated=False)
5151

5252
def create_ip(self, **attrs):
5353
"""Create a new floating ip from attributes
@@ -113,7 +113,7 @@ def ips(self):
113113
:returns: A generator of floating IP objects
114114
:rtype: :class:`~openstack.network.v2.floating_ip.FloatingIP`
115115
"""
116-
return self._list(floating_ip.FloatingIP)
116+
return self._list(floating_ip.FloatingIP, paginated=False)
117117

118118
def update_ip(self, value, **attrs):
119119
"""Update a ip
@@ -187,7 +187,7 @@ def health_monitors(self):
187187
:returns: A generator of health monitor objects
188188
:rtype: :class:`~openstack.network.v2.health_monitor.HealthMonitor`
189189
"""
190-
return self._list(health_monitor.HealthMonitor)
190+
return self._list(health_monitor.HealthMonitor, paginated=False)
191191

192192
def update_health_monitor(self, value, **attrs):
193193
"""Update a health monitor
@@ -257,7 +257,7 @@ def listeners(self):
257257
:returns: A generator of listener objects
258258
:rtype: :class:`~openstack.network.v2.listener.Listener`
259259
"""
260-
return self._list(listener.Listener)
260+
return self._list(listener.Listener, paginated=False)
261261

262262
def update_listener(self, value, **attrs):
263263
"""Update a listener
@@ -330,7 +330,7 @@ def load_balancers(self):
330330
:returns: A generator of load balancer objects
331331
:rtype: :class:`~openstack.network.v2.load_balancer.LoadBalancer`
332332
"""
333-
return self._list(load_balancer.LoadBalancer)
333+
return self._list(load_balancer.LoadBalancer, paginated=False)
334334

335335
def update_load_balancer(self, value, **attrs):
336336
"""Update a load balancer
@@ -404,7 +404,7 @@ def metering_labels(self):
404404
:returns: A generator of metering label objects
405405
:rtype: :class:`~openstack.network.v2.metering_label.MeteringLabel`
406406
"""
407-
return self._list(metering_label.MeteringLabel)
407+
return self._list(metering_label.MeteringLabel, paginated=False)
408408

409409
def update_metering_label(self, value, **attrs):
410410
"""Update a metering label
@@ -483,7 +483,8 @@ def metering_label_rules(self):
483483
:rtype: :class:`~openstack.network.v2.metering_label_rule.
484484
MeteringLabelRule`
485485
"""
486-
return self._list(metering_label_rule.MeteringLabelRule)
486+
return self._list(metering_label_rule.MeteringLabelRule,
487+
paginated=False)
487488

488489
def update_metering_label_rule(self, value, **attrs):
489490
"""Update a metering label rule
@@ -554,7 +555,7 @@ def networks(self):
554555
:returns: A generator of network objects
555556
:rtype: :class:`~openstack.network.v2.network.Network`
556557
"""
557-
return self._list(network.Network)
558+
return self._list(network.Network, paginated=False)
558559

559560
def update_network(self, value, **attrs):
560561
"""Update a network
@@ -622,7 +623,7 @@ def pools(self):
622623
:returns: A generator of pool objects
623624
:rtype: :class:`~openstack.network.v2.pool.Pool`
624625
"""
625-
return self._list(pool.Pool)
626+
return self._list(pool.Pool, paginated=False)
626627

627628
def update_pool(self, value, **attrs):
628629
"""Update a pool
@@ -694,7 +695,7 @@ def pool_members(self):
694695
:returns: A generator of pool member objects
695696
:rtype: :class:`~openstack.network.v2.pool_member.PoolMember`
696697
"""
697-
return self._list(pool_member.PoolMember)
698+
return self._list(pool_member.PoolMember, paginated=False)
698699

699700
def update_pool_member(self, value, **attrs):
700701
"""Update a pool member
@@ -763,7 +764,7 @@ def ports(self):
763764
:returns: A generator of port objects
764765
:rtype: :class:`~openstack.network.v2.port.Port`
765766
"""
766-
return self._list(port.Port)
767+
return self._list(port.Port, paginated=False)
767768

768769
def update_port(self, value, **attrs):
769770
"""Update a port
@@ -801,7 +802,7 @@ def quotas(self):
801802
:returns: A generator of quota objects
802803
:rtype: :class:`~openstack.network.v2.quota.Quota`
803804
"""
804-
return self._list(quota.Quota)
805+
return self._list(quota.Quota, paginated=False)
805806

806807
def create_router(self, **attrs):
807808
"""Create a new router from attributes
@@ -856,7 +857,7 @@ def routers(self):
856857
:returns: A generator of router objects
857858
:rtype: :class:`~openstack.network.v2.router.Router`
858859
"""
859-
return self._list(router.Router)
860+
return self._list(router.Router, paginated=False)
860861

861862
def update_router(self, value, **attrs):
862863
"""Update a router
@@ -935,7 +936,7 @@ def security_groups(self):
935936
:returns: A generator of security group objects
936937
:rtype: :class:`~openstack.network.v2.security_group.SecurityGroup`
937938
"""
938-
return self._list(security_group.SecurityGroup)
939+
return self._list(security_group.SecurityGroup, paginated=False)
939940

940941
def update_security_group(self, value, **attrs):
941942
"""Update a security group
@@ -1037,7 +1038,8 @@ def security_group_rules(self):
10371038
:rtype: :class:`~openstack.network.v2.security_group_rule.
10381039
SecurityGroupRule`
10391040
"""
1040-
return self._list(security_group_rule.SecurityGroupRule)
1041+
return self._list(security_group_rule.SecurityGroupRule,
1042+
paginated=False)
10411043

10421044
def update_security_group_rule(self, value, **attrs):
10431045
"""Update a security group rule
@@ -1108,7 +1110,7 @@ def subnets(self):
11081110
:returns: A generator of subnet objects
11091111
:rtype: :class:`~openstack.network.v2.subnet.Subnet`
11101112
"""
1111-
return self._list(subnet.Subnet)
1113+
return self._list(subnet.Subnet, paginated=False)
11121114

11131115
def update_subnet(self, value, **attrs):
11141116
"""Update a subnet
@@ -1183,7 +1185,7 @@ def vpn_services(self):
11831185
:returns: A generator of vpn service objects
11841186
:rtype: :class:`~openstack.network.v2.vpn_service.VPNService`
11851187
"""
1186-
return self._list(vpn_service.VPNService)
1188+
return self._list(vpn_service.VPNService, paginated=False)
11871189

11881190
def update_vpn_service(self, value, **attrs):
11891191
"""Update a vpn service

‎openstack/orchestration/v1/_proxy.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def stacks(self):
4343
:returns: A generator of stack objects
4444
:rtype: :class:`~openstack.orchestration.v1.stack.Stack`
4545
"""
46-
return self._list(stack.Stack)
46+
return self._list(stack.Stack, paginated=False)
4747

4848
def get_stack(self, value):
4949
"""Get a single stack

0 commit comments

Comments
 (0)