9 files changed, 12 insertions, 10 deletions
diff --git a/src/onaptests/scenario/basic_clamp.py b/src/onaptests/scenario/basic_clamp.py
index c539c11..2e24cac 100644
--- a/src/onaptests/scenario/basic_clamp.py
+++ b/src/onaptests/scenario/basic_clamp.py
@@ -12,11 +12,12 @@ from onaptests.utils.exceptions import OnapTestException
 class BasicClamp(ScenarioBase):
     """Onboard, update a model with a loop, design the loop and deploy it."""
     __logger = logging.getLogger(__name__)
+
     def __init__(self, **kwargs):
         """Init Basic Clamp, onboard a VM, design and deploy a loop with CLAMP."""
         super().__init__('basic_clamp', **kwargs)
         self.test = ClampStep(
-                cleanup=settings.CLEANUP_FLAG)
+            cleanup=settings.CLEANUP_FLAG)
         self.start_time = None
         self.stop_time = None
         self.result = 0
diff --git a/src/onaptests/scenario/basic_cnf.py b/src/onaptests/scenario/basic_cnf.py
index 06f6f15..51a5cc5 100644
--- a/src/onaptests/scenario/basic_cnf.py
+++ b/src/onaptests/scenario/basic_cnf.py
@@ -20,7 +20,7 @@ class BasicCnf(ScenarioBase):
         """Init BasicCnf."""
         super().__init__('basic_cnf', **kwargs)
         self.test = YamlTemplateVfModuleAlaCarteInstantiateStep(
-                cleanup=settings.CLEANUP_FLAG)
+            cleanup=settings.CLEANUP_FLAG)
         self.start_time = None
         self.stop_time = None
         self.result = 0
diff --git a/src/onaptests/scenario/basic_network.py b/src/onaptests/scenario/basic_network.py
index 3970700..32d2095 100644
--- a/src/onaptests/scenario/basic_network.py
+++ b/src/onaptests/scenario/basic_network.py
@@ -21,7 +21,7 @@ class BasicNetwork(ScenarioBase):
         # import basic_network_nomulticloud_settings needed
         super().__init__('basic_network', **kwargs)
         self.test = YamlTemplateVlAlaCarteInstantiateStep(
-                cleanup=settings.CLEANUP_FLAG)
+            cleanup=settings.CLEANUP_FLAG)
         self.start_time = None
         self.stop_time = None
         self.result = 0
diff --git a/src/onaptests/scenario/basic_vm.py b/src/onaptests/scenario/basic_vm.py
index 81c2d09..cbf57db 100644
--- a/src/onaptests/scenario/basic_vm.py
+++ b/src/onaptests/scenario/basic_vm.py
@@ -20,7 +20,7 @@ class BasicVm(ScenarioBase):
         """Init BasicVM."""
         super().__init__('basic_vm', **kwargs)
         self.test = YamlTemplateVfModuleAlaCarteInstantiateStep(
-                cleanup=settings.CLEANUP_FLAG)
+            cleanup=settings.CLEANUP_FLAG)
         self.start_time = None
         self.stop_time = None
         self.result = 0
diff --git a/src/onaptests/scenario/cds_blueprint_enrichment.py b/src/onaptests/scenario/cds_blueprint_enrichment.py
index 5a63695..a16169b 100644
--- a/src/onaptests/scenario/cds_blueprint_enrichment.py
+++ b/src/onaptests/scenario/cds_blueprint_enrichment.py
@@ -20,7 +20,7 @@ class CDSBlueprintEnrichment(ScenarioBase):
         """Init CDS blueprint enrichment use case."""
         super().__init__('basic_cds', **kwargs)
         self.test = CbaEnrichStep(
-                cleanup=settings.CLEANUP_FLAG)
+            cleanup=settings.CLEANUP_FLAG)
         self.start_time = None
         self.stop_time = None
         self.result = 0
diff --git a/src/onaptests/scenario/cds_resource_resolution.py b/src/onaptests/scenario/cds_resource_resolution.py
index 7bf2f94..470f030 100644
--- a/src/onaptests/scenario/cds_resource_resolution.py
+++ b/src/onaptests/scenario/cds_resource_resolution.py
@@ -67,7 +67,7 @@ class CDSResourceResolution(ScenarioBase):
         """Init CDS resource resolution use case."""
         super().__init__('basic_cds', **kwargs)
         self.test = CDSResourceResolutionStep(
-                cleanup=settings.CLEANUP_FLAG)
+            cleanup=settings.CLEANUP_FLAG)
         self.start_time = None
         self.stop_time = None
         self.result = 0
diff --git a/src/onaptests/scenario/clearwater_ims.py b/src/onaptests/scenario/clearwater_ims.py
index db0a01f..ed16bc4 100644
--- a/src/onaptests/scenario/clearwater_ims.py
+++ b/src/onaptests/scenario/clearwater_ims.py
@@ -21,7 +21,7 @@ class ClearwaterIms(ScenarioBase):
         # import clearwater_ims_nomulticloud_settings needed
         super().__init__('clearwater_ims', **kwargs)
         self.test = YamlTemplateVfModuleAlaCarteInstantiateStep(
-                cleanup=settings.CLEANUP_FLAG)
+            cleanup=settings.CLEANUP_FLAG)
         self.start_time = None
         self.stop_time = None
         self.result = 0
@@ -56,5 +56,5 @@ class ClearwaterIms(ScenarioBase):
         """Clean Additional resources if needed."""
         try:
             self.test.reports_collection.generate_report()
-        except:
+        except:  # noqa
             self.__logger.error("Impossible to generate reporting")
diff --git a/src/onaptests/scenario/multi_vnf_macro.py b/src/onaptests/scenario/multi_vnf_macro.py
index 4a8c6cc..82a0511 100644
--- a/src/onaptests/scenario/multi_vnf_macro.py
+++ b/src/onaptests/scenario/multi_vnf_macro.py
@@ -117,7 +117,8 @@ class MultiVnfUbuntuMacro(ScenarioBase):
         self.start_time = time.time()
         try:
             self.test.execute()
-            self.__logger.info("Starting to clean up in {} seconds".format(settings.CLEANUP_ACTIVITY_TIMER))
+            self.__logger.info("Starting to clean up in {} seconds".format(
+                settings.CLEANUP_ACTIVITY_TIMER))
             time.sleep(settings.CLEANUP_ACTIVITY_TIMER)
             self.test.cleanup()
             self.result = 100
diff --git a/src/onaptests/scenario/status.py b/src/onaptests/scenario/status.py
index ed27975..881a840 100644
--- a/src/onaptests/scenario/status.py
+++ b/src/onaptests/scenario/status.py
@@ -17,7 +17,7 @@ class Status(ScenarioBase):
         """Init the testcase."""
         super().__init__('status', **kwargs)
         self.test = CheckNamespaceStatusStep(
-                cleanup=settings.CLEANUP_FLAG)
+            cleanup=settings.CLEANUP_FLAG)
         self.start_time = None
         self.stop_time = None
         self.result = 0