7 files changed, 11 insertions, 8 deletions
diff --git a/src/onaptests/scenario/basic_cnf_macro.py b/src/onaptests/scenario/basic_cnf_macro.py
index 71b6863..95fafad 100644
--- a/src/onaptests/scenario/basic_cnf_macro.py
+++ b/src/onaptests/scenario/basic_cnf_macro.py
@@ -1,7 +1,7 @@
 """Instantiate basic cnf using SO macro flow."""
+from onapsdk.configuration import settings
 from yaml import SafeLoader, load
 
-from onapsdk.configuration import settings
 from onaptests.scenario.scenario_base import (BaseStep, ScenarioBase,
                                               YamlTemplateBaseScenarioStep)
 from onaptests.steps.instantiate.service_macro import \
diff --git a/src/onaptests/scenario/basic_cps.py b/src/onaptests/scenario/basic_cps.py
index f6189da..a99cc78 100644
--- a/src/onaptests/scenario/basic_cps.py
+++ b/src/onaptests/scenario/basic_cps.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 """Basic CPS test case."""
 from onapsdk.configuration import settings
-from onaptests.scenario.scenario_base import BaseStep, ScenarioBase, BaseScenarioStep
+
+from onaptests.scenario.scenario_base import (BaseScenarioStep, BaseStep,
+                                              ScenarioBase)
 from onaptests.steps.onboard.cps import (CheckPostgressDataBaseConnectionStep,
                                          QueryCpsAnchorNodeStep)
 
diff --git a/src/onaptests/scenario/basic_vm_macro.py b/src/onaptests/scenario/basic_vm_macro.py
index 0045761..8413258 100644
--- a/src/onaptests/scenario/basic_vm_macro.py
+++ b/src/onaptests/scenario/basic_vm_macro.py
@@ -1,7 +1,7 @@
 """Instantiate basic vm using SO macro flow."""
+from onapsdk.configuration import settings
 from yaml import SafeLoader, load
 
-from onapsdk.configuration import settings
 from onaptests.scenario.scenario_base import (BaseStep, ScenarioBase,
                                               YamlTemplateBaseScenarioStep)
 from onaptests.steps.instantiate.service_macro import \
diff --git a/src/onaptests/scenario/cds_resource_resolution.py b/src/onaptests/scenario/cds_resource_resolution.py
index fcc3e93..03f8a86 100644
--- a/src/onaptests/scenario/cds_resource_resolution.py
+++ b/src/onaptests/scenario/cds_resource_resolution.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 """CDS resource resolution test scenario."""
-from onaptests.scenario.scenario_base import BaseStep, ScenarioBase, BaseScenarioStep
+from onaptests.scenario.scenario_base import (BaseScenarioStep, BaseStep,
+                                              ScenarioBase)
 from onaptests.steps.onboard.cds import CbaProcessStep
 from onaptests.steps.simulator.cds_mockserver import \
     CdsMockserverCnfConfigureStep
diff --git a/src/onaptests/scenario/multi_vnf_macro.py b/src/onaptests/scenario/multi_vnf_macro.py
index 47b1830..f4dfc71 100644
--- a/src/onaptests/scenario/multi_vnf_macro.py
+++ b/src/onaptests/scenario/multi_vnf_macro.py
@@ -1,7 +1,7 @@
 """Instantiate basic vm using SO macro flow."""
+from onapsdk.configuration import settings
 from yaml import SafeLoader, load
 
-from onapsdk.configuration import settings
 from onaptests.scenario.scenario_base import (BaseStep, ScenarioBase,
                                               YamlTemplateBaseScenarioStep)
 from onaptests.steps.instantiate.service_macro import \
diff --git a/src/onaptests/scenario/pnf_macro.py b/src/onaptests/scenario/pnf_macro.py
index 88d42d1..10f9866 100644
--- a/src/onaptests/scenario/pnf_macro.py
+++ b/src/onaptests/scenario/pnf_macro.py
@@ -1,7 +1,7 @@
 """Instantiate service with PNF using SO macro flow."""
+from onapsdk.configuration import settings
 from yaml import SafeLoader, load
 
-from onapsdk.configuration import settings
 from onaptests.scenario.scenario_base import (BaseStep, ScenarioBase,
                                               YamlTemplateBaseScenarioStep)
 from onaptests.steps.instantiate.pnf_register_ves import \
diff --git a/src/onaptests/scenario/scenario_base.py b/src/onaptests/scenario/scenario_base.py
index 7069afb..f19352a 100644
--- a/src/onaptests/scenario/scenario_base.py
+++ b/src/onaptests/scenario/scenario_base.py
@@ -1,10 +1,10 @@
 import logging
 import time
 
-from xtesting.core import testcase
-
 from onapsdk.configuration import settings
 from onapsdk.exceptions import SDKException, SettingsError
+from xtesting.core import testcase
+
 from onaptests.steps.base import BaseStep, YamlTemplateBaseStep
 from onaptests.utils.exceptions import (OnapTestException,
                                         TestConfigurationException)