openstack
/
python-octaviaclient
Code Issues Proposed changes

Fix new pylint errors 

Pylint 2.6.0 added two new checkers [1] that make pep8 validation to
fail:

- raise-missing-from (W0707)
- super-with-arguments (R1725)

[1] http://pylint.pycqa.org/en/latest/technical_reference/features.html

Change-Id: I861115d01315c7c3d8c235efd20ccde04bddea46
This commit is contained in:
Carlos Goncalves 2020-08-25 21:31:21 +02:00
parent af16d31266
commit 09f8acc306
35 changed files with 185 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
octaviaclient/api/exceptions.py
View File

@ -18,7 +18,7 @@ class OctaviaClientException(Exception):
def __init__(self, code, message=None, request_id=None):
self.code = code
self.message = message or self.__class__.message
super(OctaviaClientException, self).__init__(self.message)
super().__init__(self.message)
self.request_id = request_id
def __str__(self):

4
octaviaclient/api/v2/octavia.py
View File

@ -56,7 +56,7 @@ def correct_return_codes(func):
raise OctaviaClientException(
code=code,
message=message,
request_id=request_id)
request_id=request_id) from e
return response
return wrapper
@ -67,7 +67,7 @@ class OctaviaAPI(api.BaseAPI):
_endpoint_suffix = '/v2.0'
def __init__(self, endpoint=None, **kwargs):
super(OctaviaAPI, self).__init__(endpoint=endpoint, **kwargs)
super().__init__(endpoint=endpoint, **kwargs)
self.endpoint = self.endpoint.rstrip('/')
self._build_url()

10
octaviaclient/osc/v2/amphora.py
View File

@ -26,7 +26,7 @@ class ListAmphora(lister.Lister):
"""List amphorae"""
def get_parser(self, prog_name):
parser = super(ListAmphora, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'--loadbalancer',
@ -97,7 +97,7 @@ class ShowAmphora(command.ShowOne):
"""Show the details of a single amphora"""
def get_parser(self, prog_name):
parser = super(ShowAmphora, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'amphora_id',
@ -127,7 +127,7 @@ class ConfigureAmphora(command.Command):
"""Update the amphora agent configuration"""
def get_parser(self, prog_name):
parser = super(ConfigureAmphora, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'amphora_id',
@ -166,7 +166,7 @@ class FailoverAmphora(command.Command):
"""Force failover an amphora"""
def get_parser(self, prog_name):
parser = super(FailoverAmphora, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'amphora_id',
@ -209,7 +209,7 @@ class ShowAmphoraStats(command.ShowOne):
"""Shows the current statistics for an amphora."""
def get_parser(self, prog_name):
parser = super(ShowAmphoraStats, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'--listener',

12
octaviaclient/osc/v2/availabilityzone.py
View File

@ -29,7 +29,7 @@ class CreateAvailabilityzone(command.ShowOne):
"""Create an octavia availability zone"""
def get_parser(self, prog_name):
parser = super(CreateAvailabilityzone, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'--name',
@ -83,7 +83,7 @@ class DeleteAvailabilityzone(command.Command):
"""Delete an availability zone"""
def get_parser(self, prog_name):
parser = super(DeleteAvailabilityzone, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'availabilityzone',
@ -106,7 +106,7 @@ class ListAvailabilityzone(lister.Lister):
"""List availability zones"""
def get_parser(self, prog_name):
parser = super(ListAvailabilityzone, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'--name',
@ -150,7 +150,7 @@ class ShowAvailabilityzone(command.ShowOne):
"""Show the details for a single availability zone"""
def get_parser(self, prog_name):
parser = super(ShowAvailabilityzone, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'availabilityzone',
@ -179,7 +179,7 @@ class SetAvailabilityzone(command.Command):
"""Update an availability zone"""
def get_parser(self, prog_name):
parser = super(SetAvailabilityzone, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'availabilityzone',
@ -221,7 +221,7 @@ class UnsetAvailabilityzone(command.Command):
"""Clear availability zone settings"""
def get_parser(self, prog_name):
parser = super(UnsetAvailabilityzone, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'availabilityzone',

10
octaviaclient/osc/v2/availabilityzoneprofile.py
View File

@ -27,7 +27,7 @@ class CreateAvailabilityzoneProfile(command.ShowOne):
"""Create an octavia availability zone profile"""
def get_parser(self, prog_name):
parser = super(CreateAvailabilityzoneProfile, self).get_parser(
parser = super().get_parser(
prog_name)
parser.add_argument(
@ -69,7 +69,7 @@ class DeleteAvailabilityzoneProfile(command.Command):
"""Delete an availability zone profile"""
def get_parser(self, prog_name):
parser = super(DeleteAvailabilityzoneProfile, self).get_parser(
parser = super().get_parser(
prog_name)
parser.add_argument(
@ -93,7 +93,7 @@ class ListAvailabilityzoneProfile(lister.Lister):
"""List availability zone profiles"""
def get_parser(self, prog_name):
parser = super(ListAvailabilityzoneProfile, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'--name',
@ -125,7 +125,7 @@ class ShowAvailabilityzoneProfile(command.ShowOne):
"""Show the details of a single availability zone profile"""
def get_parser(self, prog_name):
parser = super(ShowAvailabilityzoneProfile, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'availabilityzoneprofile',
@ -153,7 +153,7 @@ class SetAvailabilityzoneProfile(command.Command):
"""Update an availability zone profile"""
def get_parser(self, prog_name):
parser = super(SetAvailabilityzoneProfile, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'availabilityzoneprofile',

12
octaviaclient/osc/v2/flavor.py
View File

@ -31,7 +31,7 @@ class CreateFlavor(command.ShowOne):
"""Create a octavia flavor"""
def get_parser(self, prog_name):
parser = super(CreateFlavor, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'--name',
@ -85,7 +85,7 @@ class DeleteFlavor(command.Command):
"""Delete a flavor"""
def get_parser(self, prog_name):
parser = super(DeleteFlavor, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'flavor',
@ -108,7 +108,7 @@ class ListFlavor(lister.Lister):
"""List flavor"""
def get_parser(self, prog_name):
parser = super(ListFlavor, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'--name',
@ -152,7 +152,7 @@ class ShowFlavor(command.ShowOne):
"""Show the details for a single flavor"""
def get_parser(self, prog_name):
parser = super(ShowFlavor, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'flavor',
@ -189,7 +189,7 @@ class SetFlavor(command.Command):
"""Update a flavor"""
def get_parser(self, prog_name):
parser = super(SetFlavor, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'flavor',
@ -231,7 +231,7 @@ class UnsetFlavor(command.Command):
"""Clear flavor settings"""
def get_parser(self, prog_name):
parser = super(UnsetFlavor, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'flavor',

10
octaviaclient/osc/v2/flavorprofile.py
View File

@ -29,7 +29,7 @@ class CreateFlavorProfile(command.ShowOne):
"""Create a octavia flavor profile"""
def get_parser(self, prog_name):
parser = super(CreateFlavorProfile, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'--name',
@ -69,7 +69,7 @@ class DeleteFlavorProfile(command.Command):
"""Delete a flavor profile"""
def get_parser(self, prog_name):
parser = super(DeleteFlavorProfile, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'flavorprofile',
@ -92,7 +92,7 @@ class ListFlavorProfile(lister.Lister):
"""List flavor profile"""
def get_parser(self, prog_name):
parser = super(ListFlavorProfile, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'--name',
@ -122,7 +122,7 @@ class ShowFlavorProfile(command.ShowOne):
"""Show the details for a single flavor profile"""
def get_parser(self, prog_name):
parser = super(ShowFlavorProfile, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'flavorprofile',
@ -159,7 +159,7 @@ class SetFlavorProfile(command.Command):
"""Update a flavor profile"""
def get_parser(self, prog_name):
parser = super(SetFlavorProfile, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'flavorprofile',

12
octaviaclient/osc/v2/health_monitor.py
View File

@ -37,7 +37,7 @@ class CreateHealthMonitor(command.ShowOne):
"""Create a health monitor"""
def get_parser(self, prog_name):
parser = super(CreateHealthMonitor, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'pool',
@ -176,7 +176,7 @@ class DeleteHealthMonitor(command.Command):
"""Delete a health monitor"""
def get_parser(self, prog_name):
parser = super(DeleteHealthMonitor, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'health_monitor',
@ -212,7 +212,7 @@ class ListHealthMonitor(lister.Lister):
"""List health monitors"""
def get_parser(self, prog_name):
parser = super(ListHealthMonitor, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
return parser
@ -233,7 +233,7 @@ class ShowHealthMonitor(command.ShowOne):
"""Show the details of a single health monitor"""
def get_parser(self, prog_name):
parser = super(ShowHealthMonitor, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'health_monitor',
@ -272,7 +272,7 @@ class SetHealthMonitor(command.Command):
"""Update a health monitor"""
def get_parser(self, prog_name):
parser = super(SetHealthMonitor, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'health_monitor',
@ -389,7 +389,7 @@ class UnsetHealthMonitor(command.Command):
"""Clear health monitor settings"""
def get_parser(self, prog_name):
parser = super(UnsetHealthMonitor, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'health_monitor',

12
octaviaclient/osc/v2/l7policy.py
View File

@ -35,7 +35,7 @@ class CreateL7Policy(command.ShowOne):
"""Create a l7policy"""
def get_parser(self, prog_name):
parser = super(CreateL7Policy, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'listener',
@ -148,7 +148,7 @@ class DeleteL7Policy(command.Command):
"""Delete a l7policy"""
def get_parser(self, prog_name):
parser = super(DeleteL7Policy, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'l7policy',
@ -184,7 +184,7 @@ class ListL7Policy(lister.Lister):
"""List l7policies"""
def get_parser(self, prog_name):
parser = super(ListL7Policy, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'--listener',
@ -213,7 +213,7 @@ class ShowL7Policy(command.ShowOne):
"""Show the details of a single l7policy"""
def get_parser(self, prog_name):
parser = super(ShowL7Policy, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'l7policy',
@ -251,7 +251,7 @@ class SetL7Policy(command.Command):
"""Update a l7policy"""
def get_parser(self, prog_name):
parser = super(SetL7Policy, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'l7policy',
@ -351,7 +351,7 @@ class UnsetL7Policy(command.Command):
"""Clear l7policy settings"""
def get_parser(self, prog_name):
parser = super(UnsetL7Policy, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'l7policy',

12
octaviaclient/osc/v2/l7rule.py
View File

@ -37,7 +37,7 @@ class CreateL7Rule(command.ShowOne):
"""Create a l7rule"""
def get_parser(self, prog_name):
parser = super(CreateL7Rule, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'l7policy',
metavar='<l7policy>',
@ -134,7 +134,7 @@ class DeleteL7Rule(command.Command):
"""Delete a l7rule"""
def get_parser(self, prog_name):
parser = super(DeleteL7Rule, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'l7policy',
@ -177,7 +177,7 @@ class ListL7Rule(lister.Lister):
"""List l7rules for l7policy"""
def get_parser(self, prog_name):
parser = super(ListL7Rule, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'l7policy',
@ -204,7 +204,7 @@ class ShowL7Rule(command.ShowOne):
"""Show the details of a single l7rule"""
def get_parser(self, prog_name):
parser = super(ShowL7Rule, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'l7policy',
@ -246,7 +246,7 @@ class SetL7Rule(command.Command):
"""Update a l7rule"""
def get_parser(self, prog_name):
parser = super(SetL7Rule, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'l7policy',
@ -339,7 +339,7 @@ class UnsetL7Rule(command.Command):
"""Clear l7rule settings"""
def get_parser(self, prog_name):
parser = super(UnsetL7Rule, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'l7policy',

14
octaviaclient/osc/v2/listener.py
View File

@ -33,7 +33,7 @@ class CreateListener(command.ShowOne):
"""Create a listener"""
def get_parser(self, prog_name):
parser = super(CreateListener, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'loadbalancer',
@ -232,7 +232,7 @@ class DeleteListener(command.Command):
"""Delete a listener"""
def get_parser(self, prog_name):
parser = super(DeleteListener, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'listener',
@ -267,7 +267,7 @@ class ListListener(lister.Lister):
"""List listeners"""
def get_parser(self, prog_name):
parser = super(ListListener, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'--name',
@ -316,7 +316,7 @@ class ShowListener(command.ShowOne):
"""Show the details of a single listener"""
def get_parser(self, prog_name):
parser = super(ShowListener, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'listener',
@ -358,7 +358,7 @@ class SetListener(command.Command):
"""Update a listener"""
def get_parser(self, prog_name):
parser = super(SetListener, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'listener',
@ -525,7 +525,7 @@ class UnsetListener(command.Command):
"""Clear listener settings"""
def get_parser(self, prog_name):
parser = super(UnsetListener, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'listener',
@ -642,7 +642,7 @@ class ShowListenerStats(command.ShowOne):
"""Shows the current statistics for a listener."""
def get_parser(self, prog_name):
parser = super(ShowListenerStats, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'listener',

18
octaviaclient/osc/v2/load_balancer.py
View File

@ -46,7 +46,7 @@ class CreateLoadBalancer(command.ShowOne):
raise exceptions.CommandError(msg)
def get_parser(self, prog_name):
parser = super(CreateLoadBalancer, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'--name',
@ -171,7 +171,7 @@ class DeleteLoadBalancer(command.Command):
"""Delete a load balancer"""
def get_parser(self, prog_name):
parser = super(DeleteLoadBalancer, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'loadbalancer',
@ -213,7 +213,7 @@ class FailoverLoadBalancer(command.Command):
"""Trigger load balancer failover"""
def get_parser(self, prog_name):
parser = super(FailoverLoadBalancer, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'loadbalancer',
@ -247,7 +247,7 @@ class ListLoadBalancer(lister.Lister):
"""List load balancers"""
def get_parser(self, prog_name):
parser = super(ListLoadBalancer, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'--name',
@ -347,7 +347,7 @@ class ShowLoadBalancer(command.ShowOne):
"""Show the details for a single load balancer"""
def get_parser(self, prog_name):
parser = super(ShowLoadBalancer, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'loadbalancer',
@ -391,7 +391,7 @@ class SetLoadBalancer(command.Command):
"""Update a load balancer"""
def get_parser(self, prog_name):
parser = super(SetLoadBalancer, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'loadbalancer',
@ -456,7 +456,7 @@ class UnsetLoadBalancer(command.Command):
"""Clear load balancer settings"""
def get_parser(self, prog_name):
parser = super(UnsetLoadBalancer, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'loadbalancer',
@ -512,7 +512,7 @@ class ShowLoadBalancerStats(command.ShowOne):
"""Shows the current statistics for a load balancer"""
def get_parser(self, prog_name):
parser = super(ShowLoadBalancerStats, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'loadbalancer',
@ -540,7 +540,7 @@ class ShowLoadBalancerStatus(command.Command):
"""Display load balancer status tree in json format"""
def get_parser(self, prog_name):
parser = super(ShowLoadBalancerStatus, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'loadbalancer',

12
octaviaclient/osc/v2/member.py
View File

@ -32,7 +32,7 @@ class ListMember(lister.Lister):
"""List members in a pool"""
def get_parser(self, prog_name):
parser = super(ListMember, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'pool',
@ -62,7 +62,7 @@ class ShowMember(command.ShowOne):
"""Shows details of a single Member"""
def get_parser(self, prog_name):
parser = super(ShowMember, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'pool',
@ -105,7 +105,7 @@ class CreateMember(command.ShowOne):
"""Creating a member in a pool"""
def get_parser(self, prog_name):
parser = super(CreateMember, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'pool',
@ -227,7 +227,7 @@ class SetMember(command.Command):
"""Update a member"""
def get_parser(self, prog_name):
parser = super(SetMember, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'pool',
@ -326,7 +326,7 @@ class DeleteMember(command.Command):
"""Delete a member from a pool """
def get_parser(self, prog_name):
parser = super(DeleteMember, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'pool',
@ -372,7 +372,7 @@ class UnsetMember(command.Command):
"""Clear member settings"""
def get_parser(self, prog_name):
parser = super(UnsetMember, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'pool',

12
octaviaclient/osc/v2/pool.py
View File

@ -34,7 +34,7 @@ class CreatePool(command.ShowOne):
"""Create a pool"""
def get_parser(self, prog_name):
parser = super(CreatePool, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'--name',
@ -182,7 +182,7 @@ class DeletePool(command.Command):
"""Delete a pool"""
def get_parser(self, prog_name):
parser = super(DeletePool, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'pool',
@ -214,7 +214,7 @@ class ListPool(lister.Lister):
"""List pools"""
def get_parser(self, prog_name):
parser = super(ListPool, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'--loadbalancer',
@ -241,7 +241,7 @@ class ShowPool(command.ShowOne):
"""Show the details of a single pool"""
def get_parser(self, prog_name):
parser = super(ShowPool, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'pool',
@ -282,7 +282,7 @@ class SetPool(command.Command):
"""Update a pool"""
def get_parser(self, prog_name):
parser = super(SetPool, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'pool',
@ -404,7 +404,7 @@ class UnsetPool(command.Command):
"""Clear pool settings"""
def get_parser(self, prog_name):
parser = super(UnsetPool, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'pool',

5
octaviaclient/osc/v2/provider.py
View File

@ -26,7 +26,7 @@ class ListProvider(lister.Lister):
"""List all providers"""
def get_parser(self, prog_name):
parser = super(ListProvider, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
return parser
@ -45,8 +45,7 @@ class ListProviderCapability(lister.Lister):
"""List specified provider driver's capabilities."""
def get_parser(self, prog_name):
parser = super(ListProviderCapability,
self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'provider',

10
octaviaclient/osc/v2/quota.py
View File

@ -30,7 +30,7 @@ class ListQuota(lister.Lister):
"""List quotas"""
def get_parser(self, prog_name):
parser = super(ListQuota, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'--project',
@ -55,7 +55,7 @@ class ShowQuota(command.ShowOne):
"""Show the quota details for a project"""
def get_parser(self, prog_name):
parser = super(ShowQuota, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'project',
@ -110,7 +110,7 @@ class SetQuota(command.ShowOne):
raise exceptions.CommandError(msg)
def get_parser(self, prog_name):
parser = super(SetQuota, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
quota_group = parser.add_argument_group(
"Quota limits",
@ -190,7 +190,7 @@ class ResetQuota(command.Command):
"""Resets quotas to default quotas"""
def get_parser(self, prog_name):
parser = super(ResetQuota, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'project',
@ -214,7 +214,7 @@ class UnsetQuota(command.Command):
"""Clear quota settings"""
def get_parser(self, prog_name):
parser = super(UnsetQuota, self).get_parser(prog_name)
parser = super().get_parser(prog_name)
parser.add_argument(
'project',

4
octaviaclient/osc/v2/utils.py
View File

@ -119,9 +119,9 @@ def get_resource_id(resource, resource_name, name):
raise osc_exc.CommandError(msg)
return names[0].get(primary_key)
except IndexError:
except IndexError as e:
msg = "Unable to locate {0} in {1}".format(name, resource_name)
raise osc_exc.CommandError(msg)
raise osc_exc.CommandError(msg) from e
def get_loadbalancer_attrs(client_manager, parsed_args):

2
octaviaclient/tests/fakes.py
View File

@ -234,7 +234,7 @@ class FakeResponse(requests.Response):
def __init__(self, headers=None, status_code=200,
data=None, encoding=None):
super(FakeResponse, self).__init__()
super().__init__()
headers = headers or {}

2
octaviaclient/tests/unit/api/test_octavia.py
View File

@ -185,7 +185,7 @@ class TestAPI(utils.TestCase):
class TestOctaviaClient(utils.TestCase):
def setUp(self):
super(TestOctaviaClient, self).setUp()
super().setUp()
sess = session.Session()
self.api = octavia.OctaviaAPI(session=sess, endpoint=FAKE_URL)
self.requests_mock = self.useFixture(fixture.Fixture())

2
octaviaclient/tests/unit/osc/v2/fakes.py
View File

@ -30,7 +30,7 @@ class FakeOctaviaClient(object):
class TestOctaviaClient(utils.TestCommand):
def setUp(self):
super(TestOctaviaClient, self).setUp()
super().setUp()
self.app.client_manager.load_balancer = FakeOctaviaClient(
endpoint=fakes.AUTH_URL,
token=fakes.AUTH_TOKEN,

12
octaviaclient/tests/unit/osc/v2/test_amphora.py
View File

@ -25,7 +25,7 @@ from octaviaclient.tests.unit.osc.v2 import fakes
class TestAmphora(fakes.TestOctaviaClient):
def setUp(self):
super(TestAmphora, self).setUp()
super().setUp()
self._amp = fakes.createFakeResource('amphora')
self.amp_info = copy.deepcopy(attr_consts.AMPHORA_ATTRS)
@ -48,7 +48,7 @@ class TestAmphora(fakes.TestOctaviaClient):
class TestAmphoraList(TestAmphora):
def setUp(self):
super(TestAmphoraList, self).setUp()
super().setUp()
self.data_list = (tuple(
attr_consts.AMPHORA_ATTRS[k] for k in self.columns),)
self.data_list_long = (tuple(
@ -107,7 +107,7 @@ class TestAmphoraList(TestAmphora):
class TestAmphoraShow(TestAmphora):
def setUp(self):
super(TestAmphoraShow, self).setUp()
super().setUp()
self.cmd = amphora.ShowAmphora(self.app, None)
def test_amphora_show_no_args(self):
@ -130,7 +130,7 @@ class TestAmphoraShow(TestAmphora):
class TestAmphoraConfigure(TestAmphora):
def setUp(self):
super(TestAmphoraConfigure, self).setUp()
super().setUp()
self.cmd = amphora.ConfigureAmphora(self.app, None)
def test_amphora_configure(self):
@ -173,7 +173,7 @@ class TestAmphoraConfigure(TestAmphora):
class TestAmphoraFailover(TestAmphora):
def setUp(self):
super(TestAmphoraFailover, self).setUp()
super().setUp()
self.cmd = amphora.FailoverAmphora(self.app, None)
def test_amphora_failover(self):
@ -232,7 +232,7 @@ class TestAmphoraFailover(TestAmphora):
class TestAmphoraStatsShow(TestAmphora):
def setUp(self):
super(TestAmphoraStatsShow, self).setUp()
super().setUp()
# map fake listener_id to fake bytes_in counter
self.stats = {
uuidutils.generate_uuid(): 12,

14
octaviaclient/tests/unit/osc/v2/test_availabilityzone.py
View File

@ -26,7 +26,7 @@ from octaviaclient.tests.unit.osc.v2 import fakes
class TestAvailabilityzone(fakes.TestOctaviaClient):
def setUp(self):
super(TestAvailabilityzone, self).setUp()
super().setUp()
self._availabilityzone = fakes.createFakeResource('availability_zone')
self.availabilityzone_info = copy.deepcopy(
@ -43,7 +43,7 @@ class TestAvailabilityzone(fakes.TestOctaviaClient):
class TestAvailabilityzoneList(TestAvailabilityzone):
def setUp(self):
super(TestAvailabilityzoneList, self).setUp()
super().setUp()
self.datalist = (tuple(
attr_consts.AVAILABILITY_ZONE_ATTRS[k] for k in self.columns),)
self.cmd = availabilityzone.ListAvailabilityzone(self.app, None)
@ -75,7 +75,7 @@ class TestAvailabilityzoneList(TestAvailabilityzone):
class TestAvailabilityzoneDelete(TestAvailabilityzone):
def setUp(self):
super(TestAvailabilityzoneDelete, self).setUp()
super().setUp()
self.cmd = availabilityzone.DeleteAvailabilityzone(self.app, None)
def test_availabilityzone_delete(self):
@ -103,7 +103,7 @@ class TestAvailabilityzoneDelete(TestAvailabilityzone):
class TestAvailabilityzoneCreate(TestAvailabilityzone):
def setUp(self):
super(TestAvailabilityzoneCreate, self).setUp()
super().setUp()
self.api_mock.availabilityzone_create.return_value = {
'availability_zone': self.availabilityzone_info}
lb_client = self.app.client_manager
@ -132,7 +132,7 @@ class TestAvailabilityzoneCreate(TestAvailabilityzone):
class TestAvailabilityzoneShow(TestAvailabilityzone):
def setUp(self):
super(TestAvailabilityzoneShow, self).setUp()
super().setUp()
mock_show = self.api_mock.availabilityzone_show
mock_show.return_value = self.availabilityzone_info
lb_client = self.app.client_manager
@ -155,7 +155,7 @@ class TestAvailabilityzoneShow(TestAvailabilityzone):
class TestAvailabilityzoneSet(TestAvailabilityzone):
def setUp(self):
super(TestAvailabilityzoneSet, self).setUp()
super().setUp()
self.cmd = availabilityzone.SetAvailabilityzone(self.app, None)
def test_availabilityzone_set(self):
@ -178,7 +178,7 @@ class TestAvailabilityzoneUnset(TestAvailabilityzone):
PARAMETERS = ('description',)
def setUp(self):
super(TestAvailabilityzoneUnset, self).setUp()
super().setUp()
self.cmd = availabilityzone.UnsetAvailabilityzone(self.app, None)
def test_hm_unset_description(self):

12
octaviaclient/tests/unit/osc/v2/test_availabilityzoneprofile.py
View File

@ -26,7 +26,7 @@ from octaviaclient.tests.unit.osc.v2 import fakes
class TestAvailabilityzoneProfile(fakes.TestOctaviaClient):
def setUp(self):
super(TestAvailabilityzoneProfile, self).setUp()
super().setUp()
self._availabilityzoneprofile = fakes.createFakeResource(
'availability_zone_profile')
@ -45,7 +45,7 @@ class TestAvailabilityzoneProfile(fakes.TestOctaviaClient):
class TestAvailabilityzoneProfileList(TestAvailabilityzoneProfile):
def setUp(self):
super(TestAvailabilityzoneProfileList, self).setUp()
super().setUp()
self.datalist = (tuple(
attr_consts.AVAILABILITY_ZONE_PROFILE_ATTRS[k]
for k in self.columns),)
@ -79,7 +79,7 @@ class TestAvailabilityzoneProfileList(TestAvailabilityzoneProfile):
class TestAvailabilityzoneProfileDelete(TestAvailabilityzoneProfile):
def setUp(self):
super(TestAvailabilityzoneProfileDelete, self).setUp()
super().setUp()
self.cmd = availabilityzoneprofile.DeleteAvailabilityzoneProfile(
self.app, None)
@ -108,7 +108,7 @@ class TestAvailabilityzoneProfileDelete(TestAvailabilityzoneProfile):
class TestAvailabilityzoneProfileCreate(TestAvailabilityzoneProfile):
def setUp(self):
super(TestAvailabilityzoneProfileCreate, self).setUp()
super().setUp()
self.api_mock.availabilityzoneprofile_create.return_value = {
'availability_zone_profile': self.availabilityzoneprofile_info}
lb_client = self.app.client_manager
@ -140,7 +140,7 @@ class TestAvailabilityzoneProfileCreate(TestAvailabilityzoneProfile):
class TestAvailabilityzoneProfileShow(TestAvailabilityzoneProfile):
def setUp(self):
super(TestAvailabilityzoneProfileShow, self).setUp()
super().setUp()
mock_show = self.api_mock.availabilityzoneprofile_show
mock_show.return_value = self.availabilityzoneprofile_info
lb_client = self.app.client_manager
@ -164,7 +164,7 @@ class TestAvailabilityzoneProfileShow(TestAvailabilityzoneProfile):
class TestAvailabilityzoneProfileSet(TestAvailabilityzoneProfile):
def setUp(self):
super(TestAvailabilityzoneProfileSet, self).setUp()
super().setUp()
self.cmd = availabilityzoneprofile.SetAvailabilityzoneProfile(
self.app, None)

14
octaviaclient/tests/unit/osc/v2/test_flavor.py
View File

@ -26,7 +26,7 @@ from octaviaclient.tests.unit.osc.v2 import fakes
class TestFlavor(fakes.TestOctaviaClient):
def setUp(self):
super(TestFlavor, self).setUp()
super().setUp()
self._flavor = fakes.createFakeResource('flavor')
self.flavor_info = copy.deepcopy(attr_consts.FLAVOR_ATTRS)
@ -42,7 +42,7 @@ class TestFlavor(fakes.TestOctaviaClient):
class TestFlavorList(TestFlavor):
def setUp(self):
super(TestFlavorList, self).setUp()
super().setUp()
self.datalist = (tuple(
attr_consts.FLAVOR_ATTRS[k] for k in self.columns),)
self.cmd = flavor.ListFlavor(self.app, None)
@ -73,7 +73,7 @@ class TestFlavorList(TestFlavor):
class TestFlavorDelete(TestFlavor):
def setUp(self):
super(TestFlavorDelete, self).setUp()
super().setUp()
self.cmd = flavor.DeleteFlavor(self.app, None)
def test_flavor_delete(self):
@ -101,7 +101,7 @@ class TestFlavorDelete(TestFlavor):
class TestFlavorCreate(TestFlavor):
def setUp(self):
super(TestFlavorCreate, self).setUp()
super().setUp()
self.api_mock.flavor_create.return_value = {
'flavor': self.flavor_info}
lb_client = self.app.client_manager
@ -130,7 +130,7 @@ class TestFlavorCreate(TestFlavor):
class TestFlavorShow(TestFlavor):
def setUp(self):
super(TestFlavorShow, self).setUp()
super().setUp()
self.api_mock.flavor_show.return_value = self.flavor_info
lb_client = self.app.client_manager
lb_client.load_balancer = self.api_mock
@ -152,7 +152,7 @@ class TestFlavorShow(TestFlavor):
class TestFlavorSet(TestFlavor):
def setUp(self):
super(TestFlavorSet, self).setUp()
super().setUp()
self.cmd = flavor.SetFlavor(self.app, None)
def test_flavor_set(self):
@ -175,7 +175,7 @@ class TestFlavorUnset(TestFlavor):
PARAMETERS = ('description',)
def setUp(self):
super(TestFlavorUnset, self).setUp()
super().setUp()
self.cmd = flavor.UnsetFlavor(self.app, None)
def test_hm_unset_description(self):

12
octaviaclient/tests/unit/osc/v2/test_flavorprofile.py
View File

@ -26,7 +26,7 @@ from octaviaclient.tests.unit.osc.v2 import fakes
class TestFlavorProfile(fakes.TestOctaviaClient):
def setUp(self):
super(TestFlavorProfile, self).setUp()
super().setUp()
self._flavorprofile = fakes.createFakeResource('flavorprofile')
self.flavorprofile_info = copy.deepcopy(
@ -43,7 +43,7 @@ class TestFlavorProfile(fakes.TestOctaviaClient):
class TestFlavorProfileList(TestFlavorProfile):
def setUp(self):
super(TestFlavorProfileList, self).setUp()
super().setUp()
self.datalist = (tuple(
attr_consts.FLAVORPROFILE_ATTRS[k] for k in self.columns),)
self.cmd = flavorprofile.ListFlavorProfile(self.app, None)
@ -75,7 +75,7 @@ class TestFlavorProfileList(TestFlavorProfile):
class TestFlavorProfileDelete(TestFlavorProfile):
def setUp(self):
super(TestFlavorProfileDelete, self).setUp()
super().setUp()
self.cmd = flavorprofile.DeleteFlavorProfile(self.app, None)
def test_flavorprofile_delete(self):
@ -103,7 +103,7 @@ class TestFlavorProfileDelete(TestFlavorProfile):
class TestFlavorProfileCreate(TestFlavorProfile):
def setUp(self):
super(TestFlavorProfileCreate, self).setUp()
super().setUp()
self.api_mock.flavorprofile_create.return_value = {
'flavorprofile': self.flavorprofile_info}
lb_client = self.app.client_manager
@ -132,7 +132,7 @@ class TestFlavorProfileCreate(TestFlavorProfile):
class TestFlavorProfileShow(TestFlavorProfile):
def setUp(self):
super(TestFlavorProfileShow, self).setUp()
super().setUp()
self.api_mock.flavorprofile_show.return_value = self.flavorprofile_info
lb_client = self.app.client_manager
lb_client.load_balancer = self.api_mock
@ -154,7 +154,7 @@ class TestFlavorProfileShow(TestFlavorProfile):
class TestFlavorProfileSet(TestFlavorProfile):
def setUp(self):
super(TestFlavorProfileSet, self).setUp()
super().setUp()
self.cmd = flavorprofile.SetFlavorProfile(self.app, None)
def test_flavorprofile_set(self):

14
octaviaclient/tests/unit/osc/v2/test_health_monitor.py
View File

@ -26,7 +26,7 @@ from octaviaclient.tests.unit.osc.v2 import fakes
class TestHealthMonitor(fakes.TestOctaviaClient):
def setUp(self):
super(TestHealthMonitor, self).setUp()
super().setUp()
self._hm = fakes.createFakeResource('hm')
self.hm_info = copy.deepcopy(attr_consts.HM_ATTRS)
@ -45,7 +45,7 @@ class TestHealthMonitor(fakes.TestOctaviaClient):
class TestHealthMonitorList(TestHealthMonitor):
def setUp(self):
super(TestHealthMonitorList, self).setUp()
super().setUp()
self.datalist = (tuple(attr_consts.HM_ATTRS[k] for k in self.columns),)
self.cmd = health_monitor.ListHealthMonitor(self.app, None)
@ -64,7 +64,7 @@ class TestHealthMonitorList(TestHealthMonitor):
class TestHealthMonitorDelete(TestHealthMonitor):
def setUp(self):
super(TestHealthMonitorDelete, self).setUp()
super().setUp()
self.cmd = health_monitor.DeleteHealthMonitor(self.app, None)
def test_health_monitor_delete(self):
@ -110,7 +110,7 @@ class TestHealthMonitorDelete(TestHealthMonitor):
class TestHealthMonitorCreate(TestHealthMonitor):
def setUp(self):
super(TestHealthMonitorCreate, self).setUp()
super().setUp()
self.api_mock = mock.Mock()
self.api_mock.health_monitor_create.return_value = {
'healthmonitor': self.hm_info}
@ -193,7 +193,7 @@ class TestHealthMonitorCreate(TestHealthMonitor):
class TestHealthMonitorShow(TestHealthMonitor):
def setUp(self):
super(TestHealthMonitorShow, self).setUp()
super().setUp()
self.api_mock.health_monitor_show.return_value = {
'healthmonitor': self.hm_info,
}
@ -217,7 +217,7 @@ class TestHealthMonitorShow(TestHealthMonitor):
class TestHealthMonitorSet(TestHealthMonitor):
def setUp(self):
super(TestHealthMonitorSet, self).setUp()
super().setUp()
self.cmd = health_monitor.SetHealthMonitor(self.app, None)
def test_health_monitor_set(self):
@ -263,7 +263,7 @@ class TestHealthMonitorUnset(TestHealthMonitor):
'http_version', 'max_retries_down', 'url_path')
def setUp(self):
super(TestHealthMonitorUnset, self).setUp()
super().setUp()
self.cmd = health_monitor.UnsetHealthMonitor(self.app, None)
def test_hm_unset_domain_name(self):

14
octaviaclient/tests/unit/osc/v2/test_l7policy.py
View File

@ -26,7 +26,7 @@ from octaviaclient.tests.unit.osc.v2 import fakes
class TestL7Policy(fakes.TestOctaviaClient):
def setUp(self):
super(TestL7Policy, self).setUp()
super().setUp()
self._l7po = fakes.createFakeResource('l7policy')
self.l7po_info = copy.deepcopy(attr_consts.L7POLICY_ATTRS)
@ -43,7 +43,7 @@ class TestL7Policy(fakes.TestOctaviaClient):
class TestL7PolicyList(TestL7Policy):
def setUp(self):
super(TestL7PolicyList, self).setUp()
super().setUp()
self.datalist = (tuple(
attr_consts.L7POLICY_ATTRS[k] for k in self.columns),)
self.cmd = l7policy.ListL7Policy(self.app, None)
@ -80,7 +80,7 @@ class TestL7PolicyList(TestL7Policy):
class TestL7PolicyDelete(TestL7Policy):
def setUp(self):
super(TestL7PolicyDelete, self).setUp()
super().setUp()
self.cmd = l7policy.DeleteL7Policy(self.app, None)
def test_l7policy_delete(self):
@ -126,7 +126,7 @@ class TestL7PolicyDelete(TestL7Policy):
class TestL7PolicyCreate(TestL7Policy):
def setUp(self):
super(TestL7PolicyCreate, self).setUp()
super().setUp()
self.api_mock.l7policy_create.return_value = {
'l7policy': self.l7po_info}
lb_client = self.app.client_manager
@ -209,7 +209,7 @@ class TestL7PolicyCreate(TestL7Policy):
class TestL7PolicyShow(TestL7Policy):
def setUp(self):
super(TestL7PolicyShow, self).setUp()
super().setUp()
self.api_mock.l7policy_list.return_value = [{'id': self._l7po.id}]
self.api_mock.l7policy_show.return_value = self.l7po_info
lb_client = self.app.client_manager
@ -234,7 +234,7 @@ class TestL7PolicyShow(TestL7Policy):
class TestL7PolicySet(TestL7Policy):
def setUp(self):
super(TestL7PolicySet, self).setUp()
super().setUp()
self.cmd = l7policy.SetL7Policy(self.app, None)
def test_l7policy_set(self):
@ -273,7 +273,7 @@ class TestL7PolicyUnset(TestL7Policy):
PARAMETERS = ('name', 'description', 'redirect_http_code')
def setUp(self):
super(TestL7PolicyUnset, self).setUp()
super().setUp()
self.cmd = l7policy.UnsetL7Policy(self.app, None)
def test_l7policy_unset_description(self):

14
octaviaclient/tests/unit/osc/v2/test_l7rule.py
View File

@ -24,7 +24,7 @@ from octaviaclient.tests.unit.osc.v2 import fakes
class TestL7Rule(fakes.TestOctaviaClient):
def setUp(self):
super(TestL7Rule, self).setUp()
super().setUp()
self._l7ru = fakes.createFakeResource('l7rule')
self.l7rule_info = copy.deepcopy(attr_consts.L7RULE_ATTRS)
@ -44,7 +44,7 @@ class TestL7Rule(fakes.TestOctaviaClient):
class TestL7RuleList(TestL7Rule):
def setUp(self):
super(TestL7RuleList, self).setUp()
super().setUp()
self.datalist = (tuple(
attr_consts.L7RULE_ATTRS[k] for k in self.columns),)
self.cmd = l7rule.ListL7Rule(self.app, None)
@ -66,7 +66,7 @@ class TestL7RuleList(TestL7Rule):
class TestL7RuleDelete(TestL7Rule):
def setUp(self):
super(TestL7RuleDelete, self).setUp()
super().setUp()
self.cmd = l7rule.DeleteL7Rule(self.app, None)
@mock.patch('octaviaclient.osc.v2.utils.get_l7rule_attrs')
@ -118,7 +118,7 @@ class TestL7RuleDelete(TestL7Rule):
class TestL7RuleCreate(TestL7Rule):
def setUp(self):
super(TestL7RuleCreate, self).setUp()
super().setUp()
self.api_mock.l7rule_create.return_value = {
'rule': self.l7rule_info}
lb_client = self.app.client_manager
@ -203,7 +203,7 @@ class TestL7RuleCreate(TestL7Rule):
class TestL7RuleShow(TestL7Rule):
def setUp(self):
super(TestL7RuleShow, self).setUp()
super().setUp()
self.api_mock.l7rule_show.return_value = self.l7rule_info
lb_client = self.app.client_manager
lb_client.load_balancer = self.api_mock
@ -228,7 +228,7 @@ class TestL7RuleShow(TestL7Rule):
class TestL7RuleSet(TestL7Rule):
def setUp(self):
super(TestL7RuleSet, self).setUp()
super().setUp()
self.cmd = l7rule.SetL7Rule(self.app, None)
@mock.patch('octaviaclient.osc.v2.utils.get_l7rule_attrs')
@ -294,7 +294,7 @@ class TestL7RuleUnset(TestL7Rule):
PARAMETERS = ('invert', 'key')
def setUp(self):
super(TestL7RuleUnset, self).setUp()
super().setUp()
self.cmd = l7rule.UnsetL7Rule(self.app, None)
def test_l7rule_unset_invert(self):

16
octaviaclient/tests/unit/osc/v2/test_listener.py
View File

@ -24,7 +24,7 @@ from octaviaclient.tests.unit.osc.v2 import fakes
class TestListener(fakes.TestOctaviaClient):
def setUp(self):
super(TestListener, self).setUp()
super().setUp()
self._listener = fakes.createFakeResource('listener')
self.listener_info = copy.deepcopy(attr_consts.LISTENER_ATTRS)
@ -40,7 +40,7 @@ class TestListener(fakes.TestOctaviaClient):
class TestListenerList(TestListener):
def setUp(self):
super(TestListenerList, self).setUp()
super().setUp()
self.datalist = (tuple(
attr_consts.LISTENER_ATTRS[k] for k in self.columns),)
self.cmd = listener.ListListener(self.app, None)
@ -71,7 +71,7 @@ class TestListenerList(TestListener):
class TestListenerDelete(TestListener):
def setUp(self):
super(TestListenerDelete, self).setUp()
super().setUp()
self.cmd = listener.DeleteListener(self.app, None)
def test_listener_delete(self):
@ -117,7 +117,7 @@ class TestListenerDelete(TestListener):
class TestListenerCreate(TestListener):
def setUp(self):
super(TestListenerCreate, self).setUp()
super().setUp()
self.api_mock.listener_create.return_value = {
'listener': self.listener_info}
lb_client = self.app.client_manager
@ -253,7 +253,7 @@ class TestListenerCreate(TestListener):
class TestListenerShow(TestListener):
def setUp(self):
super(TestListenerShow, self).setUp()
super().setUp()
self.api_mock.listener_show.return_value = self.listener_info
lb_client = self.app.client_manager
lb_client.load_balancer = self.api_mock
@ -275,7 +275,7 @@ class TestListenerShow(TestListener):
class TestListenerSet(TestListener):
def setUp(self):
super(TestListenerSet, self).setUp()
super().setUp()
self.cmd = listener.SetListener(self.app, None)
def test_listener_set(self):
@ -361,7 +361,7 @@ class TestListenerSet(TestListener):
class TestListenerStatsShow(TestListener):
def setUp(self):
super(TestListenerStatsShow, self).setUp()
super().setUp()
listener_stats_info = {'stats': {'bytes_in': '0'}}
self.api_mock.listener_stats_show.return_value = {
'stats': listener_stats_info['stats']}
@ -391,7 +391,7 @@ class TestListenerUnset(TestListener):
'allowed_cidrs')
def setUp(self):
super(TestListenerUnset, self).setUp()
super().setUp()
self.cmd = listener.UnsetListener(self.app, None)
def test_listener_unset_name(self):

20
octaviaclient/tests/unit/osc/v2/test_load_balancer.py
View File

@ -27,7 +27,7 @@ from octaviaclient.tests.unit.osc.v2 import fakes
class TestLoadBalancer(fakes.TestOctaviaClient):
def setUp(self):
super(TestLoadBalancer, self).setUp()
super().setUp()
self._lb = fakes.createFakeResource('loadbalancer')
self.lb_info = copy.deepcopy(attr_consts.LOADBALANCER_ATTRS)
@ -45,7 +45,7 @@ class TestLoadBalancer(fakes.TestOctaviaClient):
class TestLoadBalancerList(TestLoadBalancer):
def setUp(self):
super(TestLoadBalancerList, self).setUp()
super().setUp()
self.datalist = (tuple(
attr_consts.LOADBALANCER_ATTRS[k] for k in self.columns),)
self.cmd = load_balancer.ListLoadBalancer(self.app, None)
@ -200,7 +200,7 @@ class TestLoadBalancerList(TestLoadBalancer):
class TestLoadBalancerDelete(TestLoadBalancer):
def setUp(self):
super(TestLoadBalancerDelete, self).setUp()
super().setUp()
self.cmd = load_balancer.DeleteLoadBalancer(self.app, None)
def test_load_balancer_delete(self):
@ -246,7 +246,7 @@ class TestLoadBalancerDelete(TestLoadBalancer):
class TestLoadBalancerCreate(TestLoadBalancer):
def setUp(self):
super(TestLoadBalancerCreate, self).setUp()
super().setUp()
self.api_mock.load_balancer_create.return_value = {
'loadbalancer': self.lb_info
@ -389,7 +389,7 @@ class TestLoadBalancerCreate(TestLoadBalancer):
class TestLoadBalancerShow(TestLoadBalancer):
def setUp(self):
super(TestLoadBalancerShow, self).setUp()
super().setUp()
self.api_mock.load_balancer_show.return_value = {
'loadbalancer': self.lb_info}
lb_client = self.app.client_manager
@ -410,7 +410,7 @@ class TestLoadBalancerShow(TestLoadBalancer):
class TestLoadBalancerSet(TestLoadBalancer):
def setUp(self):
super(TestLoadBalancerSet, self).setUp()
super().setUp()
lb_client = self.app.client_manager
lb_client.load_balancer = self.api_mock
self.cmd = load_balancer.SetLoadBalancer(self.app, None)
@ -496,7 +496,7 @@ class TestLoadBalancerSet(TestLoadBalancer):
class TestLoadBalancerStats(TestLoadBalancer):
def setUp(self):
super(TestLoadBalancerStats, self).setUp()
super().setUp()
lb_stats_info = {'stats': {'bytes_in': '0'}}
self.api_mock.load_balancer_stats_show.return_value = {
'stats': lb_stats_info['stats']}
@ -518,7 +518,7 @@ class TestLoadBalancerStats(TestLoadBalancer):
class TestLoadBalancerStatus(TestLoadBalancer):
def setUp(self):
super(TestLoadBalancerStatus, self).setUp()
super().setUp()
expected_res = {'statuses': {'operating_status': 'ONLINE',
'provisioning_status': 'ACTIVE'}}
self.api_mock.load_balancer_status_show.return_value = {
@ -544,7 +544,7 @@ class TestLoadBalancerStatus(TestLoadBalancer):
class TestLoadBalancerFailover(TestLoadBalancer):
def setUp(self):
super(TestLoadBalancerFailover, self).setUp()
super().setUp()
self.cmd = load_balancer.FailoverLoadBalancer(self.app, None)
def test_load_balancer_failover(self):
@ -581,7 +581,7 @@ class TestLoadBalancerUnset(TestLoadBalancer):
PARAMETERS = ('name', 'description', 'vip_qos_policy_id')
def setUp(self):
super(TestLoadBalancerUnset, self).setUp()
super().setUp()
lb_client = self.app.client_manager
lb_client.load_balancer = self.api_mock
self.cmd = load_balancer.UnsetLoadBalancer(self.app, None)

14
octaviaclient/tests/unit/osc/v2/test_member.py
View File

@ -24,7 +24,7 @@ from octaviaclient.tests.unit.osc.v2 import fakes
class TestMember(fakes.TestOctaviaClient):
def setUp(self):
super(TestMember, self).setUp()
super().setUp()
self._mem = fakes.createFakeResource('member')
self.mem_info = copy.deepcopy(attr_consts.MEMBER_ATTRS)
@ -48,7 +48,7 @@ class TestMember(fakes.TestOctaviaClient):
class TestListMember(TestMember):
def setUp(self):
super(TestListMember, self).setUp()
super().setUp()
self.datalist = (tuple(
attr_consts.MEMBER_ATTRS[k] for k in self.columns),)
self.cmd = member.ListMember(self.app, None)
@ -79,7 +79,7 @@ class TestListMember(TestMember):
class TestCreateMember(TestMember):
def setUp(self):
super(TestCreateMember, self).setUp()
super().setUp()
self.cmd = member.CreateMember(self.app, None)
self.api_mock.member_create.return_value = {
'member': self.mem_info}
@ -155,7 +155,7 @@ class TestCreateMember(TestMember):
class TestMemberDelete(TestMember):
def setUp(self):
super(TestMemberDelete, self).setUp()
super().setUp()
self.cmd = member.DeleteMember(self.app, None)
@mock.patch('octaviaclient.osc.v2.utils.get_member_attrs')
@ -199,7 +199,7 @@ class TestMemberDelete(TestMember):
class TestMemberSet(TestMember):
def setUp(self):
super(TestMemberSet, self).setUp()
super().setUp()
self.cmd = member.SetMember(self.app, None)
@mock.patch('octaviaclient.osc.v2.utils.get_member_attrs')
@ -254,7 +254,7 @@ class TestMemberSet(TestMember):
class TestMemberShow(TestMember):
def setUp(self):
super(TestMemberShow, self).setUp()
super().setUp()
self.api_mock.member_show.return_value = self.mem_info
lb_client = self.app.client_manager
lb_client.load_balancer = self.api_mock
@ -284,7 +284,7 @@ class TestMemberUnset(TestMember):
'weight')
def setUp(self):
super(TestMemberUnset, self).setUp()
super().setUp()
self.cmd = member.UnsetMember(self.app, None)
def test_member_unset_backup(self):

14
octaviaclient/tests/unit/osc/v2/test_pool.py
View File

@ -25,7 +25,7 @@ from octaviaclient.tests.unit.osc.v2 import fakes
class TestPool(fakes.TestOctaviaClient):
def setUp(self):
super(TestPool, self).setUp()
super().setUp()
self._po = fakes.createFakeResource('pool')
self.pool_info = copy.deepcopy(attr_consts.POOL_ATTRS)
@ -41,7 +41,7 @@ class TestPool(fakes.TestOctaviaClient):
class TestPoolList(TestPool):
def setUp(self):
super(TestPoolList, self).setUp()
super().setUp()
self.datalist = (tuple(
attr_consts.POOL_ATTRS[k] for k in self.columns
),)
@ -62,7 +62,7 @@ class TestPoolList(TestPool):
class TestPoolDelete(TestPool):
def setUp(self):
super(TestPoolDelete, self).setUp()
super().setUp()
self.cmd = pool.DeletePool(self.app, None)
def test_pool_delete(self):
@ -108,7 +108,7 @@ class TestPoolDelete(TestPool):
class TestPoolCreate(TestPool):
def setUp(self):
super(TestPoolCreate, self).setUp()
super().setUp()
self.api_mock.pool_create.return_value = {
'pool': self.pool_info}
lb_client = self.app.client_manager
@ -183,7 +183,7 @@ class TestPoolCreate(TestPool):
class TestPoolShow(TestPool):
def setUp(self):
super(TestPoolShow, self).setUp()
super().setUp()
self.api_mock.pool_show.return_value = self.pool_info
lb_client = self.app.client_manager
lb_client.load_balancer = self.api_mock
@ -204,7 +204,7 @@ class TestPoolShow(TestPool):
class TestPoolSet(TestPool):
def setUp(self):
super(TestPoolSet, self).setUp()
super().setUp()
self.cmd = pool.SetPool(self.app, None)
def test_pool_set(self):
@ -260,7 +260,7 @@ class TestPoolUnset(TestPool):
'tls_container_ref')
def setUp(self):
super(TestPoolUnset, self).setUp()
super().setUp()
self.cmd = pool.UnsetPool(self.app, None)
def test_pool_unset_name(self):

8
octaviaclient/tests/unit/osc/v2/test_provider.py
View File

@ -24,7 +24,7 @@ from octaviaclient.tests.unit.osc.v2 import fakes
class TestProvider(fakes.TestOctaviaClient):
def setUp(self):
super(TestProvider, self).setUp()
super().setUp()
self.columns = copy.deepcopy(constants.PROVIDER_COLUMNS)
@ -38,7 +38,7 @@ class TestProvider(fakes.TestOctaviaClient):
class TestProviderList(TestProvider):
def setUp(self):
super(TestProviderList, self).setUp()
super().setUp()
self.datalist = (tuple(
attr_consts.PROVIDER_ATTRS[k] for k in self.columns),)
self.cmd = provider.ListProvider(self.app, None)
@ -58,7 +58,7 @@ class TestProviderList(TestProvider):
class TestProviderCapability(fakes.TestOctaviaClient):
def setUp(self):
super(TestProviderCapability, self).setUp()
super().setUp()
self.api_mock = mock.Mock()
self.api_mock.provider_flavor_capability_list.return_value = (
@ -76,7 +76,7 @@ class TestProviderCapability(fakes.TestOctaviaClient):
class TestProviderCapabilityShow(TestProviderCapability):
def setUp(self):
super(TestProviderCapabilityShow, self).setUp()
super().setUp()
lb_client = self.app.client_manager
lb_client.load_balancer = self.api_mock

14
octaviaclient/tests/unit/osc/v2/test_quota.py
View File

@ -24,7 +24,7 @@ from octaviaclient.tests.unit.osc.v2 import fakes
class TestQuota(fakes.TestOctaviaClient):
def setUp(self):
super(TestQuota, self).setUp()
super().setUp()
self._qt = fakes.createFakeResource('quota')
self.quota_info = copy.deepcopy(attr_consts.QUOTA_ATTRS)
@ -41,7 +41,7 @@ class TestQuota(fakes.TestOctaviaClient):
class TestQuotaList(TestQuota):
def setUp(self):
super(TestQuotaList, self).setUp()
super().setUp()
self.datalist = (tuple(
attr_consts.QUOTA_ATTRS[k] for k in self.columns),)
self.cmd = quota.ListQuota(self.app, None)
@ -61,7 +61,7 @@ class TestQuotaList(TestQuota):
class TestQuotaShow(TestQuota):
def setUp(self):
super(TestQuotaShow, self).setUp()
super().setUp()
self.api_mock.quota_show.return_value = {
'quota': self.quota_info}
lb_client = self.app.client_manager
@ -96,7 +96,7 @@ class TestQuotaDefaultsShow(TestQuota):
}
def setUp(self):
super(TestQuotaDefaultsShow, self).setUp()
super().setUp()
self.api_mock.quota_defaults_show.return_value = {
'quota': self.qt_defaults}
@ -121,7 +121,7 @@ class TestQuotaDefaultsShow(TestQuota):
class TestQuotaSet(TestQuota):
def setUp(self):
super(TestQuotaSet, self).setUp()
super().setUp()
self.api_mock.quota_set.return_value = {
'quota': self.quota_info}
@ -184,7 +184,7 @@ class TestQuotaSet(TestQuota):
class TestQuotaReset(TestQuota):
def setUp(self):
super(TestQuotaReset, self).setUp()
super().setUp()
self.cmd = quota.ResetQuota(self.app, None)
@mock.patch('octaviaclient.osc.v2.utils.get_quota_attrs')
@ -213,7 +213,7 @@ class TestQuotaUnset(TestQuota):
'member', 'healthmonitor', 'l7policy', 'l7rule')
def setUp(self):
super(TestQuotaUnset, self).setUp()
super().setUp()
self.cmd = quota.UnsetQuota(self.app, None)
def test_quota_unset_loadbalancer(self):

2
octaviaclient/tests/unit/osc/v2/test_validations.py
View File

@ -20,7 +20,7 @@ from octaviaclient.osc.v2 import validate
class TestValidations(utils.TestCommand):
def setUp(self):
super(TestValidations, self).setUp()
super().setUp()
def test_check_l7policy_attrs(self):
attrs_dict = {