Fix import statement linting errors

gso/main.py

@@ -4,12 +4,13 @@ The main module, from where GSO is run.
 from orchestrator import OrchestratorCore
 from orchestrator.cli.main import app as core_cli
 from orchestrator.settings import AppSettings
+
 # pylint: disable=unused-import
 import gso.products  # noqa: F401
+
 # pylint: disable=unused-import
 import gso.workflows  # noqa: F401
 
-
 app = OrchestratorCore(base_settings=AppSettings())
 
 if __name__ == "__main__":

gso/products/product_blocks/device.py

+import ipaddress
 from typing import Optional
 
 from orchestrator.domain.base import ProductBlockModel
 from orchestrator.types import SubscriptionLifecycle, strEnum
-from gso.products.product_blocks.site \
-    import SiteBlock, SiteBlockInactive, SiteBlockProvisioning
-import ipaddress
+
+from gso.products.product_blocks.site import SiteBlock, SiteBlockInactive, SiteBlockProvisioning
 
 
 class DeviceVendor(strEnum):

gso/products/product_blocks/iptrunk.py

+import ipaddress
 from typing import Optional
-from pydantic import Field
 
 from orchestrator.domain.base import ProductBlockModel
 from orchestrator.types import SubscriptionLifecycle, strEnum
-from gso.products.product_blocks.device \
-    import DeviceBlock, DeviceBlockInactive, DeviceBlockProvisioning
-import ipaddress
+from pydantic import Field
+
+from gso.products.product_blocks.device import DeviceBlock, DeviceBlockInactive, DeviceBlockProvisioning
 
 
 class IptrunkType(strEnum):

gso/products/product_types/device.py

 from orchestrator.domain.base import SubscriptionModel
 from orchestrator.types import SubscriptionLifecycle, strEnum
 
-from gso.products.product_blocks.device \
-    import DeviceBlock, DeviceBlockInactive, DeviceBlockProvisioning
+from gso.products.product_blocks.device import DeviceBlock, DeviceBlockInactive, DeviceBlockProvisioning
 
 
 class DeviceType(strEnum):

gso/products/product_types/iptrunk.py

 from orchestrator.domain.base import SubscriptionModel
 from orchestrator.types import SubscriptionLifecycle
 
-from gso.products.product_blocks.iptrunk \
-    import IptrunkBlock, IptrunkBlockInactive, IptrunkBlockProvisioning
+from gso.products.product_blocks.iptrunk import IptrunkBlock, IptrunkBlockInactive, IptrunkBlockProvisioning
 
 
 class IptrunkInactive(SubscriptionModel, is_base=True):

gso/products/product_types/site.py

 from orchestrator.domain.base import SubscriptionModel
 from orchestrator.types import SubscriptionLifecycle
 
-from gso.products.product_blocks.site \
-    import SiteBlock, SiteBlockInactive, SiteBlockProvisioning
+from gso.products.product_blocks.site import SiteBlock, SiteBlockInactive, SiteBlockProvisioning
 
 
 class SiteInactive(SubscriptionModel, is_base=True):

gso/services/_ipam.py

 import ipaddress
-import requests
 from enum import Enum
+from typing import Union
+
+import requests
 from pydantic import BaseSettings
 from requests.auth import HTTPBasicAuth
-from typing import Union
 
 from gso import settings
 

gso/services/ipam.py

 import ipaddress
-from pydantic import BaseSettings
 from typing import Union
 
+from pydantic import BaseSettings
+
 from gso.services import _ipam
 
 

gso/services/provisioning_proxy.py

@@ -9,16 +9,17 @@ import requests
 from orchestrator import inputstep
 from orchestrator.config.assignee import Assignee
 from orchestrator.domain import SubscriptionModel
+
 # noinspection PyProtectedMember
 from orchestrator.forms import FormPage, ReadOnlyField
 from orchestrator.forms.validators import Accept, Label, LongText
-from orchestrator.types import UUIDstr, State, strEnum
+from orchestrator.types import State, UUIDstr, strEnum
 from orchestrator.utils.json import json_dumps
 from pydantic import validator
 
 from gso import settings
 from gso.products.product_types.device import DeviceProvisioning
-from gso.products.product_types.iptrunk import IptrunkProvisioning, Iptrunk
+from gso.products.product_types.iptrunk import Iptrunk, IptrunkProvisioning
 
 logger = logging.getLogger(__name__)
 

gso/services/resource_manager.py

-from gso import settings
 import requests
 
+from gso import settings
+
 
 def import_new_router(router_name, oss_params=settings.OSSParams):
     r = requests.post(

gso/settings.py

@@ -4,6 +4,7 @@ GSO settings, ensuring that the required parameters are set correctly.
 import ipaddress
 import json
 import os
+
 # from pydantic import BaseSettings, Field
 from pydantic import BaseSettings
 

gso/workflows/device/create_device.py

@@ -8,26 +8,17 @@ from orchestrator.db.models import ProductTable, SubscriptionTable
 from orchestrator.forms import FormPage
 from orchestrator.forms.validators import Choice
 from orchestrator.targets import Target
-from orchestrator.types import FormGenerator, State
-from orchestrator.types import SubscriptionLifecycle, UUIDstr
+from orchestrator.types import FormGenerator, State, SubscriptionLifecycle, UUIDstr
 from orchestrator.workflow import done, init, step, workflow
-from orchestrator.workflows.steps import resync, set_status
-from orchestrator.workflows.steps import store_process_subscription
+from orchestrator.workflows.steps import resync, set_status, store_process_subscription
 from orchestrator.workflows.utils import wrap_create_initial_input_form
 
 from gso.products.product_blocks import device as device_pb
 from gso.products.product_types import device
-from gso.products.product_types.device import (
-    DeviceInactive,
-    DeviceProvisioning,
-)
+from gso.products.product_types.device import DeviceInactive, DeviceProvisioning
 from gso.products.product_types.site import Site
-from gso.services import _ipam
-from gso.services import provisioning_proxy
-from gso.services.provisioning_proxy import (
-    await_pp_results,
-    confirm_pp_results,
-)
+from gso.services import _ipam, provisioning_proxy
+from gso.services.provisioning_proxy import await_pp_results, confirm_pp_results
 
 
 def site_selector() -> Choice:

gso/workflows/device/terminate_device.py

 import ipaddress
+
 from orchestrator.forms import FormPage
 from orchestrator.forms.validators import Label
 from orchestrator.targets import Target
 from orchestrator.types import InputForm, SubscriptionLifecycle, UUIDstr
 from orchestrator.workflow import done, init, step, workflow
-from gso.services import ipam
-from orchestrator.workflows.steps import (
-    resync,
-    set_status,
-    store_process_subscription,
-    unsync,
-)
+from orchestrator.workflows.steps import resync, set_status, store_process_subscription, unsync
 from orchestrator.workflows.utils import wrap_modify_initial_input_form
 
 from gso.products.product_types.device import Device
+from gso.services import ipam
 
 
 def initial_input_form_generator(subscription_id: UUIDstr) -> InputForm:

gso/workflows/iptrunk/create_iptrunk.py

@@ -6,25 +6,17 @@ from orchestrator.db.models import ProductTable, SubscriptionTable
 from orchestrator.forms import FormPage
 from orchestrator.forms.validators import Choice, UniqueConstrainedList
 from orchestrator.targets import Target
-from orchestrator.types import FormGenerator, State
-from orchestrator.types import SubscriptionLifecycle, UUIDstr
+from orchestrator.types import FormGenerator, State, SubscriptionLifecycle, UUIDstr
 from orchestrator.workflow import done, init, step, workflow
-from orchestrator.workflows.steps import resync, set_status
-from orchestrator.workflows.steps import store_process_subscription
+from orchestrator.workflows.steps import resync, set_status, store_process_subscription
 from orchestrator.workflows.utils import wrap_create_initial_input_form
 
 from gso.products.product_blocks import PhyPortCapacity
 from gso.products.product_blocks.iptrunk import IptrunkType
 from gso.products.product_types.device import Device
-from gso.products.product_types.iptrunk import (
-    IptrunkInactive,
-    IptrunkProvisioning,
-)
-from gso.services import provisioning_proxy, _ipam
-from gso.services.provisioning_proxy import (
-    confirm_pp_results,
-    await_pp_results,
-)
+from gso.products.product_types.iptrunk import IptrunkInactive, IptrunkProvisioning
+from gso.services import _ipam, provisioning_proxy
+from gso.services.provisioning_proxy import await_pp_results, confirm_pp_results
 
 
 def initial_input_form_generator(product_name: str) -> FormGenerator:

gso/workflows/iptrunk/modify_generic.py

 import ipaddress
+
 from orchestrator.forms import FormPage, ReadOnlyField
+from orchestrator.forms.validators import Choice, UniqueConstrainedList
 from orchestrator.targets import Target
-from orchestrator.types import FormGenerator, State
-from orchestrator.types import UUIDstr
+from orchestrator.types import FormGenerator, State, UUIDstr
 from orchestrator.workflow import done, init, step, workflow
-from orchestrator.workflows.steps import resync
-from orchestrator.workflows.steps import store_process_subscription, unsync
+from orchestrator.workflows.steps import resync, store_process_subscription, unsync
 from orchestrator.workflows.utils import wrap_modify_initial_input_form
-from orchestrator.forms.validators import Choice, UniqueConstrainedList
-from gso.products.product_blocks.iptrunk import IptrunkType
-from gso.products.product_blocks import PhyPortCapacity
 
-from gso.products.product_types.iptrunk import (
-    Iptrunk,
-)
+from gso.products.product_blocks import PhyPortCapacity
+from gso.products.product_blocks.iptrunk import IptrunkType
+from gso.products.product_types.iptrunk import Iptrunk
 from gso.services import provisioning_proxy
-from gso.services.provisioning_proxy import (
-    confirm_pp_results,
-    await_pp_results,
-)
+from gso.services.provisioning_proxy import await_pp_results, confirm_pp_results
 
 
 def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:

gso/workflows/iptrunk/modify_isis_metric.py

 from orchestrator.forms import FormPage
 from orchestrator.targets import Target
-from orchestrator.types import FormGenerator, State
-from orchestrator.types import UUIDstr
+from orchestrator.types import FormGenerator, State, UUIDstr
 from orchestrator.workflow import done, init, step, workflow
-from orchestrator.workflows.steps import resync
-from orchestrator.workflows.steps import store_process_subscription, unsync
+from orchestrator.workflows.steps import resync, store_process_subscription, unsync
 from orchestrator.workflows.utils import wrap_modify_initial_input_form
 
-from gso.products.product_types.iptrunk import (
-    Iptrunk,
-)
+from gso.products.product_types.iptrunk import Iptrunk
 from gso.services import provisioning_proxy
-from gso.services.provisioning_proxy import (
-    confirm_pp_results,
-    await_pp_results,
-)
+from gso.services.provisioning_proxy import await_pp_results, confirm_pp_results
 
 
 def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:

gso/workflows/iptrunk/terminate_iptrunk.py

 # noinspection PyProtectedMember
 import ipaddress
+
 from orchestrator.forms import FormPage
 from orchestrator.forms.validators import Label
 from orchestrator.targets import Target
-from orchestrator.types import InputForm, SubscriptionLifecycle, UUIDstr
-from orchestrator.types import State
+from orchestrator.types import InputForm, State, SubscriptionLifecycle, UUIDstr
 from orchestrator.workflow import done, init, step, workflow
-from orchestrator.workflows.steps import (
-    resync,
-    set_status,
-    store_process_subscription,
-    unsync,
-)
+from orchestrator.workflows.steps import resync, set_status, store_process_subscription, unsync
 from orchestrator.workflows.utils import wrap_modify_initial_input_form
 
 from gso.products.product_types.iptrunk import Iptrunk
-from gso.services import provisioning_proxy, ipam
-from gso.services.provisioning_proxy import (
-    confirm_pp_results,
-    await_pp_results,
-)
+from gso.services import ipam, provisioning_proxy
+from gso.services.provisioning_proxy import await_pp_results, confirm_pp_results
 
 
 def initial_input_form_generator(subscription_id: UUIDstr) -> InputForm:

gso/workflows/site/create_site.py

@@ -2,11 +2,9 @@ from uuid import uuid4
 
 from orchestrator.forms import FormPage
 from orchestrator.targets import Target
-from orchestrator.types import FormGenerator, State
-from orchestrator.types import SubscriptionLifecycle, UUIDstr
+from orchestrator.types import FormGenerator, State, SubscriptionLifecycle, UUIDstr
 from orchestrator.workflow import done, init, step, workflow
-from orchestrator.workflows.steps import resync, set_status
-from orchestrator.workflows.steps import store_process_subscription
+from orchestrator.workflows.steps import resync, set_status, store_process_subscription
 from orchestrator.workflows.utils import wrap_create_initial_input_form
 
 from gso.products.product_blocks import site as site_pb

setup.py

-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
 
 setup(
     name='geant-service-orchestrator',

test/test_ipam.py

 import ipaddress
-import pytest
 import re
 
+import pytest
 import responses
 
 from gso.services import ipam