From ba464de96fdafcf66b544a19f517ceaad8eaa2d7 Mon Sep 17 00:00:00 2001
From: Karel van Klink <karel.vanklink@geant.org>
Date: Tue, 29 Aug 2023 16:52:26 +0200
Subject: [PATCH] tune some imports, limit port number to non-dynamic range
---
gso/workflows/iptrunk/create_iptrunk.py | 1 -
gso/workflows/tasks/import_router.py | 2 +-
test/imports/conftest.py | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/gso/workflows/iptrunk/create_iptrunk.py b/gso/workflows/iptrunk/create_iptrunk.py
index 16b4a291..bf70d821 100644
--- a/gso/workflows/iptrunk/create_iptrunk.py
+++ b/gso/workflows/iptrunk/create_iptrunk.py
@@ -1,4 +1,3 @@
-from orchestrator.db.models import ProductTable, SubscriptionTable
from orchestrator.forms import FormPage
from orchestrator.forms.validators import Choice, UniqueConstrainedList
from orchestrator.targets import Target
diff --git a/gso/workflows/tasks/import_router.py b/gso/workflows/tasks/import_router.py
index 01b7081d..9e0a4337 100644
--- a/gso/workflows/tasks/import_router.py
+++ b/gso/workflows/tasks/import_router.py
@@ -13,8 +13,8 @@ from gso.products.product_blocks import router as router_pb
from gso.products.product_blocks.router import RouterRole, RouterVendor
from gso.products.product_types import router
from gso.products.product_types.router import RouterInactive
-from gso.products.shared import PortNumber
from gso.products.product_types.site import Site
+from gso.products.shared import PortNumber
from gso.schemas.enums import ProductType
from gso.services import subscriptions
from gso.services.crm import get_customer_by_name
diff --git a/test/imports/conftest.py b/test/imports/conftest.py
index b6207edd..320b0669 100644
--- a/test/imports/conftest.py
+++ b/test/imports/conftest.py
@@ -87,7 +87,7 @@ def router_subscription_factory(site_subscription_factory, faker):
) -> UUIDstr:
description = description or faker.text(max_nb_chars=30)
router_fqdn = router_fqdn or faker.domain_name()
- router_ts_port = router_ts_port or faker.random_int(min=1, max=65535)
+ router_ts_port = router_ts_port or faker.random_int(min=1, max=49151)
router_access_via_ts = router_access_via_ts or faker.boolean()
router_lo_ipv4_address = router_lo_ipv4_address or ipaddress.IPv4Address(faker.ipv4())
router_lo_ipv6_address = router_lo_ipv6_address or ipaddress.IPv6Address(faker.ipv6())
--
GitLab