Update to Alpine 3.14

It also fixes lots of new pylint warnings.

Change-Id: I3376aee5649596c53bc2941ad4d8e0674a2967fe
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

3 files changed, 15 insertions, 15 deletions

diff --git a/functest/core/cloudify.py b/functest/core/cloudify.py
index b5a959412..58e3095d6 100644
--- a/functest/core/cloudify.py
+++ b/functest/core/cloudify.py
@@ -46,11 +46,11 @@ class Cloudify(singlevm.SingleVm2):
         """Initialize Cloudify testcase object."""
         if "case_name" not in kwargs:
             kwargs["case_name"] = "cloudify"
-        super(Cloudify, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.cfy_client = None
 
     def prepare(self):
-        super(Cloudify, self).prepare()
+        super().prepare()
         for port in self.ports:
             self.cloud.create_security_group_rule(
                 self.sec.id, port_range_min=port, port_range_max=port,
diff --git a/functest/core/singlevm.py b/functest/core/singlevm.py
index 59071112e..b2d855b30 100644
--- a/functest/core/singlevm.py
+++ b/functest/core/singlevm.py
@@ -59,7 +59,7 @@ class VmReady1(tenantnetwork.TenantNetwork1):
     def __init__(self, **kwargs):
         if "case_name" not in kwargs:
             kwargs["case_name"] = 'vmready1'
-        super(VmReady1, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.image = None
         self.flavor = None
 
@@ -289,7 +289,7 @@ class VmReady1(tenantnetwork.TenantNetwork1):
         status = testcase.TestCase.EX_RUN_ERROR
         try:
             assert self.cloud
-            assert super(VmReady1, self).run(
+            assert super().run(
                 **kwargs) == testcase.TestCase.EX_OK
             self.image = self.publish_image()
             self.flavor = self.create_flavor()
@@ -306,7 +306,7 @@ class VmReady1(tenantnetwork.TenantNetwork1):
         try:
             assert self.orig_cloud
             assert self.cloud
-            super(VmReady1, self).clean()
+            super().clean()
             if self.image:
                 self.cloud.delete_image(self.image.id)
             if self.flavor:
@@ -332,7 +332,7 @@ class VmReady2(VmReady1):
     def __init__(self, **kwargs):
         if "case_name" not in kwargs:
             kwargs["case_name"] = 'vmready2'
-        super(VmReady2, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         try:
             assert self.orig_cloud
             self.project = tenantnetwork.NewProject(
@@ -346,7 +346,7 @@ class VmReady2(VmReady1):
 
     def clean(self):
         try:
-            super(VmReady2, self).clean()
+            super().clean()
             assert self.project
             self.project.clean()
         except Exception:  # pylint: disable=broad-except
@@ -375,7 +375,7 @@ class SingleVm1(VmReady1):
     def __init__(self, **kwargs):
         if "case_name" not in kwargs:
             kwargs["case_name"] = 'singlevm1'
-        super(SingleVm1, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.sshvm = None
         self.sec = None
         self.fip = None
@@ -480,7 +480,7 @@ class SingleVm1(VmReady1):
         status = testcase.TestCase.EX_RUN_ERROR
         try:
             assert self.cloud
-            assert super(SingleVm1, self).run(
+            assert super().run(
                 **kwargs) == testcase.TestCase.EX_OK
             self.result = 0
             self.prepare()
@@ -511,7 +511,7 @@ class SingleVm1(VmReady1):
                 self.cloud.delete_security_group(self.sec.id)
             if self.keypair:
                 self.cloud.delete_keypair(self.keypair.name)
-            super(SingleVm1, self).clean()
+            super().clean()
         except Exception:  # pylint: disable=broad-except
             self.__logger.exception("Cannot clean all resources")
 
@@ -531,7 +531,7 @@ class SingleVm2(SingleVm1):
     def __init__(self, **kwargs):
         if "case_name" not in kwargs:
             kwargs["case_name"] = 'singlevm2'
-        super(SingleVm2, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         try:
             assert self.orig_cloud
             self.project = tenantnetwork.NewProject(
@@ -545,7 +545,7 @@ class SingleVm2(SingleVm1):
 
     def clean(self):
         try:
-            super(SingleVm2, self).clean()
+            super().clean()
             assert self.project
             self.project.clean()
         except Exception:  # pylint: disable=broad-except
diff --git a/functest/core/tenantnetwork.py b/functest/core/tenantnetwork.py
index 8b820cea5..f8e4dddc7 100644
--- a/functest/core/tenantnetwork.py
+++ b/functest/core/tenantnetwork.py
@@ -150,7 +150,7 @@ class TenantNetwork1(testcase.TestCase):
     def __init__(self, **kwargs):
         if "case_name" not in kwargs:
             kwargs["case_name"] = 'tenantnetwork1'
-        super(TenantNetwork1, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.dir_results = os.path.join(getattr(config.CONF, 'dir_results'))
         self.res_dir = os.path.join(self.dir_results, self.case_name)
         self.output_log_name = 'functest.log'
@@ -306,7 +306,7 @@ class TenantNetwork2(TenantNetwork1):
     def __init__(self, **kwargs):
         if "case_name" not in kwargs:
             kwargs["case_name"] = 'tenantnetwork2'
-        super(TenantNetwork2, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         try:
             assert self.cloud
             self.project = NewProject(
@@ -320,7 +320,7 @@ class TenantNetwork2(TenantNetwork1):
 
     def clean(self):
         try:
-            super(TenantNetwork2, self).clean()
+            super().clean()
             assert self.project
             self.project.clean()
         except Exception:  # pylint: disable=broad-except