update due to latest openstacksdk

Author: gtema

otcextensions/sdk/auto_scaling/v1/_proxy.py

@@ -41,10 +41,7 @@ def groups(self, **query):
         :returns: A generator of group
             (:class:`~otcextensions.sdk.auto_scaling.v1.group.Group`) instances
         """
-        return self._list(
-            _group.Group, paginated=True,
-            **query
-        )
+        return self._list(_group.Group, **query)
 
     def create_group(self, **attrs):
         """Create a new group from attributes
@@ -158,9 +155,7 @@ def configs(self, **query):
             (:class:`~otcextensions.sdk.auto_scaling.v1.config.Config`)
             instances
         """
-        return self._list(
-            _config.Config, paginated=True,
-            **query)
+        return self._list(_config.Config, **query)
 
     def create_config(self, name, **attrs):
         """Create a new config from config name and instance-config attributes
@@ -188,9 +183,7 @@ def get_config(self, config):
         :returns: Config instance
         :rtype: :class:`~otcextensions.sdk.auto_scaling.v1.config.Config`
         """
-        return self._get(
-            _config.Config, config
-        )
+        return self._get(_config.Config, config)
 
     # Name is not unique, so find might return multiple results
     def find_config(self, name_or_id, ignore_missing=True):
@@ -260,10 +253,7 @@ def policies(self, group, **query):
             instances
         """
         group = self._get_resource(_group.Group, group)
-        return self._list(
-            _policy.Policy, paginated=True,
-            scaling_group_id=group.id,
-            **query)
+        return self._list(_policy.Policy, scaling_group_id=group.id, **query)
 
     def create_policy(self, **attrs):
         """Create a new policy from attributes
@@ -383,9 +373,8 @@ def instances(self, group, **query):
             (:class:`~otcextensions.sdk.auto_scaling.v1.instance.Instance`)
         """
         group = self._get_resource(_group.Group, group)
-        return self._list(
-            _instance.Instance, paginated=True,
-            scaling_group_id=group.id, **query)
+        return self._list(_instance.Instance,
+                          scaling_group_id=group.id, **query)
 
     def remove_instance(self, instance, delete_instance=False,
                         ignore_missing=True):
@@ -456,7 +445,6 @@ def activities(self, group, **query):
         """
         group = self._get_resource(_group.Group, group)
         return self._list(_activity.Activity,
-                          paginated=True,
                           scaling_group_id=group.id,
                           **query)
 

otcextensions/sdk/cts/v1/_proxy.py

@@ -24,15 +24,14 @@ def traces(self, tracker='system', limit=50, **query):
 
         :param tracker: The name or an tracker of
             :class:`~otcextensions.sdk.cts.v1.tracker.Tracker`
+        :param limit: default limit of resources
         :returns: A generator of tracker object of
             :class:`~otcextensions.sdk.cts.v1.trace.Trace`
         """
         if isinstance(tracker, str):
             tracker = self._get_resource(_tracker.Tracker, {'name': tracker})
         query['limit'] = limit
-        return self._list(
-            _trace.Trace, paginated=True,
-            tracker_name=tracker.name, **query)
+        return self._list(_trace.Trace, tracker_name=tracker.name, **query)
 
     def get_tracker(self, tracker):
         """Get detail about a given tracker

otcextensions/sdk/dcs/v1/_proxy.py

@@ -38,7 +38,7 @@ def instances(self, **query):
         :returns: A generator of Instance object of
             :class:`~otcextensions.sdk.dcs.v1.instance.Instance`
         """
-        return self._list(_instance.Instance, paginated=False, **query)
+        return self._list(_instance.Instance, **query)
 
     def get_instance(self, instance):
         """Get detail about a given instance

otcextensions/sdk/deh/v1/_proxy.py

@@ -45,7 +45,7 @@ def hosts(self, **query):
         :returns: A generator of host
             :class:`~otcextensions.sdk.deh.v1.host.Host` instances
         """
-        return self._list(_host.Host, paginated=True, **query)
+        return self._list(_host.Host, **query)
 
     def create_host(self, **attrs):
         """Create (allocate) a new host from attributes
@@ -125,10 +125,7 @@ def servers(self, host, **query):
             :class:`~otcextensions.sdk.deh.v1.server.Server` instances
         """
         host = self._get_resource(_host.Host, host)
-        return self._list(
-            _server.Server, dedicated_host_id=host.id,
-            paginated=False, **query
-        )
+        return self._list(_server.Server, dedicated_host_id=host.id, **query)
 
     # ======== HostTypes ========
     def host_types(self, az):

otcextensions/sdk/dns/v2/_proxy.py

@@ -32,7 +32,7 @@ def zones(self, **query):
         :returns: A generator of zone
             :class:`~otcextensions.sdk.dns.v2.zone.Zone` instances
         """
-        return self._list(_zone.Zone, paginated=True, **query)
+        return self._list(_zone.Zone, **query)
 
     def create_zone(self, **attrs):
         """Create a new zone from attributes
@@ -156,7 +156,7 @@ def recordsets(self, zone, **query):
             query.update({'zone_id': zone.id})
         else:
             resource_cls = _rs.Recordset
-        return self._list(resource_cls, paginated=True, **query)
+        return self._list(resource_cls, **query)
 
     def create_recordset(self, zone, **attrs):
         """Create a new recordset in the zone
@@ -229,7 +229,7 @@ def ptrs(self, **query):
         :returns: A generator of PTR
             :class:`~otcextensions.sdk.dns.v2.ptr.PTR` instances
         """
-        return self._list(_ptr.PTR, paginated=True, **query)
+        return self._list(_ptr.PTR, **query)
 
     def create_ptr(self, region, floating_ip_id, **attrs):
         """Set FloatingIP PTR record

otcextensions/sdk/kms/v1/_proxy.py

@@ -34,7 +34,7 @@ def keys(self, **query):
         :returns: a generator of
             (:class:`~otcextensions.sdk.kms.v1.key.Key`) instances
         """
-        return self._list(_key.Key, paginated=True, **query)
+        return self._list(_key.Key, **query)
 
     def create_key(self, **attrs):
         """Create master key

otcextensions/sdk/obs/v1/_proxy.py

@@ -82,7 +82,6 @@ def containers(self, **query):
             :class:`~otcextensions.sdk.obs.v1.container.Container` objects.
         """
         return self._list(_container.Container,
-                          paginated=True,
                           requests_auth=self._get_req_auth(),
                           **query)
 
@@ -210,8 +209,7 @@ def objects(self, container, **query):
         return self._list(
             _obj.Object,
             endpoint_override=endpoint,
-            requests_auth=self._get_req_auth(endpoint),
-            paginated=True, **query)
+            requests_auth=self._get_req_auth(endpoint), **query)
 
     def _get_container_name(self, obj=None, container=None):
         if obj is not None:

otcextensions/tests/unit/sdk/anti_ddos/v1/test_proxy.py

@@ -29,6 +29,7 @@ def test_floating_ips(self):
         self.verify_list(
             self.proxy.floating_ips, _floating_ip.FloatingIP,
             mock_method='otcextensions.sdk.sdk_proxy.Proxy._list',
+            expected_kwargs={'paginated': False}
         )
 
     def test_unprotect_floating_ip(self):
@@ -51,8 +52,9 @@ def test_update_floating_ip_policies(self):
 
     def test_configs(self):
         self.verify_list(
-            self.proxy.configs, _config.Config, False,
+            self.proxy.configs, _config.Config,
             mock_method='otcextensions.sdk.sdk_proxy.Proxy._list',
+            expected_kwargs={'paginated': False}
         )
 
     def test_get_floating_ip_status(self):
@@ -66,25 +68,26 @@ def test_get_floating_ip_status(self):
 
     def test_float_ip_logs(self):
         self.verify_list(
-            self.proxy.floating_ip_events, _status.FloatingIPEvent, False,
+            self.proxy.floating_ip_events, _status.FloatingIPEvent,
             mock_method='otcextensions.sdk.sdk_proxy.Proxy._list',
             method_kwargs={
                 'floating_ip_id': 'ip_id'
             },
             expected_kwargs={
+                'paginated': False,
                 'floating_ip_id': 'ip_id'
             }
         )
 
     def test_float_ip_stat_day(self):
         self.verify_list(
             self.proxy.floating_ip_stat_day, _status.FloatingIPDayStat,
-            False,
             mock_method='otcextensions.sdk.sdk_proxy.Proxy._list',
             method_kwargs={
                 'floating_ip_id': 'ip_id'
             },
             expected_kwargs={
+                'paginated': False,
                 'floating_ip_id': 'ip_id'
             }
         )

otcextensions/tests/unit/sdk/auto_scaling/v1/test_proxy.py

@@ -35,7 +35,6 @@ def test_list(self):
             method_kwargs={
                 'some_arg': 'arg_value',
             },
-            paginated=True,
             expected_kwargs={
                 'some_arg': 'arg_value',
             }
@@ -106,7 +105,6 @@ def test_list(self):
             method_kwargs={
                 'some_arg': 'arg_value',
             },
-            paginated=True,
             expected_kwargs={
                 'some_arg': 'arg_value',
             }
@@ -165,7 +163,6 @@ def test_list(self):
                 'some_arg': 'arg_value',
                 'group': 'group_id'
             },
-            paginated=True,
             expected_kwargs={
                 'some_arg': 'arg_value',
                 'scaling_group_id': 'group_id',
@@ -251,7 +248,6 @@ def test_list(self):
                 'some_arg': 'arg_value',
                 'group': 'group_id'
             },
-            paginated=True,
             expected_kwargs={
                 'some_arg': 'arg_value',
                 'scaling_group_id': 'group_id',
@@ -265,16 +261,18 @@ def test_list(self):
         self.verify_list(
             self.proxy.quotas, _quota.Quota,
             mock_method='otcextensions.sdk.sdk_proxy.Proxy._list',
-            paginated=False,
+            expected_kwargs={
+                'paginated': False
+            }
         )
 
     def test_list_scaling(self):
         self.verify_list(
             self.proxy.quotas, _quota.ScalingQuota,
             mock_method='otcextensions.sdk.sdk_proxy.Proxy._list',
             method_args=['INSTANCE'],
-            paginated=False,
             expected_kwargs={
+                'paginated': False,
                 'scaling_group_id': 'INSTANCE'
             }
         )
@@ -290,7 +288,6 @@ def test_list(self):
             expected_kwargs={
                 'scaling_group_id': 'group'
             },
-            paginated=True,
         )
 
     def test_batch_action_remove(self):

otcextensions/tests/unit/sdk/cce/v1/test_proxy.py

@@ -38,8 +38,9 @@ def test_list(self):
             self.proxy.clusters, _cluster.Cluster,
             mock_method='otcextensions.sdk.sdk_proxy.Proxy._list',
             method_kwargs={},
-            paginated=False,
-            expected_kwargs={}
+            expected_kwargs={
+                'paginated': False
+            }
         )
 
     def test_get(self):
@@ -85,8 +86,8 @@ def test_list(self):
                 mock_method='otcextensions.sdk.sdk_proxy.Proxy._list',
                 method_args=['cluster_id'],
                 method_kwargs={},
-                paginated=False,
                 expected_kwargs={
+                    'paginated': False,
                     'cluster_uuid': 'cluster_id'
                 }
             )