openstack/openstacksdk
Code Issues Proposed changes

Use pagination detection by default

Browse Source 
This cleans up all explicitly set ``paginated`` parameters, as they
should not be needed anymore, since pagination detection is used
automatically. The parameter ``paginated`` still stays available to have
a means for disabling a service's misbehaving pagination
implementations.

Change-Id: I0f3b2cd58c5e856b12478667d07912f813b0f9da
This commit is contained in:
Johannes Kulik 2019-01-08 08:33:13 +01:00
parent e2e8139164
commit 6482783ea9
37 changed files with 230 additions and 341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,7 +143,7 @@ class Proxy(proxy.Proxy):
# 1.30. Thus we do not send any value if not needed.
if details:
kwargs['details'] = True
return self._list(_driver.Driver, paginated=False, **kwargs)
return self._list(_driver.Driver, **kwargs)
def get_driver(self, driver):
"""Get a specific driver.

10
openstack/block_storage/v2/_proxy.py
View File

@ -55,7 +55,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of snapshot objects.
"""
snapshot = _snapshot.SnapshotDetail if details else _snapshot.Snapshot
return self._list(snapshot, paginated=True, **query)
return self._list(snapshot, **query)
def create_snapshot(self, **attrs):
"""Create a new snapshot from attributes
@ -103,7 +103,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of volume type objects.
"""
return self._list(_type.Type, paginated=False, **query)
return self._list(_type.Type, **query)
def create_type(self, **attrs):
"""Create a new type from attributes
@ -163,7 +163,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of volume objects.
"""
volume = _volume.VolumeDetail if details else _volume.Volume
return self._list(volume, paginated=True, **query)
return self._list(volume, **query)
def create_volume(self, **attrs):
"""Create a new volume from attributes
@ -209,7 +209,7 @@ class Proxy(proxy.Proxy):
:returns A generator of cinder Back-end storage pools objects
"""
return self._list(_stats.Pools, paginated=False)
return self._list(_stats.Pools)
def backups(self, details=True, **query):
"""Retrieve a generator of backups
@ -240,7 +240,7 @@ class Proxy(proxy.Proxy):
'Object-store service is required for block-store backups'
)
backup = _backup.BackupDetail if details else _backup.Backup
return self._list(backup, paginated=True, **query)
return self._list(backup, **query)
def get_backup(self, backup):
"""Get a backup

10
openstack/block_storage/v3/_proxy.py
View File

@ -55,7 +55,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of snapshot objects.
"""
snapshot = _snapshot.SnapshotDetail if details else _snapshot.Snapshot
return self._list(snapshot, paginated=True, **query)
return self._list(snapshot, **query)
def create_snapshot(self, **attrs):
"""Create a new snapshot from attributes
@ -103,7 +103,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of volume type objects.
"""
return self._list(_type.Type, paginated=False, **query)
return self._list(_type.Type, **query)
def create_type(self, **attrs):
"""Create a new type from attributes
@ -163,7 +163,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of volume objects.
"""
volume = _volume.VolumeDetail if details else _volume.Volume
return self._list(volume, paginated=True, **query)
return self._list(volume, **query)
def create_volume(self, **attrs):
"""Create a new volume from attributes
@ -209,7 +209,7 @@ class Proxy(proxy.Proxy):
:returns A generator of cinder Back-end storage pools objects
"""
return self._list(_stats.Pools, paginated=False)
return self._list(_stats.Pools)
def backups(self, details=True, **query):
"""Retrieve a generator of backups
@ -240,7 +240,7 @@ class Proxy(proxy.Proxy):
'Object-store service is required for block-store backups'
)
backup = _backup.BackupDetail if details else _backup.Backup
return self._list(backup, paginated=True, **query)
return self._list(backup, **query)
def get_backup(self, backup):
"""Get a backup

28
openstack/clustering/v1/_proxy.py
View File

@ -42,7 +42,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of objects that are of type
:class:`~openstack.clustering.v1.profile_type.ProfileType`
"""
return self._list(_profile_type.ProfileType, paginated=False, **query)
return self._list(_profile_type.ProfileType, **query)
def get_profile_type(self, profile_type):
"""Get the details about a profile type.
@ -63,7 +63,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of objects that are of type
:class:`~openstack.clustering.v1.policy_type.PolicyType`
"""
return self._list(_policy_type.PolicyType, paginated=False, **query)
return self._list(_policy_type.PolicyType, **query)
def get_policy_type(self, policy_type):
"""Get the details about a policy type.
@ -156,7 +156,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of profile instances.
"""
return self._list(_profile.Profile, paginated=True, **query)
return self._list(_profile.Profile, **query)
def update_profile(self, profile, **attrs):
"""Update a profile.
@ -267,7 +267,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of cluster instances.
"""
return self._list(_cluster.Cluster, paginated=True, **query)
return self._list(_cluster.Cluster, **query)
def update_cluster(self, cluster, **attrs):
"""Update a cluster.
@ -429,8 +429,8 @@ class Proxy(proxy.Proxy):
:returns: A dictionary containing the list of attribute values.
"""
return self._list(_cluster_attr.ClusterAttr, paginated=False,
cluster_id=cluster, path=path)
return self._list(_cluster_attr.ClusterAttr, cluster_id=cluster,
path=path)
def check_cluster(self, cluster, **params):
"""Check a cluster.
@ -565,7 +565,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of node instances.
"""
return self._list(_node.Node, paginated=True, **query)
return self._list(_node.Node, **query)
def update_node(self, node, **attrs):
"""Update a node.
@ -728,7 +728,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of policy instances.
"""
return self._list(_policy.Policy, paginated=True, **query)
return self._list(_policy.Policy, **query)
def update_policy(self, policy, **attrs):
"""Update a policy.
@ -768,8 +768,8 @@ class Proxy(proxy.Proxy):
:returns: A generator of cluster-policy binding instances.
"""
cluster_id = resource.Resource._get_id(cluster)
return self._list(_cluster_policy.ClusterPolicy, paginated=False,
cluster_id=cluster_id, **query)
return self._list(_cluster_policy.ClusterPolicy, cluster_id=cluster_id,
**query)
def get_cluster_policy(self, cluster_policy, cluster):
"""Get a cluster-policy binding.
@ -873,7 +873,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of receiver instances.
"""
return self._list(_receiver.Receiver, paginated=True, **query)
return self._list(_receiver.Receiver, **query)
def get_action(self, action):
"""Get a single action.
@ -911,7 +911,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of action instances.
"""
return self._list(_action.Action, paginated=True, **query)
return self._list(_action.Action, **query)
def get_event(self, event):
"""Get a single event.
@ -954,7 +954,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of event instances.
"""
return self._list(_event.Event, paginated=True, **query)
return self._list(_event.Event, **query)
def wait_for_status(self, res, status, failures=None, interval=2,
wait=120):
@ -1003,7 +1003,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of objects that are of type
:class:`~openstack.clustering.v1.service.Service`
"""
return self._list(_service.Service, paginated=False, **query)
return self._list(_service.Service, **query)
def list_profile_type_operations(self, profile_type):
"""Get the operation about a profile type.

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

@ -51,7 +51,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of extension instances.
:rtype: :class:`~openstack.compute.v2.extension.Extension`
"""
return self._list(extension.Extension, paginated=True)
return self._list(extension.Extension)
def find_flavor(self, name_or_id, ignore_missing=True):
"""Find a single flavor
@ -119,7 +119,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of flavor objects
"""
flv = _flavor.FlavorDetail if details else _flavor.Flavor
return self._list(flv, paginated=True, **query)
return self._list(flv, **query)
def aggregates(self):
"""Return a generator of aggregate
@ -129,7 +129,7 @@ class Proxy(proxy.Proxy):
"""
aggregate = _aggregate.Aggregate
return self._list(aggregate, paginated=False)
return self._list(aggregate)
def get_aggregate(self, aggregate):
"""Get a single host aggregate
@ -282,7 +282,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of image objects
"""
img = _image.ImageDetail if details else _image.Image
return self._list(img, paginated=True, **query)
return self._list(img, **query)
def _get_base_resource(self, res, base):
# Metadata calls for Image and Server can work for both those
@ -408,7 +408,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of keypair objects
:rtype: :class:`~openstack.compute.v2.keypair.Keypair`
"""
return self._list(_keypair.Keypair, paginated=False)
return self._list(_keypair.Keypair)
def get_limits(self):
"""Retrieve limits that are applied to the project's account
@ -521,7 +521,7 @@ class Proxy(proxy.Proxy):
if all_projects:
query['all_projects'] = True
srv = _server.ServerDetail if details else _server.Server
return self._list(srv, paginated=True, **query)
return self._list(srv, **query)
def update_server(self, server, **attrs):
"""Update a server
@ -1033,7 +1033,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.compute.v2.server_interface.ServerInterface`
"""
server_id = resource.Resource._get_id(server)
return self._list(_server_interface.ServerInterface, paginated=False,
return self._list(_server_interface.ServerInterface,
server_id=server_id)
def server_ips(self, server, network_label=None):
@ -1048,7 +1048,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.compute.v2.server_ip.ServerIP`
"""
server_id = resource.Resource._get_id(server)
return self._list(server_ip.ServerIP, paginated=False,
return self._list(server_ip.ServerIP,
server_id=server_id, network_label=network_label)
def availability_zones(self, details=False):
@ -1067,7 +1067,7 @@ class Proxy(proxy.Proxy):
else:
az = availability_zone.AvailabilityZone
return self._list(az, paginated=False)
return self._list(az)
def get_server_metadata(self, server):
"""Return a dictionary of metadata for a server
@ -1191,7 +1191,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of ServerGroup objects
:rtype: :class:`~openstack.compute.v2.server_group.ServerGroup`
"""
return self._list(_server_group.ServerGroup, paginated=False, **query)
return self._list(_server_group.ServerGroup, **query)
def hypervisors(self, details=False):
"""Return a generator of hypervisor
@ -1209,7 +1209,7 @@ class Proxy(proxy.Proxy):
else:
hypervisor = _hypervisor.Hypervisor
return self._list(hypervisor, paginated=False)
return self._list(hypervisor)
def find_hypervisor(self, name_or_id, ignore_missing=True):
"""Find a hypervisor from name or id to get the corresponding info
@ -1288,7 +1288,7 @@ class Proxy(proxy.Proxy):
:rtype: class: `~openstack.compute.v2.service.Service`
"""
return self._list(_service.Service, paginated=False)
return self._list(_service.Service)
def create_volume_attachment(self, server, **attrs):
"""Create a new volume attachment from attributes
@ -1410,7 +1410,7 @@ class Proxy(proxy.Proxy):
:class:`~openstack.compute.v2.volume_attachment.VolumeAttachment`
"""
server_id = resource.Resource._get_id(server)
return self._list(_volume_attachment.VolumeAttachment, paginated=False,
return self._list(_volume_attachment.VolumeAttachment,
server_id=server_id)
def migrate_server(self, server):

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

@ -88,8 +88,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.database.v1.database.Database`
"""
instance = self._get_resource(_instance.Instance, instance)
return self._list(_database.Database, paginated=False,
instance_id=instance.id, **query)
return self._list(_database.Database, instance_id=instance.id, **query)
def get_database(self, database, instance=None):
"""Get a single database
@ -143,7 +142,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of flavor objects
:rtype: :class:`~openstack.database.v1.flavor.Flavor`
"""
return self._list(_flavor.Flavor, paginated=False, **query)
return self._list(_flavor.Flavor, **query)
def create_instance(self, **attrs):
"""Create a new instance from attributes
@ -209,7 +208,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of instance objects
:rtype: :class:`~openstack.database.v1.instance.Instance`
"""
return self._list(_instance.Instance, paginated=False, **query)
return self._list(_instance.Instance, **query)
def update_instance(self, instance, **attrs):
"""Update a instance
@ -290,8 +289,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.database.v1.user.User`
"""
instance = self._get_resource(_instance.Instance, instance)
return self._list(_user.User, instance_id=instance.id,
paginated=False, **query)
return self._list(_user.User, instance_id=instance.id, **query)
def get_user(self, user, instance=None):
"""Get a single user

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

@ -25,7 +25,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of extension instances.
:rtype: :class:`~openstack.identity.v2.extension.Extension`
"""
return self._list(_extension.Extension, paginated=False)
return self._list(_extension.Extension)
def get_extension(self, extension):
"""Get a single extension
@ -102,7 +102,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of role instances.
:rtype: :class:`~openstack.identity.v2.role.Role`
"""
return self._list(_role.Role, paginated=False, **query)
return self._list(_role.Role, **query)
def update_role(self, role, **attrs):
"""Update a role
@ -179,7 +179,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of tenant instances.
:rtype: :class:`~openstack.identity.v2.tenant.Tenant`
"""
return self._list(_tenant.Tenant, paginated=True, **query)
return self._list(_tenant.Tenant, **query)
def update_tenant(self, tenant, **attrs):
"""Update a tenant
@ -256,7 +256,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of user instances.
:rtype: :class:`~openstack.identity.v2.user.User`
"""
return self._list(_user.User, paginated=False, **query)
return self._list(_user.User, **query)
def update_user(self, user, **attrs):
"""Update a user

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

@ -103,7 +103,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.identity.v3.credential.Credential`
"""
# TODO(briancurtin): This is paginated but requires base list changes.
return self._list(_credential.Credential, paginated=False, **query)
return self._list(_credential.Credential, **query)
def update_credential(self, credential, **attrs):
"""Update a credential
@ -181,7 +181,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.identity.v3.domain.Domain`
"""
# TODO(briancurtin): This is paginated but requires base list changes.
return self._list(_domain.Domain, paginated=False, **query)
return self._list(_domain.Domain, **query)
def update_domain(self, domain, **attrs):
"""Update a domain
@ -261,7 +261,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.identity.v3.endpoint.Endpoint`
"""
# TODO(briancurtin): This is paginated but requires base list changes.
return self._list(_endpoint.Endpoint, paginated=False, **query)
return self._list(_endpoint.Endpoint, **query)
def update_endpoint(self, endpoint, **attrs):
"""Update a endpoint
@ -341,7 +341,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.identity.v3.group.Group`
"""
# TODO(briancurtin): This is paginated but requires base list changes.
return self._list(_group.Group, paginated=False, **query)
return self._list(_group.Group, **query)
def update_group(self, group, **attrs):
"""Update a group
@ -419,7 +419,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.identity.v3.policy.Policy`
"""
# TODO(briancurtin): This is paginated but requires base list changes.
return self._list(_policy.Policy, paginated=False, **query)
return self._list(_policy.Policy, **query)
def update_policy(self, policy, **attrs):
"""Update a policy
@ -497,7 +497,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.identity.v3.project.Project`
"""
# TODO(briancurtin): This is paginated but requires base list changes.
return self._list(_project.Project, paginated=False, **query)
return self._list(_project.Project, **query)
def user_projects(self, user, **query):
"""Retrieve a generator of projects to which the user has authorization
@ -512,8 +512,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.identity.v3.project.UserProject`
"""
user = self._get_resource(_user.User, user)
return self._list(_project.UserProject, paginated=True,
user_id=user.id, **query)
return self._list(_project.UserProject, user_id=user.id, **query)
def update_project(self, project, **attrs):
"""Update a project
@ -591,7 +590,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.identity.v3.service.Service`
"""
# TODO(briancurtin): This is paginated but requires base list changes.
return self._list(_service.Service, paginated=False, **query)
return self._list(_service.Service, **query)
def update_service(self, service, **attrs):
"""Update a service
@ -669,7 +668,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.identity.v3.user.User`
"""
# TODO(briancurtin): This is paginated but requires base list changes.
return self._list(_user.User, paginated=False, **query)
return self._list(_user.User, **query)
def update_user(self, user, **attrs):
"""Update a user
@ -747,7 +746,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.identity.v3.trust.Trust`
"""
# TODO(briancurtin): This is paginated but requires base list changes.
return self._list(_trust.Trust, paginated=False, **query)
return self._list(_trust.Trust, **query)
def create_region(self, **attrs):
"""Create a new region from attributes
@ -812,7 +811,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.identity.v3.region.Region`
"""
# TODO(briancurtin): This is paginated but requires base list changes.
return self._list(_region.Region, paginated=False, **query)
return self._list(_region.Region, **query)
def update_region(self, region, **attrs):
"""Update a region
@ -889,7 +888,7 @@ class Proxy(proxy.Proxy):
:return: A generator of role instances.
:rtype: :class:`~openstack.identity.v3.role.Role`
"""
return self._list(_role.Role, paginated=False, **query)
return self._list(_role.Role, **query)
def update_role(self, role, **attrs):
"""Update a role
@ -942,24 +941,24 @@ class Proxy(proxy.Proxy):
group = self._get_resource(_group.Group, group)
return self._list(
_role_domain_group_assignment.RoleDomainGroupAssignment,
paginated=False, domain_id=domain.id, group_id=group.id)
domain_id=domain.id, group_id=group.id)
else:
user = self._get_resource(_user.User, user)
return self._list(
_role_domain_user_assignment.RoleDomainUserAssignment,
paginated=False, domain_id=domain.id, user_id=user.id)
domain_id=domain.id, user_id=user.id)
else:
project = self._get_resource(_project.Project, project)
if group:
group = self._get_resource(_group.Group, group)
return self._list(
_role_project_group_assignment.RoleProjectGroupAssignment,
paginated=False, project_id=project.id, group_id=group.id)
project_id=project.id, group_id=group.id)
else:
user = self._get_resource(_user.User, user)
return self._list(
_role_project_user_assignment.RoleProjectUserAssignment,
paginated=False, project_id=project.id, user_id=user.id)
project_id=project.id, user_id=user.id)
def role_assignments(self, **query):
"""Retrieve a generator of role assignments
@ -972,8 +971,7 @@ class Proxy(proxy.Proxy):
:return:
:class:`~openstack.identity.v3.role_assignment.RoleAssignment`
"""
return self._list(_role_assignment.RoleAssignment,
paginated=False, **query)
return self._list(_role_assignment.RoleAssignment, **query)
def registered_limits(self, **query):
"""Retrieve a generator of registered_limits
@ -985,8 +983,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:
`~openstack.identity.v3.registered_limit.RegisteredLimit`
"""
return self._list(_registered_limit.RegisteredLimit, paginated=False,
**query)
return self._list(_registered_limit.RegisteredLimit, **query)
def get_registered_limit(self, registered_limit):
"""Get a single registered_limit
@ -1058,8 +1055,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of limits instances.
:rtype: :class:`~openstack.identity.v3.limit.Limit`
"""
return self._list(_limit.Limit, paginated=False,
**query)
return self._list(_limit.Limit, **query)
def get_limit(self, limit):
"""Get a single limit

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

@ -78,7 +78,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of image objects
:rtype: :class:`~openstack.image.v1.image.Image`
"""
return self._list(_image.Image, paginated=True, **query)
return self._list(_image.Image, **query)
def update_image(self, image, **attrs):
"""Update a image

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

@ -144,7 +144,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of image objects
:rtype: :class:`~openstack.image.v2.image.Image`
"""
return self._list(_image.Image, paginated=True, **query)
return self._list(_image.Image, **query)
def update_image(self, image, **attrs):
"""Update a image
@ -287,8 +287,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.image.v2.member.Member`
"""
image_id = resource.Resource._get_id(image)
return self._list(_member.Member, paginated=False,
image_id=image_id)
return self._list(_member.Member, image_id=image_id)
def update_member(self, member, image, **attrs):
"""Update the member of an image

7
openstack/instance_ha/v1/_proxy.py
View File

@ -33,7 +33,7 @@ class Proxy(proxy.Proxy):
limit the notifications being returned.
:returns: A generator of notifications
"""
return self._list(_notification.Notification, paginated=False, **query)
return self._list(_notification.Notification, **query)
def get_notification(self, notification):
"""Get a single notification.
@ -71,7 +71,7 @@ class Proxy(proxy.Proxy):
limit the segments being returned.
:returns: A generator of segments
"""
return self._list(_segment.Segment, paginated=False, **query)
return self._list(_segment.Segment, **query)
def get_segment(self, segment):
"""Get a single segment.
@ -137,8 +137,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of hosts
"""
return self._list(_host.Host, segment_id=segment_id, paginated=False,
**query)
return self._list(_host.Host, segment_id=segment_id, **query)
def create_host(self, segment_id, **attrs):
"""Create a new host.

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

@ -84,7 +84,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of container objects
:rtype: :class:`~openstack.key_manager.v1.container.Container`
"""
return self._list(_container.Container, paginated=False, **query)
return self._list(_container.Container, **query)
def update_container(self, container, **attrs):
"""Update a container
@ -164,7 +164,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of order objects
:rtype: :class:`~openstack.key_manager.v1.order.Order`
"""
return self._list(_order.Order, paginated=False, **query)
return self._list(_order.Order, **query)
def update_order(self, order, **attrs):
"""Update a order
@ -245,7 +245,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of secret objects
:rtype: :class:`~openstack.key_manager.v1.secret.Secret`
"""
return self._list(_secret.Secret, paginated=False, **query)
return self._list(_secret.Secret, **query)
def update_secret(self, secret, **attrs):
"""Update a secret

18
openstack/load_balancer/v2/_proxy.py
View File

@ -55,7 +55,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of load balancer instances
"""
return self._list(_lb.LoadBalancer, paginated=True, **query)
return self._list(_lb.LoadBalancer, **query)
def delete_load_balancer(self, load_balancer, ignore_missing=True,
cascade=False):
@ -180,7 +180,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of listener objects
:rtype: :class:`~openstack.load_balancer.v2.listener.Listener`
"""
return self._list(_listener.Listener, paginated=True, **query)
return self._list(_listener.Listener, **query)
def update_listener(self, listener, **attrs):
"""Update a listener
@ -227,7 +227,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of Pool instances
"""
return self._list(_pool.Pool, paginated=True, **query)
return self._list(_pool.Pool, **query)
def delete_pool(self, pool, ignore_missing=True):
"""Delete a pool
@ -364,8 +364,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.load_balancer.v2.member.Member`
"""
poolobj = self._get_resource(_pool.Pool, pool)
return self._list(_member.Member, paginated=True,
pool_id=poolobj.id, **query)
return self._list(_member.Member, pool_id=poolobj.id, **query)
def update_member(self, member, pool, **attrs):
"""Update a member
@ -451,7 +450,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of health monitor instances
"""
return self._list(_hm.HealthMonitor, paginated=True, **query)
return self._list(_hm.HealthMonitor, **query)
def delete_health_monitor(self, healthmonitor, ignore_missing=True):
"""Delete a health monitor
@ -554,7 +553,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of l7policy objects
:rtype: :class:`~openstack.load_balancer.v2.l7_policy.L7Policy`
"""
return self._list(_l7policy.L7Policy, paginated=True, **query)
return self._list(_l7policy.L7Policy, **query)
def update_l7_policy(self, l7_policy, **attrs):
"""Update a l7policy
@ -660,8 +659,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.load_balancer.v2.l7_rule.L7Rule`
"""
l7policyobj = self._get_resource(_l7policy.L7Policy, l7_policy)
return self._list(_l7rule.L7Rule, paginated=True,
l7policy_id=l7policyobj.id, **query)
return self._list(_l7rule.L7Rule, l7policy_id=l7policyobj.id, **query)
def update_l7_rule(self, l7rule, l7_policy, **attrs):
"""Update a l7rule
@ -692,7 +690,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of quota objects
:rtype: :class:`~openstack.load_balancer.v2.quota.Quota`
"""
return self._list(_quota.Quota, paginated=False, **query)
return self._list(_quota.Quota, **query)
def get_quota(self, quota):
"""Get a quota

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

@ -59,7 +59,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of queue instances.
"""
return self._list(_queue.Queue, paginated=True, **query)
return self._list(_queue.Queue, **query)
def delete_queue(self, value, ignore_missing=True):
"""Delete a queue
@ -110,7 +110,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of message instances.
"""
query["queue_name"] = queue_name
return self._list(_message.Message, paginated=True, **query)
return self._list(_message.Message, **query)
def get_message(self, queue_name, message):
"""Get a message
@ -184,7 +184,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of subscription instances.
"""
query["queue_name"] = queue_name
return self._list(_subscription.Subscription, paginated=True, **query)
return self._list(_subscription.Subscription, **query)
def get_subscription(self, queue_name, subscription):
"""Get a subscription

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

@ -133,8 +133,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of address scope objects
:rtype: :class:`~openstack.network.v2.address_scope.AddressScope`
"""
return self._list(_address_scope.AddressScope, paginated=False,
**query)
return self._list(_address_scope.AddressScope, **query)
def update_address_scope(self, address_scope, **attrs):
"""Update an address scope
@ -169,7 +168,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of agents
:rtype: :class:`~openstack.network.v2.agent.Agent`
"""
return self._list(_agent.Agent, paginated=False, **query)
return self._list(_agent.Agent, **query)
def delete_agent(self, agent, ignore_missing=True):
"""Delete a network agent
@ -222,7 +221,7 @@ class Proxy(proxy.Proxy):
:return: A generator of networks
"""
agent_obj = self._get_resource(_agent.Agent, agent)
return self._list(_network.DHCPAgentHostingNetwork, paginated=False,
return self._list(_network.DHCPAgentHostingNetwork,
agent_id=agent_obj.id, **query)
def add_dhcp_agent_to_network(self, agent, network):
@ -259,8 +258,8 @@ class Proxy(proxy.Proxy):
:return: A generator of hosted DHCP agents
"""
net = self._get_resource(_network.Network, network)
return self._list(_agent.NetworkHostingDHCPAgent, paginated=False,
network_id=net.id, **query)
return self._list(_agent.NetworkHostingDHCPAgent, network_id=net.id,
**query)
def get_auto_allocated_topology(self, project=None):
"""Get the auto-allocated topology of a given tenant
@ -330,7 +329,7 @@ class Proxy(proxy.Proxy):
:rtype:
:class:`~openstack.network.v2.availability_zone.AvailabilityZone`
"""
return self._list(availability_zone.AvailabilityZone, paginated=False)
return self._list(availability_zone.AvailabilityZone)
def find_extension(self, name_or_id, ignore_missing=True, **args):
"""Find a single extension
@ -359,7 +358,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of extension objects
:rtype: :class:`~openstack.network.v2.extension.Extension`
"""
return self._list(extension.Extension, paginated=False, **query)
return self._list(extension.Extension, **query)
def create_flavor(self, **attrs):
"""Create a new network service flavor from attributes
@ -447,7 +446,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of flavor objects
:rtype: :class:`~openstack.network.v2.flavor.Flavor`
"""
return self._list(_flavor.Flavor, paginated=True, **query)
return self._list(_flavor.Flavor, **query)
def associate_flavor_with_service_profile(self, flavor, service_profile):
"""Associate network flavor with service profile.
@ -576,7 +575,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of floating IP objects
:rtype: :class:`~openstack.network.v2.floating_ip.FloatingIP`
"""
return self._list(_floating_ip.FloatingIP, paginated=False, **query)
return self._list(_floating_ip.FloatingIP, **query)
def update_ip(self, floating_ip, **attrs):
"""Update a ip
@ -687,7 +686,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.network.v2.port_forwarding.PortForwarding`
"""
fip = self._get_resource(_floating_ip.FloatingIP, floating_ip)
return self._list(_port_forwarding.PortForwarding, paginated=False,
return self._list(_port_forwarding.PortForwarding,
floatingip_id=fip.id, **query)
def update_port_forwarding(self, port_forwarding, floating_ip, **attrs):
@ -796,8 +795,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of health monitor objects
:rtype: :class:`~openstack.network.v2.health_monitor.HealthMonitor`
"""
return self._list(_health_monitor.HealthMonitor, paginated=False,
**query)
return self._list(_health_monitor.HealthMonitor, **query)
def update_health_monitor(self, health_monitor, **attrs):
"""Update a health monitor
@ -892,7 +890,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of listener objects
:rtype: :class:`~openstack.network.v2.listener.Listener`
"""
return self._list(_listener.Listener, paginated=False, **query)
return self._list(_listener.Listener, **query)
def update_listener(self, listener, **attrs):
"""Update a listener
@ -976,8 +974,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of load balancer objects
:rtype: :class:`~openstack.network.v2.load_balancer.LoadBalancer`
"""
return self._list(_load_balancer.LoadBalancer, paginated=False,
**query)
return self._list(_load_balancer.LoadBalancer, **query)
def update_load_balancer(self, load_balancer, **attrs):
"""Update a load balancer
@ -1071,8 +1068,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of metering label objects
:rtype: :class:`~openstack.network.v2.metering_label.MeteringLabel`
"""
return self._list(_metering_label.MeteringLabel, paginated=False,
**query)
return self._list(_metering_label.MeteringLabel, **query)
def update_metering_label(self, metering_label, **attrs):
"""Update a metering label
@ -1176,8 +1172,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.network.v2.metering_label_rule.
MeteringLabelRule`
"""
return self._list(_metering_label_rule.MeteringLabelRule,
paginated=False, **query)
return self._list(_metering_label_rule.MeteringLabelRule, **query)
def update_metering_label_rule(self, metering_label_rule, **attrs):
"""Update a metering label rule
@ -1279,7 +1274,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of network objects
:rtype: :class:`~openstack.network.v2.network.Network`
"""
return self._list(_network.Network, paginated=False, **query)
return self._list(_network.Network, **query)
def update_network(self, network, **attrs):
"""Update a network
@ -1345,7 +1340,7 @@ class Proxy(proxy.Proxy):
NetworkIPAvailability`
"""
return self._list(network_ip_availability.NetworkIPAvailability,
paginated=False, **query)
**query)
def create_network_segment_range(self, **attrs):
"""Create a new network segment range from attributes
@ -1444,8 +1439,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.network.v2._network_segment_range.
NetworkSegmentRange`
"""
return self._list(_network_segment_range.NetworkSegmentRange,
paginated=False, **query)
return self._list(_network_segment_range.NetworkSegmentRange, **query)
def update_network_segment_range(self, network_segment_range, **attrs):
"""Update a network segment range
@ -1542,7 +1536,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of pool objects
:rtype: :class:`~openstack.network.v2.pool.Pool`
"""
return self._list(_pool.Pool, paginated=False, **query)
return self._list(_pool.Pool, **query)
def update_pool(self, pool, **attrs):
"""Update a pool
@ -1660,8 +1654,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.network.v2.pool_member.PoolMember`
"""
poolobj = self._get_resource(_pool.Pool, pool)
return self._list(_pool_member.PoolMember, paginated=False,
pool_id=poolobj.id, **query)
return self._list(_pool_member.PoolMember, pool_id=poolobj.id, **query)
def update_pool_member(self, pool_member, pool, **attrs):
"""Update a pool member
@ -1759,7 +1752,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of port objects
:rtype: :class:`~openstack.network.v2.port.Port`
"""
return self._list(_port.Port, paginated=False, **query)
return self._list(_port.Port, **query)
def update_port(self, port, **attrs):
"""Update a port
@ -1891,7 +1884,7 @@ class Proxy(proxy.Proxy):
"""
policy = self._get_resource(_qos_policy.QoSPolicy, qos_policy)
return self._list(_qos_bandwidth_limit_rule.QoSBandwidthLimitRule,
paginated=False, qos_policy_id=policy.id, **query)
qos_policy_id=policy.id, **query)
def update_qos_bandwidth_limit_rule(self, qos_rule, qos_policy,
**attrs):
@ -2014,7 +2007,7 @@ class Proxy(proxy.Proxy):
"""
policy = self._get_resource(_qos_policy.QoSPolicy, qos_policy)
return self._list(_qos_dscp_marking_rule.QoSDSCPMarkingRule,
paginated=False, qos_policy_id=policy.id, **query)
qos_policy_id=policy.id, **query)
def update_qos_dscp_marking_rule(self, qos_rule, qos_policy, **attrs):
"""Update a QoS DSCP marking rule
@ -2137,7 +2130,7 @@ class Proxy(proxy.Proxy):
"""
policy = self._get_resource(_qos_policy.QoSPolicy, qos_policy)
return self._list(_qos_minimum_bandwidth_rule.QoSMinimumBandwidthRule,
paginated=False, qos_policy_id=policy.id, **query)
qos_policy_id=policy.id, **query)
def update_qos_minimum_bandwidth_rule(self, qos_rule, qos_policy,
**attrs):
@ -2236,7 +2229,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of QoS policy objects
:rtype: :class:`~openstack.network.v2.qos_policy.QoSPolicy`
"""
return self._list(_qos_policy.QoSPolicy, paginated=False, **query)
return self._list(_qos_policy.QoSPolicy, **query)
def update_qos_policy(self, qos_policy, **attrs):
"""Update a QoS policy
@ -2293,7 +2286,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of QoS rule type objects
:rtype: :class:`~openstack.network.v2.qos_rule_type.QoSRuleType`
"""
return self._list(_qos_rule_type.QoSRuleType, paginated=False, **query)
return self._list(_qos_rule_type.QoSRuleType, **query)
def delete_quota(self, quota, ignore_missing=True):
"""Delete a quota (i.e. reset to the default quota)
@ -2360,7 +2353,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of quota objects
:rtype: :class:`~openstack.network.v2.quota.Quota`
"""
return self._list(_quota.Quota, paginated=False, **query)
return self._list(_quota.Quota, **query)
def update_quota(self, quota, **attrs):
"""Update a quota
@ -2450,7 +2443,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of rbac objects
:rtype: :class:`~openstack.network.v2.rbac_policy.RBACPolicy`
"""
return self._list(_rbac_policy.RBACPolicy, paginated=False, **query)
return self._list(_rbac_policy.RBACPolicy, **query)
def update_rbac_policy(self, rbac_policy, **attrs):
"""Update a RBAC policy
@ -2539,7 +2532,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of router objects
:rtype: :class:`~openstack.network.v2.router.Router`
"""
return self._list(_router.Router, paginated=False, **query)
return self._list(_router.Router, **query)
def update_router(self, router, **attrs):
"""Update a router
@ -2628,8 +2621,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.network.v2.router.RouterL3Agents`
"""
router = self._get_resource(_router.Router, router)
return self._list(_agent.RouterL3Agent, paginated=False,
router_id=router.id, **query)
return self._list(_agent.RouterL3Agent, router_id=router.id, **query)
def agent_hosted_routers(self, agent, **query):
"""Return a generator of routers hosted by a L3 agent
@ -2643,8 +2635,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.network.v2.agent.L3AgentRouters`
"""
agent = self._get_resource(_agent.Agent, agent)
return self._list(_router.L3AgentRouter, paginated=False,
agent_id=agent.id, **query)
return self._list(_router.L3AgentRouter, agent_id=agent.id, **query)
def add_router_to_agent(self, agent, router):
"""Add router to L3 agent
@ -2755,8 +2746,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of firewall group objects
"""
return self._list(_firewall_group.FirewallGroup,
paginated=False, **query)
return self._list(_firewall_group.FirewallGroup, **query)
def update_firewall_group(self, firewall_group, **attrs):
"""Update a firewall group
@ -2851,8 +2841,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of firewall policy objects
"""
return self._list(_firewall_policy.FirewallPolicy,
paginated=False, **query)
return self._list(_firewall_policy.FirewallPolicy, **query)
def update_firewall_policy(self, firewall_policy, **attrs):
"""Update a firewall policy
@ -2994,8 +2983,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of firewall rule objects
"""
return self._list(_firewall_rule.FirewallRule,
paginated=False, **query)
return self._list(_firewall_rule.FirewallRule, **query)
def update_firewall_rule(self, firewall_rule, **attrs):
"""Update a firewall rule
@ -3087,8 +3075,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of security group objects
:rtype: :class:`~openstack.network.v2.security_group.SecurityGroup`
"""
return self._list(_security_group.SecurityGroup, paginated=False,
**query)
return self._list(_security_group.SecurityGroup, **query)
def update_security_group(self, security_group, **attrs):
"""Update a security group
@ -3192,8 +3179,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.network.v2.security_group_rule.
SecurityGroupRule`
"""
return self._list(_security_group_rule.SecurityGroupRule,
paginated=False, **query)
return self._list(_security_group_rule.SecurityGroupRule, **query)
def create_segment(self, **attrs):
"""Create a new segment from attributes
@ -3268,7 +3254,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of segment objects
:rtype: :class:`~openstack.network.v2.segment.Segment`
"""
return self._list(_segment.Segment, paginated=False, **query)
return self._list(_segment.Segment, **query)
def update_segment(self, segment, **attrs):
"""Update a segment
@ -3294,8 +3280,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.network.v2.service_provider.ServiceProvider`
"""
return self._list(_service_provider.ServiceProvider,
paginated=False, **query)
return self._list(_service_provider.ServiceProvider, **query)
def create_service_profile(self, **attrs):
"""Create a new network service flavor profile from attributes
@ -3374,8 +3359,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of service profile objects
:rtype: :class:`~openstack.network.v2.service_profile.ServiceProfile`
"""
return self._list(_service_profile.ServiceProfile, paginated=True,
**query)
return self._list(_service_profile.ServiceProfile, **query)
def update_service_profile(self, service_profile, **attrs):
"""Update a network flavor service profile
@ -3469,7 +3453,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of subnet objects
:rtype: :class:`~openstack.network.v2.subnet.Subnet`
"""
return self._list(_subnet.Subnet, paginated=False, **query)
return self._list(_subnet.Subnet, **query)
def update_subnet(self, subnet, **attrs):
"""Update a subnet
@ -3558,7 +3542,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of subnet pool objects
:rtype: :class:`~openstack.network.v2.subnet_pool.SubnetPool`
"""
return self._list(_subnet_pool.SubnetPool, paginated=False, **query)
return self._list(_subnet_pool.SubnetPool, **query)
def update_subnet_pool(self, subnet_pool, **attrs):
"""Update a subnet pool
@ -3658,7 +3642,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of trunk objects
:rtype: :class:`~openstack.network.v2.trunk.trunk`
"""
return self._list(_trunk.Trunk, paginated=False, **query)
return self._list(_trunk.Trunk, **query)
def update_trunk(self, trunk, **attrs):
"""Update a trunk
@ -3782,7 +3766,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of vpn service objects
:rtype: :class:`~openstack.network.v2.vpn_service.VPNService`
"""
return self._list(_vpn_service.VPNService, paginated=False, **query)
return self._list(_vpn_service.VPNService, **query)
def update_vpn_service(self, vpn_service, **attrs):
"""Update a vpn service

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

@ -64,7 +64,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of stack objects
:rtype: :class:`~openstack.orchestration.v1.stack.Stack`
"""
return self._list(_stack.Stack, paginated=False, **query)
return self._list(_stack.Stack, **query)
def get_stack(self, stack):
"""Get a single stack
@ -218,8 +218,8 @@ class Proxy(proxy.Proxy):
else:
obj = self._find(_stack.Stack, stack, ignore_missing=False)
return self._list(_resource.Resource, paginated=False,
stack_name=obj.name, stack_id=obj.id, **query)
return self._list(_resource.Resource, stack_name=obj.name,
stack_id=obj.id, **query)
def create_software_config(self, **attrs):
"""Create a new software config from attributes
@ -243,7 +243,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.orchestration.v1.software_config.\
SoftwareConfig`
"""
return self._list(_sc.SoftwareConfig, paginated=True, **query)
return self._list(_sc.SoftwareConfig, **query)
def get_software_config(self, software_config):
"""Get details about a specific software config.
@ -295,7 +295,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.orchestration.v1.software_deployment.\
SoftwareDeployment`
"""
return self._list(_sd.SoftwareDeployment, paginated=False, **query)
return self._list(_sd.SoftwareDeployment, **query)
def get_software_deployment(self, software_deployment):
"""Get details about a specific software deployment resource

2
openstack/proxy.py
View File

@ -254,7 +254,7 @@ class Proxy(_adapter.OpenStackSDKAdapter):
resource_type=resource_type.__name__, value=value))
def _list(self, resource_type, value=None,
paginated=False, base_path=None, **attrs):
paginated=True, base_path=None, **attrs):
"""List a resource
:param resource_type: The type of resource to delete. This should

2
openstack/resource.py
View File

@ -1254,7 +1254,7 @@ class Resource(dict):
return self
@classmethod
def list(cls, session, paginated=False, base_path=None, **params):
def list(cls, session, paginated=True, base_path=None, **params):
"""This method is a generator which yields resource objects.
This resource object list generator handles pagination and takes query

2
openstack/tests/unit/baremetal/v1/test_proxy.py
View File

@ -30,7 +30,7 @@ class TestBaremetalProxy(test_proxy_base.TestProxyBase):
self.proxy = _proxy.Proxy(self.session)
def test_drivers(self):
self.verify_list(self.proxy.drivers, driver.Driver, paginated=False)
self.verify_list(self.proxy.drivers, driver.Driver)
def test_get_driver(self):
self.verify_get(self.proxy.get_driver, driver.Driver)

11
openstack/tests/unit/block_storage/v2/test_proxy.py
View File

@ -32,13 +32,11 @@ class TestVolumeProxy(test_proxy_base.TestProxyBase):
def test_snapshots_detailed(self):
self.verify_list(self.proxy.snapshots, snapshot.SnapshotDetail,
paginated=True,
method_kwargs={"details": True, "query": 1},
expected_kwargs={"query": 1})
def test_snapshots_not_detailed(self):
self.verify_list(self.proxy.snapshots, snapshot.Snapshot,
paginated=True,
method_kwargs={"details": False, "query": 1},
expected_kwargs={"query": 1})
@ -57,7 +55,7 @@ class TestVolumeProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_type, type.Type)
def test_types(self):
self.verify_list(self.proxy.types, type.Type, paginated=False)
self.verify_list(self.proxy.types, type.Type)
def test_type_create_attrs(self):
self.verify_create(self.proxy.create_type, type.Type)
@ -73,13 +71,11 @@ class TestVolumeProxy(test_proxy_base.TestProxyBase):
def test_volumes_detailed(self):
self.verify_list(self.proxy.volumes, volume.VolumeDetail,
paginated=True,
method_kwargs={"details": True, "query": 1},
expected_kwargs={"query": 1})
def test_volumes_not_detailed(self):
self.verify_list(self.proxy.volumes, volume.Volume,
paginated=True,
method_kwargs={"details": False, "query": 1},
expected_kwargs={"query": 1})
@ -99,15 +95,13 @@ class TestVolumeProxy(test_proxy_base.TestProxyBase):
expected_args=["new-size"])
def test_backend_pools(self):
self.verify_list(self.proxy.backend_pools, stats.Pools,
paginated=False)
self.verify_list(self.proxy.backend_pools, stats.Pools)
def test_backups_detailed(self):
# NOTE: mock has_service
self.proxy._connection = mock.Mock()
self.proxy._connection.has_service = mock.Mock(return_value=True)
self.verify_list(self.proxy.backups, backup.BackupDetail,
paginated=True,
method_kwargs={"details": True, "query": 1},
expected_kwargs={"query": 1})
@ -116,7 +110,6 @@ class TestVolumeProxy(test_proxy_base.TestProxyBase):
self.proxy._connection = mock.Mock()
self.proxy._connection.has_service = mock.Mock(return_value=True)
self.verify_list(self.proxy.backups, backup.Backup,
paginated=True,
method_kwargs={"details": False, "query": 1},
expected_kwargs={"query": 1})

11
openstack/tests/unit/block_storage/v3/test_proxy.py
View File

@ -32,13 +32,11 @@ class TestVolumeProxy(test_proxy_base.TestProxyBase):
def test_snapshots_detailed(self):
self.verify_list(self.proxy.snapshots, snapshot.SnapshotDetail,
paginated=True,
method_kwargs={"details": True, "query": 1},
expected_kwargs={"query": 1})
def test_snapshots_not_detailed(self):
self.verify_list(self.proxy.snapshots, snapshot.Snapshot,
paginated=True,
method_kwargs={"details": False, "query": 1},
expected_kwargs={"query": 1})
@ -57,7 +55,7 @@ class TestVolumeProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_type, type.Type)
def test_types(self):
self.verify_list(self.proxy.types, type.Type, paginated=False)
self.verify_list(self.proxy.types, type.Type)
def test_type_create_attrs(self):
self.verify_create(self.proxy.create_type, type.Type)
@ -73,13 +71,11 @@ class TestVolumeProxy(test_proxy_base.TestProxyBase):
def test_volumes_detailed(self):
self.verify_list(self.proxy.volumes, volume.VolumeDetail,
paginated=True,
method_kwargs={"details": True, "query": 1},
expected_kwargs={"query": 1})
def test_volumes_not_detailed(self):
self.verify_list(self.proxy.volumes, volume.Volume,
paginated=True,
method_kwargs={"details": False, "query": 1},
expected_kwargs={"query": 1})
@ -99,15 +95,13 @@ class TestVolumeProxy(test_proxy_base.TestProxyBase):
expected_args=["new-size"])
def test_backend_pools(self):
self.verify_list(self.proxy.backend_pools, stats.Pools,
paginated=False)
self.verify_list(self.proxy.backend_pools, stats.Pools)
def test_backups_detailed(self):
# NOTE: mock has_service
self.proxy._connection = mock.Mock()
self.proxy._connection.has_service = mock.Mock(return_value=True)
self.verify_list(self.proxy.backups, backup.BackupDetail,
paginated=True,
method_kwargs={"details": True, "query": 1},
expected_kwargs={"query": 1})
@ -116,7 +110,6 @@ class TestVolumeProxy(test_proxy_base.TestProxyBase):
self.proxy._connection = mock.Mock()
self.proxy._connection.has_service = mock.Mock(return_value=True)
self.verify_list(self.proxy.backups, backup.Backup,
paginated=True,
method_kwargs={"details": False, "query": 1},
expected_kwargs={"query": 1})

20
openstack/tests/unit/clustering/v1/test_proxy.py
View File

@ -42,16 +42,14 @@ class TestClusterProxy(test_proxy_base.TestProxyBase):
def test_profile_types(self):
self.verify_list(self.proxy.profile_types,
profile_type.ProfileType,
paginated=False)
profile_type.ProfileType)
def test_profile_type_get(self):
self.verify_get(self.proxy.get_profile_type,
profile_type.ProfileType)
def test_policy_types(self):
self.verify_list(self.proxy.policy_types, policy_type.PolicyType,
paginated=False)
self.verify_list(self.proxy.policy_types, policy_type.PolicyType)
def test_policy_type_get(self):
self.verify_get(self.proxy.get_policy_type, policy_type.PolicyType)
@ -77,7 +75,6 @@ class TestClusterProxy(test_proxy_base.TestProxyBase):
def test_profiles(self):
self.verify_list(self.proxy.profiles, profile.Profile,
paginated=True,
method_kwargs={'limit': 2},
expected_kwargs={'limit': 2})
@ -106,7 +103,6 @@ class TestClusterProxy(test_proxy_base.TestProxyBase):
def test_clusters(self):
self.verify_list(self.proxy.clusters, cluster.Cluster,
paginated=True,
method_kwargs={'limit': 2},
expected_kwargs={'limit': 2})
@ -115,8 +111,7 @@ class TestClusterProxy(test_proxy_base.TestProxyBase):
def test_services(self):
self.verify_list(self.proxy.services,
service.Service,
paginated=False)
service.Service)
@mock.patch.object(proxy_base.Proxy, '_find')
def test_resize_cluster(self, mock_find):
@ -140,7 +135,7 @@ class TestClusterProxy(test_proxy_base.TestProxyBase):
def test_collect_cluster_attrs(self):
self.verify_list(self.proxy.collect_cluster_attrs,
cluster_attr.ClusterAttr, paginated=False,
cluster_attr.ClusterAttr,
method_args=['FAKE_ID', 'path.to.attr'],
expected_kwargs={'cluster_id': 'FAKE_ID',
'path': 'path.to.attr'})
@ -194,7 +189,6 @@ class TestClusterProxy(test_proxy_base.TestProxyBase):
def test_nodes(self):
self.verify_list(self.proxy.nodes, node.Node,
paginated=True,
method_kwargs={'limit': 2},
expected_kwargs={'limit': 2})
@ -261,7 +255,6 @@ class TestClusterProxy(test_proxy_base.TestProxyBase):
def test_policies(self):
self.verify_list(self.proxy.policies, policy.Policy,
paginated=True,
method_kwargs={'limit': 2},
expected_kwargs={'limit': 2})
@ -271,7 +264,7 @@ class TestClusterProxy(test_proxy_base.TestProxyBase):
def test_cluster_policies(self):
self.verify_list(self.proxy.cluster_policies,
cluster_policy.ClusterPolicy,
paginated=False, method_args=["FAKE_CLUSTER"],
method_args=["FAKE_CLUSTER"],
expected_kwargs={"cluster_id": "FAKE_CLUSTER"})
def test_get_cluster_policy(self):
@ -324,7 +317,6 @@ class TestClusterProxy(test_proxy_base.TestProxyBase):
def test_receivers(self):
self.verify_list(self.proxy.receivers, receiver.Receiver,
paginated=True,
method_kwargs={'limit': 2},
expected_kwargs={'limit': 2})
@ -333,7 +325,6 @@ class TestClusterProxy(test_proxy_base.TestProxyBase):
def test_actions(self):
self.verify_list(self.proxy.actions, action.Action,
paginated=True,
method_kwargs={'limit': 2},
expected_kwargs={'limit': 2})
@ -342,7 +333,6 @@ class TestClusterProxy(test_proxy_base.TestProxyBase):
def test_events(self):
self.verify_list(self.proxy.events, event.Event,
paginated=True,
method_kwargs={'limit': 2},
expected_kwargs={'limit': 2})

31
openstack/tests/unit/compute/v2/test_proxy.py
View File

@ -35,8 +35,7 @@ class TestComputeProxy(test_proxy_base.TestProxyBase):
self.verify_find(self.proxy.find_extension, extension.Extension)
def test_extensions(self):
self.verify_list_no_kwargs(self.proxy.extensions, extension.Extension,
paginated=True)
self.verify_list_no_kwargs(self.proxy.extensions, extension.Extension)
def test_flavor_create(self):
self.verify_create(self.proxy.create_flavor, flavor.Flavor)
@ -55,13 +54,11 @@ class TestComputeProxy(test_proxy_base.TestProxyBase):
def test_flavors_detailed(self):
self.verify_list(self.proxy.flavors, flavor.FlavorDetail,
paginated=True,
method_kwargs={"details": True, "query": 1},
expected_kwargs={"query": 1})
def test_flavors_not_detailed(self):
self.verify_list(self.proxy.flavors, flavor.Flavor,
paginated=True,
method_kwargs={"details": False, "query": 1},
expected_kwargs={"query": 1})
@ -79,13 +76,11 @@ class TestComputeProxy(test_proxy_base.TestProxyBase):
def test_images_detailed(self):
self.verify_list(self.proxy.images, image.ImageDetail,
paginated=True,
method_kwargs={"details": True, "query": 1},
expected_kwargs={"query": 1})
def test_images_not_detailed(self):
self.verify_list(self.proxy.images, image.Image,
paginated=True,
method_kwargs={"details": False, "query": 1},
expected_kwargs={"query": 1})
@ -105,8 +100,7 @@ class TestComputeProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_keypair, keypair.Keypair)
def test_keypairs(self):
self.verify_list_no_kwargs(self.proxy.keypairs, keypair.Keypair,
paginated=False)
self.verify_list_no_kwargs(self.proxy.keypairs, keypair.Keypair)
def test_limits_get(self):
self.verify_get(self.proxy.get_limits, limits.Limits, value=[])
@ -183,19 +177,19 @@ class TestComputeProxy(test_proxy_base.TestProxyBase):
def test_server_interfaces(self):
self.verify_list(self.proxy.server_interfaces,
server_interface.ServerInterface,
paginated=False, method_args=["test_id"],
method_args=["test_id"],
expected_kwargs={"server_id": "test_id"})
def test_server_ips_with_network_label(self):
self.verify_list(self.proxy.server_ips, server_ip.ServerIP,
paginated=False, method_args=["test_id"],
method_args=["test_id"],
method_kwargs={"network_label": "test_label"},
expected_kwargs={"server_id": "test_id",
"network_label": "test_label"})
def test_server_ips_without_network_label(self):
self.verify_list(self.proxy.server_ips, server_ip.ServerIP,
paginated=False, method_args=["test_id"],
method_args=["test_id"],
expected_kwargs={"server_id": "test_id",
"network_label": None})
@ -221,18 +215,15 @@ class TestComputeProxy(test_proxy_base.TestProxyBase):
def test_servers_detailed(self):
self.verify_list(self.proxy.servers, server.ServerDetail,
paginated=True,
method_kwargs={"details": True,
"changes_since": 1, "image": 2},
expected_kwargs={"changes_since": 1, "image": 2})
def test_servers_not_detailed(self):
self.verify_list(self.proxy.servers, server.Server,
paginated=True,
method_kwargs={"details": False,
"changes_since": 1, "image": 2},
expected_kwargs={"paginated": True,
"changes_since": 1, "image": 2})
expected_kwargs={"changes_since": 1, "image": 2})
def test_server_update(self):
self.verify_update(self.proxy.update_server, server.Server)
@ -421,13 +412,11 @@ class TestComputeProxy(test_proxy_base.TestProxyBase):
def test_availability_zones_not_detailed(self):
self.verify_list(self.proxy.availability_zones,
az.AvailabilityZone,
paginated=False,
method_kwargs={"details": False})
def test_availability_zones_detailed(self):
self.verify_list(self.proxy.availability_zones,
az.AvailabilityZoneDetail,
paginated=False,
method_kwargs={"details": True})
def test_get_all_server_metadata(self):
@ -479,17 +468,14 @@ class TestComputeProxy(test_proxy_base.TestProxyBase):
server_group.ServerGroup)
def test_server_groups(self):
self.verify_list(self.proxy.server_groups, server_group.ServerGroup,
paginated=False)
self.verify_list(self.proxy.server_groups, server_group.ServerGroup)
def test_hypervisors_not_detailed(self):
self.verify_list(self.proxy.hypervisors, hypervisor.Hypervisor,
paginated=False,
method_kwargs={"details": False})
def test_hypervisors_detailed(self):
self.verify_list(self.proxy.hypervisors, hypervisor.HypervisorDetail,
paginated=False,
method_kwargs={"details": True})
def test_find_hypervisor(self):
@ -502,8 +488,7 @@ class TestComputeProxy(test_proxy_base.TestProxyBase):
def test_services(self):
self.verify_list_no_kwargs(self.proxy.services,
service.Service,
paginated=False)
service.Service)
def test_enable_service(self):
self._verify('openstack.compute.v2.service.Service.enable',

10
openstack/tests/unit/database/v1/test_proxy.py
View File

@ -50,7 +50,7 @@ class TestDatabaseProxy(test_proxy_base.TestProxyBase):
def test_databases(self):
self.verify_list(self.proxy.databases, database.Database,
paginated=False, method_args=["id"],
method_args=["id"],
expected_kwargs={"instance_id": "id"})
def test_database_get(self):
@ -63,8 +63,7 @@ class TestDatabaseProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_flavor, flavor.Flavor)
def test_flavors(self):
self.verify_list(self.proxy.flavors, flavor.Flavor,
paginated=False)
self.verify_list(self.proxy.flavors, flavor.Flavor)
def test_instance_create_attrs(self):
self.verify_create(self.proxy.create_instance, instance.Instance)
@ -84,8 +83,7 @@ class TestDatabaseProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_instance, instance.Instance)
def test_instances(self):
self.verify_list(self.proxy.instances, instance.Instance,
paginated=False)
self.verify_list(self.proxy.instances, instance.Instance)
def test_instance_update(self):
self.verify_update(self.proxy.update_instance, instance.Instance)
@ -114,7 +112,7 @@ class TestDatabaseProxy(test_proxy_base.TestProxyBase):
"ignore_missing": True})
def test_users(self):
self.verify_list(self.proxy.users, user.User, paginated=False,
self.verify_list(self.proxy.users, user.User,
method_args=["test_instance"],
expected_kwargs={"instance_id": "test_instance"})

2
openstack/tests/unit/identity/v2/test_proxy.py
View File

@ -59,7 +59,7 @@ class TestIdentityProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_tenant, tenant.Tenant)
def test_tenants(self):
self.verify_list(self.proxy.tenants, tenant.Tenant, paginated=True)
self.verify_list(self.proxy.tenants, tenant.Tenant)
def test_tenant_update(self):
self.verify_update(self.proxy.update_tenant, tenant.Tenant)

25
openstack/tests/unit/identity/v3/test_proxy.py
View File

@ -53,8 +53,7 @@ class TestIdentityProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_credential, credential.Credential)
def test_credentials(self):
self.verify_list(self.proxy.credentials, credential.Credential,
paginated=False)
self.verify_list(self.proxy.credentials, credential.Credential)
def test_credential_update(self):
self.verify_update(self.proxy.update_credential, credential.Credential)
@ -75,7 +74,7 @@ class TestIdentityProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_domain, domain.Domain)
def test_domains(self):
self.verify_list(self.proxy.domains, domain.Domain, paginated=False)
self.verify_list(self.proxy.domains, domain.Domain)
def test_domain_update(self):
self.verify_update(self.proxy.update_domain, domain.Domain)
@ -98,8 +97,7 @@ class TestIdentityProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_endpoint, endpoint.Endpoint)
def test_endpoints(self):
self.verify_list(self.proxy.endpoints, endpoint.Endpoint,
paginated=False)
self.verify_list(self.proxy.endpoints, endpoint.Endpoint)
def test_endpoint_update(self):
self.verify_update(self.proxy.update_endpoint, endpoint.Endpoint)
@ -120,7 +118,7 @@ class TestIdentityProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_group, group.Group)
def test_groups(self):
self.verify_list(self.proxy.groups, group.Group, paginated=False)
self.verify_list(self.proxy.groups, group.Group)
def test_group_update(self):
self.verify_update(self.proxy.update_group, group.Group)
@ -141,7 +139,7 @@ class TestIdentityProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_policy, policy.Policy)
def test_policies(self):
self.verify_list(self.proxy.policies, policy.Policy, paginated=False)
self.verify_list(self.proxy.policies, policy.Policy)
def test_policy_update(self):
self.verify_update(self.proxy.update_policy, policy.Policy)
@ -162,13 +160,12 @@ class TestIdentityProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_project, project.Project)
def test_projects(self):
self.verify_list(self.proxy.projects, project.Project, paginated=False)
self.verify_list(self.proxy.projects, project.Project)
def test_user_projects(self):
self.verify_list(
self.proxy.user_projects,
project.UserProject,
paginated=True,
method_kwargs={'user': USER_ID},
expected_kwargs={'user_id': USER_ID}
)
@ -192,7 +189,7 @@ class TestIdentityProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_service, service.Service)
def test_services(self):
self.verify_list(self.proxy.services, service.Service, paginated=False)
self.verify_list(self.proxy.services, service.Service)
def test_service_update(self):
self.verify_update(self.proxy.update_service, service.Service)
@ -213,7 +210,7 @@ class TestIdentityProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_user, user.User)
def test_users(self):
self.verify_list(self.proxy.users, user.User, paginated=False)
self.verify_list(self.proxy.users, user.User)
def test_user_update(self):
self.verify_update(self.proxy.update_user, user.User)
@ -234,7 +231,7 @@ class TestIdentityProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_trust, trust.Trust)
def test_trusts(self):
self.verify_list(self.proxy.trusts, trust.Trust, paginated=False)
self.verify_list(self.proxy.trusts, trust.Trust)
def test_region_create_attrs(self):
self.verify_create(self.proxy.create_region, region.Region)
@ -252,7 +249,7 @@ class TestIdentityProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_region, region.Region)
def test_regions(self):
self.verify_list(self.proxy.regions, region.Region, paginated=False)
self.verify_list(self.proxy.regions, region.Region)
def test_region_update(self):
self.verify_update(self.proxy.update_region, region.Region)
@ -273,7 +270,7 @@ class TestIdentityProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_role, role.Role)
def test_roles(self):
self.verify_list(self.proxy.roles, role.Role, paginated=False)
self.verify_list(self.proxy.roles, role.Role)
def test_role_update(self):
self.verify_update(self.proxy.update_role, role.Role)

2
openstack/tests/unit/image/v1/test_proxy.py
View File

@ -36,7 +36,7 @@ class TestImageProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_image, image.Image)
def test_images(self):
self.verify_list(self.proxy.images, image.Image, paginated=True)
self.verify_list(self.proxy.images, image.Image)
def test_image_update(self):
self.verify_update(self.proxy.update_image, image.Image)

4
openstack/tests/unit/image/v2/test_proxy.py
View File

@ -74,7 +74,7 @@ class TestImageProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_image, image.Image)
def test_images(self):
self.verify_list(self.proxy.images, image.Image, paginated=True)
self.verify_list(self.proxy.images, image.Image)
def test_add_tag(self):
self._verify("openstack.image.v2.image.Image.add_tag",
@ -151,6 +151,6 @@ class TestImageProxy(test_proxy_base.TestProxyBase):
'image_id': 'image_id'})
def test_members(self):
self.verify_list(self.proxy.members, member.Member, paginated=False,
self.verify_list(self.proxy.members, member.Member,
method_args=('image_1',),
expected_kwargs={'image_id': 'image_1'})

7
openstack/tests/unit/key_manager/v1/test_proxy.py
View File

@ -40,8 +40,7 @@ class TestKeyManagerProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_container, container.Container)
def test_containers(self):
self.verify_list(self.proxy.containers, container.Container,
paginated=False)
self.verify_list(self.proxy.containers, container.Container)
def test_container_update(self):
self.verify_update(self.proxy.update_container, container.Container)
@ -62,7 +61,7 @@ class TestKeyManagerProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_order, order.Order)
def test_orders(self):
self.verify_list(self.proxy.orders, order.Order, paginated=False)
self.verify_list(self.proxy.orders, order.Order)
def test_order_update(self):
self.verify_update(self.proxy.update_order, order.Order)
@ -86,7 +85,7 @@ class TestKeyManagerProxy(test_proxy_base.TestProxyBase):
'openstack.key_manager.v1.secret.Secret')
def test_secrets(self):
self.verify_list(self.proxy.secrets, secret.Secret, paginated=False)
self.verify_list(self.proxy.secrets, secret.Secret)
def test_secret_update(self):
self.verify_update(self.proxy.update_secret, secret.Secret)

19
openstack/tests/unit/load_balancer/test_proxy.py
View File

@ -37,8 +37,7 @@ class TestLoadBalancerProxy(test_proxy_base.TestProxyBase):
def test_load_balancers(self):
self.verify_list(self.proxy.load_balancers,
lb.LoadBalancer,
paginated=True)
lb.LoadBalancer)
def test_load_balancer_get(self):
self.verify_get(self.proxy.get_load_balancer,
@ -90,8 +89,7 @@ class TestLoadBalancerProxy(test_proxy_base.TestProxyBase):
def test_listeners(self):
self.verify_list(self.proxy.listeners,
listener.Listener,
paginated=True)
listener.Listener)
def test_listener_get(self):
self.verify_get(self.proxy.get_listener,
@ -115,8 +113,7 @@ class TestLoadBalancerProxy(test_proxy_base.TestProxyBase):
def test_pools(self):
self.verify_list(self.proxy.pools,
pool.Pool,
paginated=True)
pool.Pool)
def test_pool_get(self):
self.verify_get(self.proxy.get_pool,
@ -141,7 +138,6 @@ class TestLoadBalancerProxy(test_proxy_base.TestProxyBase):
def test_members(self):
self.verify_list(self.proxy.members,
member.Member,
paginated=True,
method_kwargs={'pool': self.POOL_ID},
expected_kwargs={'pool_id': self.POOL_ID})
@ -181,8 +177,7 @@ class TestLoadBalancerProxy(test_proxy_base.TestProxyBase):
def test_health_monitors(self):
self.verify_list(self.proxy.health_monitors,
health_monitor.HealthMonitor,
paginated=True)
health_monitor.HealthMonitor)
def test_health_monitor_get(self):
self.verify_get(self.proxy.get_health_monitor,
@ -206,8 +201,7 @@ class TestLoadBalancerProxy(test_proxy_base.TestProxyBase):
def test_l7_policies(self):
self.verify_list(self.proxy.l7_policies,
l7_policy.L7Policy,
paginated=True)
l7_policy.L7Policy)
def test_l7_policy_get(self):
self.verify_get(self.proxy.get_l7_policy,
@ -232,7 +226,6 @@ class TestLoadBalancerProxy(test_proxy_base.TestProxyBase):
def test_l7_rules(self):
self.verify_list(self.proxy.l7_rules,
l7_rule.L7Rule,
paginated=True,
method_kwargs={'l7_policy': self.L7_POLICY_ID},
expected_kwargs={'l7policy_id': self.L7_POLICY_ID})
@ -271,7 +264,7 @@ class TestLoadBalancerProxy(test_proxy_base.TestProxyBase):
expected_kwargs={"l7policy_id": self.L7_POLICY_ID})
def test_quotas(self):
self.verify_list(self.proxy.quotas, quota.Quota, paginated=False)
self.verify_list(self.proxy.quotas, quota.Quota)
def test_quota_get(self):
self.verify_get(self.proxy.get_quota, quota.Quota)

6
openstack/tests/unit/message/v2/test_proxy.py
View File

@ -38,7 +38,7 @@ class TestMessageProxy(test_proxy_base.TestProxyBase):
'openstack.message.v2.queue.Queue')
def test_queues(self):
self.verify_list(self.proxy.queues, queue.Queue, paginated=True)
self.verify_list(self.proxy.queues, queue.Queue)
def test_queue_delete(self):
self.verify_delete(self.proxy.delete_queue, queue.Queue, False)
@ -73,7 +73,7 @@ class TestMessageProxy(test_proxy_base.TestProxyBase):
def test_messages(self):
self.verify_list(self.proxy.messages, message.Message,
paginated=True, method_args=["test_queue"],
method_args=["test_queue"],
expected_kwargs={"queue_name": "test_queue"})
@mock.patch.object(proxy_base.Proxy, '_get_resource')
@ -150,7 +150,7 @@ class TestMessageProxy(test_proxy_base.TestProxyBase):
def test_subscriptions(self):
self.verify_list(self.proxy.subscriptions, subscription.Subscription,
paginated=True, method_args=["test_queue"],
method_args=["test_queue"],
expected_kwargs={"queue_name": "test_queue"})
@mock.patch.object(proxy_base.Proxy, '_get_resource')

95
openstack/tests/unit/network/v2/test_proxy.py
View File

@ -92,8 +92,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
def test_address_scopes(self):
self.verify_list(self.proxy.address_scopes,
address_scope.AddressScope,
paginated=False)
address_scope.AddressScope)
def test_address_scope_update(self):
self.verify_update(self.proxy.update_address_scope,
@ -106,22 +105,19 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_agent, agent.Agent)
def test_agents(self):
self.verify_list(self.proxy.agents, agent.Agent,
paginated=False)
self.verify_list(self.proxy.agents, agent.Agent)
def test_agent_update(self):
self.verify_update(self.proxy.update_agent, agent.Agent)
def test_availability_zones(self):
self.verify_list_no_kwargs(self.proxy.availability_zones,
availability_zone.AvailabilityZone,
paginated=False)
availability_zone.AvailabilityZone)
def test_dhcp_agent_hosting_networks(self):
self.verify_list(
self.proxy.dhcp_agent_hosting_networks,
network.DHCPAgentHostingNetwork,
paginated=False,
method_kwargs={'agent': AGENT_ID},
expected_kwargs={'agent_id': AGENT_ID}
)
@ -130,7 +126,6 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
self.verify_list(
self.proxy.network_hosting_dhcp_agents,
agent.NetworkHostingDHCPAgent,
paginated=False,
method_kwargs={'network': NETWORK_ID},
expected_kwargs={'network_id': NETWORK_ID}
)
@ -139,8 +134,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
self.verify_find(self.proxy.find_extension, extension.Extension)
def test_extensions(self):
self.verify_list(self.proxy.extensions, extension.Extension,
paginated=False)
self.verify_list(self.proxy.extensions, extension.Extension)
def test_floating_ip_create_attrs(self):
self.verify_create(self.proxy.create_ip, floating_ip.FloatingIP)
@ -160,8 +154,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_ip, floating_ip.FloatingIP)
def test_ips(self):
self.verify_list(self.proxy.ips, floating_ip.FloatingIP,
paginated=False)
self.verify_list(self.proxy.ips, floating_ip.FloatingIP)
def test_floating_ip_update(self):
self.verify_update(self.proxy.update_ip, floating_ip.FloatingIP)
@ -188,8 +181,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
def test_health_monitors(self):
self.verify_list(self.proxy.health_monitors,
health_monitor.HealthMonitor,
paginated=False)
health_monitor.HealthMonitor)
def test_health_monitor_update(self):
self.verify_update(self.proxy.update_health_monitor,
@ -213,8 +205,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_listener, listener.Listener)
def test_listeners(self):
self.verify_list(self.proxy.listeners, listener.Listener,
paginated=False)
self.verify_list(self.proxy.listeners, listener.Listener)
def test_listener_update(self):
self.verify_update(self.proxy.update_listener, listener.Listener)
@ -241,8 +232,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
def test_load_balancers(self):
self.verify_list(self.proxy.load_balancers,
load_balancer.LoadBalancer,
paginated=False)
load_balancer.LoadBalancer)
def test_load_balancer_update(self):
self.verify_update(self.proxy.update_load_balancer,
@ -270,8 +260,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
def test_metering_labels(self):
self.verify_list(self.proxy.metering_labels,
metering_label.MeteringLabel,
paginated=False)
metering_label.MeteringLabel)
def test_metering_label_update(self):
self.verify_update(self.proxy.update_metering_label,
@ -299,8 +288,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
def test_metering_label_rules(self):
self.verify_list(self.proxy.metering_label_rules,
metering_label_rule.MeteringLabelRule,
paginated=False)
metering_label_rule.MeteringLabelRule)
def test_metering_label_rule_update(self):
self.verify_update(self.proxy.update_metering_label_rule,
@ -331,8 +319,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_network, network.Network)
def test_networks(self):
self.verify_list(self.proxy.networks, network.Network,
paginated=False)
self.verify_list(self.proxy.networks, network.Network)
def test_network_update(self):
self.verify_update(self.proxy.update_network, network.Network)
@ -353,8 +340,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
self.verify_update(self.proxy.update_flavor, flavor.Flavor)
def test_flavors(self):
self.verify_list(self.proxy.flavors, flavor.Flavor,
paginated=True)
self.verify_list(self.proxy.flavors, flavor.Flavor)
def test_service_profile_create_attrs(self):
self.verify_create(self.proxy.create_service_profile,
@ -374,7 +360,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
def test_service_profiles(self):
self.verify_list(self.proxy.service_profiles,
service_profile.ServiceProfile, paginated=True)
service_profile.ServiceProfile)
def test_service_profile_update(self):
self.verify_update(self.proxy.update_service_profile,
@ -425,7 +411,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
def test_pool_members(self):
self.verify_list(self.proxy.pool_members, pool_member.PoolMember,
paginated=False, method_args=["test_id"],
method_args=["test_id"],
expected_kwargs={"pool_id": "test_id"})
def test_pool_member_update(self):
@ -451,7 +437,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_pool, pool.Pool)
def test_pools(self):
self.verify_list(self.proxy.pools, pool.Pool, paginated=False)
self.verify_list(self.proxy.pools, pool.Pool)
def test_pool_update(self):
self.verify_update(self.proxy.update_pool, pool.Pool)
@ -472,7 +458,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_port, port.Port)
def test_ports(self):
self.verify_list(self.proxy.ports, port.Port, paginated=False)
self.verify_list(self.proxy.ports, port.Port)
def test_port_update(self):
self.verify_update(self.proxy.update_port, port.Port)
@ -520,7 +506,6 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
self.verify_list(
self.proxy.qos_bandwidth_limit_rules,
qos_bandwidth_limit_rule.QoSBandwidthLimitRule,
paginated=False,
method_kwargs={'qos_policy': QOS_POLICY_ID},
expected_kwargs={'qos_policy_id': QOS_POLICY_ID})
@ -578,7 +563,6 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
self.verify_list(
self.proxy.qos_dscp_marking_rules,
qos_dscp_marking_rule.QoSDSCPMarkingRule,
paginated=False,
method_kwargs={'qos_policy': QOS_POLICY_ID},
expected_kwargs={'qos_policy_id': QOS_POLICY_ID})
@ -637,7 +621,6 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
self.verify_list(
self.proxy.qos_minimum_bandwidth_rules,
qos_minimum_bandwidth_rule.QoSMinimumBandwidthRule,
paginated=False,
method_kwargs={'qos_policy': QOS_POLICY_ID},
expected_kwargs={'qos_policy_id': QOS_POLICY_ID})
@ -671,8 +654,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_qos_policy, qos_policy.QoSPolicy)
def test_qos_policies(self):
self.verify_list(self.proxy.qos_policies, qos_policy.QoSPolicy,
paginated=False)
self.verify_list(self.proxy.qos_policies, qos_policy.QoSPolicy)
def test_qos_policy_update(self):
self.verify_update(self.proxy.update_qos_policy, qos_policy.QoSPolicy)
@ -686,8 +668,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
qos_rule_type.QoSRuleType)
def test_qos_rule_types(self):
self.verify_list(self.proxy.qos_rule_types, qos_rule_type.QoSRuleType,
paginated=False)
self.verify_list(self.proxy.qos_rule_types, qos_rule_type.QoSRuleType)
def test_quota_delete(self):
self.verify_delete(self.proxy.delete_quota, quota.Quota, False)
@ -724,7 +705,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
mock_get.assert_called_once_with(quota.Quota, 'QUOTA_ID')
def test_quotas(self):
self.verify_list(self.proxy.quotas, quota.Quota, paginated=False)
self.verify_list(self.proxy.quotas, quota.Quota)
def test_quota_update(self):
self.verify_update(self.proxy.update_quota, quota.Quota)
@ -748,8 +729,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_rbac_policy, rbac_policy.RBACPolicy)
def test_rbac_policies(self):
self.verify_list(self.proxy.rbac_policies,
rbac_policy.RBACPolicy, paginated=False)
self.verify_list(self.proxy.rbac_policies, rbac_policy.RBACPolicy)
def test_rbac_policy_update(self):
self.verify_update(self.proxy.update_rbac_policy,
@ -771,7 +751,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_router, router.Router)
def test_routers(self):
self.verify_list(self.proxy.routers, router.Router, paginated=False)
self.verify_list(self.proxy.routers, router.Router)
def test_router_update(self):
self.verify_update(self.proxy.update_router, router.Router)
@ -862,7 +842,6 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
self.verify_list(
self.proxy.routers_hosting_l3_agents,
agent.RouterL3Agent,
paginated=False,
method_kwargs={'router': ROUTER_ID},
expected_kwargs={'router_id': ROUTER_ID},
)
@ -871,7 +850,6 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
self.verify_list(
self.proxy.agent_hosted_routers,
router.L3AgentRouter,
paginated=False,
method_kwargs={'agent': AGENT_ID},
expected_kwargs={'agent_id': AGENT_ID},
)
@ -898,8 +876,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
def test_firewall_groups(self):
self.verify_list(self.proxy.firewall_groups,
firewall_group.FirewallGroup,
paginated=False)
firewall_group.FirewallGroup)
def test_firewall_group_update(self):
self.verify_update(self.proxy.update_firewall_group,
@ -927,8 +904,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
def test_firewall_policies(self):
self.verify_list(self.proxy.firewall_policies,
firewall_policy.FirewallPolicy,
paginated=False)
firewall_policy.FirewallPolicy)
def test_firewall_policy_update(self):
self.verify_update(self.proxy.update_firewall_policy,
@ -956,8 +932,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
def test_firewall_rules(self):
self.verify_list(self.proxy.firewall_rules,
firewall_rule.FirewallRule,
paginated=False)
firewall_rule.FirewallRule)
def test_firewall_rule_update(self):
self.verify_update(self.proxy.update_firewall_rule,
@ -985,8 +960,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
def test_network_segment_ranges(self):
self.verify_list(self.proxy.network_segment_ranges,
network_segment_range.NetworkSegmentRange,
paginated=False)
network_segment_range.NetworkSegmentRange)
def test_network_segment_range_update(self):
self.verify_update(self.proxy.update_network_segment_range,
@ -1014,8 +988,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
def test_security_groups(self):
self.verify_list(self.proxy.security_groups,
security_group.SecurityGroup,
paginated=False)
security_group.SecurityGroup)
def test_security_group_update(self):
self.verify_update(self.proxy.update_security_group,
@ -1043,8 +1016,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
def test_security_group_rules(self):
self.verify_list(self.proxy.security_group_rules,
security_group_rule.SecurityGroupRule,
paginated=False)
security_group_rule.SecurityGroupRule)
def test_segment_create_attrs(self):
self.verify_create(self.proxy.create_segment, segment.Segment)
@ -1062,7 +1034,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_segment, segment.Segment)
def test_segments(self):
self.verify_list(self.proxy.segments, segment.Segment, paginated=False)
self.verify_list(self.proxy.segments, segment.Segment)
def test_segment_update(self):
self.verify_update(self.proxy.update_segment, segment.Segment)
@ -1083,7 +1055,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_subnet, subnet.Subnet)
def test_subnets(self):
self.verify_list(self.proxy.subnets, subnet.Subnet, paginated=False)
self.verify_list(self.proxy.subnets, subnet.Subnet)
def test_subnet_update(self):
self.verify_update(self.proxy.update_subnet, subnet.Subnet)
@ -1110,8 +1082,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
def test_subnet_pools(self):
self.verify_list(self.proxy.subnet_pools,
subnet_pool.SubnetPool,
paginated=False)
subnet_pool.SubnetPool)
def test_subnet_pool_update(self):
self.verify_update(self.proxy.update_subnet_pool,
@ -1137,8 +1108,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
self.verify_get(self.proxy.get_vpn_service, vpn_service.VPNService)
def test_vpn_services(self):
self.verify_list(self.proxy.vpn_services, vpn_service.VPNService,
paginated=False)
self.verify_list(self.proxy.vpn_services, vpn_service.VPNService)
def test_vpn_service_update(self):
self.verify_update(self.proxy.update_vpn_service,
@ -1146,8 +1116,7 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase):
def test_service_provider(self):
self.verify_list(self.proxy.service_providers,
service_provider.ServiceProvider,
paginated=False)
service_provider.ServiceProvider)
def test_auto_allocated_topology_get(self):
self.verify_get(self.proxy.get_auto_allocated_topology,

11
openstack/tests/unit/orchestration/v1/test_proxy.py
View File

@ -43,7 +43,7 @@ class TestOrchestrationProxy(test_proxy_base.TestProxyBase):
self.verify_find(self.proxy.find_stack, stack.Stack)
def test_stacks(self):
self.verify_list(self.proxy.stacks, stack.Stack, paginated=False)
self.verify_list(self.proxy.stacks, stack.Stack)
def test_get_stack(self):
self.verify_get(self.proxy.get_stack, stack.Stack)
@ -195,7 +195,7 @@ class TestOrchestrationProxy(test_proxy_base.TestProxyBase):
stk = stack.Stack(id=stack_id, name=stack_name)
self.verify_list(self.proxy.resources, resource.Resource,
paginated=False, method_args=[stk],
method_args=[stk],
expected_kwargs={'stack_name': stack_name,
'stack_id': stack_id})
@ -209,7 +209,7 @@ class TestOrchestrationProxy(test_proxy_base.TestProxyBase):
mock_find.return_value = stk
self.verify_list(self.proxy.resources, resource.Resource,
paginated=False, method_args=[stack_id],
method_args=[stack_id],
expected_kwargs={'stack_name': stack_name,
'stack_id': stack_id})
@ -232,8 +232,7 @@ class TestOrchestrationProxy(test_proxy_base.TestProxyBase):
sc.SoftwareConfig)
def test_software_configs(self):
self.verify_list(self.proxy.software_configs, sc.SoftwareConfig,
paginated=True)
self.verify_list(self.proxy.software_configs, sc.SoftwareConfig)
def test_get_software_config(self):
self.verify_get(self.proxy.get_software_config, sc.SoftwareConfig)
@ -250,7 +249,7 @@ class TestOrchestrationProxy(test_proxy_base.TestProxyBase):
def test_software_deployments(self):
self.verify_list(self.proxy.software_deployments,
sd.SoftwareDeployment, paginated=False)
sd.SoftwareDeployment)
def test_get_software_deployment(self):
self.verify_get(self.proxy.get_software_deployment,

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

@ -200,11 +200,12 @@ class TestProxyBase(base.TestCase):
expected_result="result",
**kwargs)
def verify_list(self, test_method, resource_type, paginated=False,
def verify_list(self, test_method, resource_type,
mock_method="openstack.proxy.Proxy._list",
**kwargs):
expected_kwargs = kwargs.pop("expected_kwargs", {})
expected_kwargs.update({"paginated": paginated})
if 'paginated' in kwargs:
expected_kwargs.update({"paginated": kwargs['paginated']})
method_kwargs = kwargs.pop("method_kwargs", {})
self._verify2(mock_method, test_method,
method_kwargs=method_kwargs,
@ -214,12 +215,11 @@ class TestProxyBase(base.TestCase):
**kwargs)
def verify_list_no_kwargs(self, test_method, resource_type,
paginated=False,
mock_method="openstack.proxy.Proxy._list"):
self._verify2(mock_method, test_method,
method_kwargs={},
expected_args=[resource_type],
expected_kwargs={"paginated": paginated},
expected_kwargs={},
expected_result=["result"])
def verify_update(self, test_method, resource_type, value=None,

1
openstack/tests/unit/test_resource.py
View File

@ -1441,6 +1441,7 @@ class TestResourceActions(base.TestCase):
mock_response = mock.Mock()
mock_response.status_code = 200
mock_response.json.return_value = {key: [{"id": id_value}]}
mock_response.links = []
self.session.get.return_value = mock_response

6
openstack/tests/unit/workflow/test_proxy.py
View File

@ -23,13 +23,11 @@ class TestWorkflowProxy(test_proxy_base.TestProxyBase):
def test_workflows(self):
self.verify_list(self.proxy.workflows,
workflow.Workflow,
paginated=True)
workflow.Workflow)
def test_executions(self):
self.verify_list(self.proxy.executions,
execution.Execution,
paginated=True)
execution.Execution)
def test_workflow_get(self):
self.verify_get(self.proxy.get_workflow,

4
openstack/workflow/v2/_proxy.py
View File

@ -57,7 +57,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of workflow instances.
"""
return self._list(_workflow.Workflow, paginated=True, **query)
return self._list(_workflow.Workflow, **query)
def delete_workflow(self, value, ignore_missing=True):
"""Delete a workflow
@ -133,7 +133,7 @@ class Proxy(proxy.Proxy):
:returns: A generator of execution instances.
"""
return self._list(_execution.Execution, paginated=True, **query)
return self._list(_execution.Execution, **query)
def delete_execution(self, value, ignore_missing=True):
"""Delete an execution