From 4d1d48eca6fb494b9ee0d656b6500dbc0359f519 Mon Sep 17 00:00:00 2001
From: Karel van Klink <karel.vanklink@geant.org>
Date: Fri, 30 Jun 2023 10:52:07 +0200
Subject: [PATCH] Fix import statement linting errors
---
gso/main.py | 3 ++-
gso/products/product_blocks/device.py | 6 +++---
gso/products/product_blocks/iptrunk.py | 8 ++++----
gso/products/product_types/device.py | 3 +--
gso/products/product_types/iptrunk.py | 3 +--
gso/products/product_types/site.py | 3 +--
gso/services/_ipam.py | 5 +++--
gso/services/ipam.py | 3 ++-
gso/services/provisioning_proxy.py | 5 +++--
gso/services/resource_manager.py | 3 ++-
gso/settings.py | 1 +
gso/workflows/device/create_device.py | 19 +++++-------------
gso/workflows/device/terminate_device.py | 10 +++-------
gso/workflows/iptrunk/create_iptrunk.py | 18 +++++------------
gso/workflows/iptrunk/modify_generic.py | 22 ++++++++-------------
gso/workflows/iptrunk/modify_isis_metric.py | 15 ++++----------
gso/workflows/iptrunk/terminate_iptrunk.py | 18 +++++------------
gso/workflows/site/create_site.py | 6 ++----
setup.py | 2 +-
test/test_ipam.py | 2 +-
20 files changed, 57 insertions(+), 98 deletions(-)
diff --git a/gso/main.py b/gso/main.py
index e95976e5..ca9268a0 100644
--- a/gso/main.py
+++ b/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__":
diff --git a/gso/products/product_blocks/device.py b/gso/products/product_blocks/device.py
index cc627b0e..0fd8f693 100644
--- a/gso/products/product_blocks/device.py
+++ b/gso/products/product_blocks/device.py
@@ -1,10 +1,10 @@
+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):
diff --git a/gso/products/product_blocks/iptrunk.py b/gso/products/product_blocks/iptrunk.py
index 629cf459..c74df8f7 100644
--- a/gso/products/product_blocks/iptrunk.py
+++ b/gso/products/product_blocks/iptrunk.py
@@ -1,11 +1,11 @@
+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):
diff --git a/gso/products/product_types/device.py b/gso/products/product_types/device.py
index f2ecb3d9..2fa03627 100644
--- a/gso/products/product_types/device.py
+++ b/gso/products/product_types/device.py
@@ -1,8 +1,7 @@
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):
diff --git a/gso/products/product_types/iptrunk.py b/gso/products/product_types/iptrunk.py
index d12e0108..6f0b4040 100644
--- a/gso/products/product_types/iptrunk.py
+++ b/gso/products/product_types/iptrunk.py
@@ -1,8 +1,7 @@
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):
diff --git a/gso/products/product_types/site.py b/gso/products/product_types/site.py
index 8c3379c9..7571acc4 100644
--- a/gso/products/product_types/site.py
+++ b/gso/products/product_types/site.py
@@ -1,8 +1,7 @@
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):
diff --git a/gso/services/_ipam.py b/gso/services/_ipam.py
index dc7df683..89dd186e 100644
--- a/gso/services/_ipam.py
+++ b/gso/services/_ipam.py
@@ -1,9 +1,10 @@
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
diff --git a/gso/services/ipam.py b/gso/services/ipam.py
index 724db901..c438ed7c 100644
--- a/gso/services/ipam.py
+++ b/gso/services/ipam.py
@@ -1,7 +1,8 @@
import ipaddress
-from pydantic import BaseSettings
from typing import Union
+from pydantic import BaseSettings
+
from gso.services import _ipam
diff --git a/gso/services/provisioning_proxy.py b/gso/services/provisioning_proxy.py
index 0c4dbb1c..2fe01ffc 100644
--- a/gso/services/provisioning_proxy.py
+++ b/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__)
diff --git a/gso/services/resource_manager.py b/gso/services/resource_manager.py
index 334e7b3e..13106d8a 100644
--- a/gso/services/resource_manager.py
+++ b/gso/services/resource_manager.py
@@ -1,6 +1,7 @@
-from gso import settings
import requests
+from gso import settings
+
def import_new_router(router_name, oss_params=settings.OSSParams):
r = requests.post(
diff --git a/gso/settings.py b/gso/settings.py
index a28b4eae..dd81fe64 100644
--- a/gso/settings.py
+++ b/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
diff --git a/gso/workflows/device/create_device.py b/gso/workflows/device/create_device.py
index 681b5259..dba6510d 100644
--- a/gso/workflows/device/create_device.py
+++ b/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:
diff --git a/gso/workflows/device/terminate_device.py b/gso/workflows/device/terminate_device.py
index c8b91473..cd56cd14 100644
--- a/gso/workflows/device/terminate_device.py
+++ b/gso/workflows/device/terminate_device.py
@@ -1,19 +1,15 @@
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:
diff --git a/gso/workflows/iptrunk/create_iptrunk.py b/gso/workflows/iptrunk/create_iptrunk.py
index 5c5f9feb..127caf0a 100644
--- a/gso/workflows/iptrunk/create_iptrunk.py
+++ b/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:
diff --git a/gso/workflows/iptrunk/modify_generic.py b/gso/workflows/iptrunk/modify_generic.py
index 9c3c633c..c4745e1f 100644
--- a/gso/workflows/iptrunk/modify_generic.py
+++ b/gso/workflows/iptrunk/modify_generic.py
@@ -1,24 +1,18 @@
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:
diff --git a/gso/workflows/iptrunk/modify_isis_metric.py b/gso/workflows/iptrunk/modify_isis_metric.py
index 8d769b60..e8911c76 100644
--- a/gso/workflows/iptrunk/modify_isis_metric.py
+++ b/gso/workflows/iptrunk/modify_isis_metric.py
@@ -1,20 +1,13 @@
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:
diff --git a/gso/workflows/iptrunk/terminate_iptrunk.py b/gso/workflows/iptrunk/terminate_iptrunk.py
index 4190ee4d..ba1b9aa0 100644
--- a/gso/workflows/iptrunk/terminate_iptrunk.py
+++ b/gso/workflows/iptrunk/terminate_iptrunk.py
@@ -1,25 +1,17 @@
# 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:
diff --git a/gso/workflows/site/create_site.py b/gso/workflows/site/create_site.py
index 0773d71c..756c992a 100644
--- a/gso/workflows/site/create_site.py
+++ b/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
diff --git a/setup.py b/setup.py
index 333091fe..5dbfaf33 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
setup(
name='geant-service-orchestrator',
diff --git a/test/test_ipam.py b/test/test_ipam.py
index e3191bcc..ef1e7111 100644
--- a/test/test_ipam.py
+++ b/test/test_ipam.py
@@ -1,7 +1,7 @@
import ipaddress
-import pytest
import re
+import pytest
import responses
from gso.services import ipam
--
GitLab