Changes in the packages sort order

Issue-ID: TEST-402
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@t-mobile.pl>
Change-Id: I9f8ac40254e6a052c4b3ced5b05e21d7e84fa37f

13 files changed, 41 insertions, 26 deletions

diff --git a/src/onaptests/configuration/basic_clamp_settings.py b/src/onaptests/configuration/basic_clamp_settings.py
index 7563fb6..1277f5f 100644
--- a/src/onaptests/configuration/basic_clamp_settings.py
+++ b/src/onaptests/configuration/basic_clamp_settings.py
@@ -1,9 +1,9 @@
-from yaml import load, SafeLoader
+from yaml import SafeLoader, load
+
 from onaptests.utils.resources import get_resource_location
 
 from .settings import *  # noqa
 
-
 CLEANUP_FLAG = False
 CLAMP_DISTRIBUTION_TIMER = 10
 
diff --git a/src/onaptests/configuration/basic_cnf_macro_settings.py b/src/onaptests/configuration/basic_cnf_macro_settings.py
index 60682ca..a55267c 100644
--- a/src/onaptests/configuration/basic_cnf_macro_settings.py
+++ b/src/onaptests/configuration/basic_cnf_macro_settings.py
@@ -1,12 +1,13 @@
 import os
 from pathlib import Path
 from uuid import uuid4
-from yaml import load, SafeLoader
 
-from onaptests.utils.resources import get_resource_location
+from yaml import SafeLoader, load
+
 import onaptests.utils.exceptions as onap_test_exceptions
-from .settings import *  # noqa
+from onaptests.utils.resources import get_resource_location
 
+from .settings import *  # noqa
 
 # Specific basic_cnf_macro with multicloud-k8s and yaml config scenario.
 SERVICE_DETAILS = ("Onboarding, distribution and instantiation of a Apache CNF " +
diff --git a/src/onaptests/configuration/basic_cnf_yaml_settings.py b/src/onaptests/configuration/basic_cnf_yaml_settings.py
index 34a1d4d..ec451a1 100644
--- a/src/onaptests/configuration/basic_cnf_yaml_settings.py
+++ b/src/onaptests/configuration/basic_cnf_yaml_settings.py
@@ -1,9 +1,11 @@
 import os
-from yaml import load, SafeLoader
-from onaptests.utils.resources import get_resource_location
+
+from yaml import SafeLoader, load
+
 import onaptests.utils.exceptions as onap_test_exceptions
-from .settings import *  # noqa
+from onaptests.utils.resources import get_resource_location
 
+from .settings import *  # noqa
 
 # Specific basic_cnf with multicloud-k8s and yaml config scenario.
 SERVICE_DETAILS = ("Onboarding, distribution and instantiation of a CNF" +
diff --git a/src/onaptests/configuration/basic_network_nomulticloud_settings.py b/src/onaptests/configuration/basic_network_nomulticloud_settings.py
index 7cecb51..9c8c210 100644
--- a/src/onaptests/configuration/basic_network_nomulticloud_settings.py
+++ b/src/onaptests/configuration/basic_network_nomulticloud_settings.py
@@ -1,11 +1,13 @@
 import os
+
 import openstack
-from yaml import load, SafeLoader
-from onaptests.utils.resources import get_resource_location
+from yaml import SafeLoader, load
+
 import onaptests.utils.exceptions as onap_test_exceptions
-from .settings import IF_VALIDATION
-from .settings import *  # noqa
+from onaptests.utils.resources import get_resource_location
 
+from .settings import *  # noqa
+from .settings import IF_VALIDATION
 
 # The ONAP part
 SERVICE_DETAILS = "Onboarding, distribution and instantiation of Basic Network using à la carte"
diff --git a/src/onaptests/configuration/basic_onboard_settings.py b/src/onaptests/configuration/basic_onboard_settings.py
index e757035..e16bf31 100644
--- a/src/onaptests/configuration/basic_onboard_settings.py
+++ b/src/onaptests/configuration/basic_onboard_settings.py
@@ -1,12 +1,14 @@
 
 import random
 import string
-from yaml import load, SafeLoader
+
 from jinja2 import Environment, PackageLoader
+from yaml import SafeLoader, load
 
 import onaptests.utils.exceptions as onap_test_exceptions
 from onaptests.utils.resources import get_resource_location
-from .settings import * # noqa
+
+from .settings import *  # noqa
 
 
 # We need to create a service file with a random service name,
diff --git a/src/onaptests/configuration/basic_vm_multicloud_yaml_settings.py b/src/onaptests/configuration/basic_vm_multicloud_yaml_settings.py
index 1cb1aec..2a8f6f7 100644
--- a/src/onaptests/configuration/basic_vm_multicloud_yaml_settings.py
+++ b/src/onaptests/configuration/basic_vm_multicloud_yaml_settings.py
@@ -1,6 +1,6 @@
 from onaptests.utils.resources import get_resource_location
-from .settings import *  # noqa
 
+from .settings import *  # noqa
 
 # Specific Basic VM with multicloud and yaml config scenario.
 SERVICE_DETAILS = ("Onboarding, distribution and instantiation of a VM" +
diff --git a/src/onaptests/configuration/basic_vm_settings.py b/src/onaptests/configuration/basic_vm_settings.py
index f26bbd8..41a1dc4 100644
--- a/src/onaptests/configuration/basic_vm_settings.py
+++ b/src/onaptests/configuration/basic_vm_settings.py
@@ -1,11 +1,13 @@
 import os
+
 import openstack
-from yaml import load, SafeLoader
-from onaptests.utils.resources import get_resource_location
+from yaml import SafeLoader, load
+
 import onaptests.utils.exceptions as onap_test_exceptions
-from .settings import IF_VALIDATION
-from .settings import *  # noqa
+from onaptests.utils.resources import get_resource_location
 
+from .settings import *  # noqa
+from .settings import IF_VALIDATION
 
 # The ONAP part
 SERVICE_DETAILS = "Onboarding, distribution and instanitation of an Ubuntu VM using à la carte"
diff --git a/src/onaptests/configuration/cba_enrichment_settings.py b/src/onaptests/configuration/cba_enrichment_settings.py
index 534ebbe..72cf647 100644
--- a/src/onaptests/configuration/cba_enrichment_settings.py
+++ b/src/onaptests/configuration/cba_enrichment_settings.py
@@ -1,6 +1,7 @@
 from pathlib import Path
 
 from onaptests.utils.resources import get_resource_location
+
 from .settings import *  # noqa
 
 SERVICE_NAME = "CDS blueprint enrichment"
diff --git a/src/onaptests/configuration/cds_resource_resolution_settings.py b/src/onaptests/configuration/cds_resource_resolution_settings.py
index f7573a6..7b311a1 100644
--- a/src/onaptests/configuration/cds_resource_resolution_settings.py
+++ b/src/onaptests/configuration/cds_resource_resolution_settings.py
@@ -2,6 +2,7 @@ from pathlib import Path
 from uuid import uuid4
 
 from onaptests.utils.resources import get_resource_location
+
 from .settings import *  # noqa
 
 CLEANUP_FLAG = True
diff --git a/src/onaptests/configuration/clearwater_ims_nomulticloud_settings.py b/src/onaptests/configuration/clearwater_ims_nomulticloud_settings.py
index 07c966c..2543351 100644
--- a/src/onaptests/configuration/clearwater_ims_nomulticloud_settings.py
+++ b/src/onaptests/configuration/clearwater_ims_nomulticloud_settings.py
@@ -1,10 +1,12 @@
 import os
+
 import openstack
-from yaml import load, SafeLoader
+from yaml import SafeLoader, load
+
 from onaptests.utils.resources import get_resource_location
-from .settings import IF_VALIDATION
-from .settings import *  # noqa
 
+from .settings import *  # noqa
+from .settings import IF_VALIDATION
 
 SERVICE_DETAILS = "Onboarding, distribution and instantiation of a Clearwater IMS"
 # The ONAP part
diff --git a/src/onaptests/configuration/multi_vnf_ubuntu_settings.py b/src/onaptests/configuration/multi_vnf_ubuntu_settings.py
index a23d72e..bdf6576 100644
--- a/src/onaptests/configuration/multi_vnf_ubuntu_settings.py
+++ b/src/onaptests/configuration/multi_vnf_ubuntu_settings.py
@@ -1,12 +1,14 @@
-import uuid
 import os
+import uuid
 from pathlib import Path
+
 import openstack
 from jinja2 import Environment, PackageLoader
+
 from onaptests.utils.resources import get_resource_location
-from .settings import IF_VALIDATION
-from .settings import *  # noqa
 
+from .settings import *  # noqa
+from .settings import IF_VALIDATION
 
 VNF_FILENAME_PREFIX = "multi-vnf-ubuntu"
 SERVICE_NAME = f"multivnfubuntu{str(uuid.uuid4().hex)[:6]}"
diff --git a/src/onaptests/configuration/pnf_macro_settings.py b/src/onaptests/configuration/pnf_macro_settings.py
index 53d22e7..877b569 100644
--- a/src/onaptests/configuration/pnf_macro_settings.py
+++ b/src/onaptests/configuration/pnf_macro_settings.py
@@ -2,6 +2,7 @@ from pathlib import Path
 from uuid import uuid4
 
 from onaptests.utils.resources import get_resource_location
+
 from .settings import *  # noqa
 
 ONLY_INSTANTIATE = False
diff --git a/src/onaptests/configuration/status_settings.py b/src/onaptests/configuration/status_settings.py
index 13fb8cd..691c747 100644
--- a/src/onaptests/configuration/status_settings.py
+++ b/src/onaptests/configuration/status_settings.py
@@ -1,6 +1,5 @@
 from .settings import *  # noqa
 
-
 SERVICE_NAME = "Status Check"
 SERVICE_DETAILS = "Checks status of all k8s resources in the selected namespace"
 STATUS_RESULTS_DIRECTORY = "/tmp"