From d1adb3dc1fb96809a1d45225aaee1c869e67fe11 Mon Sep 17 00:00:00 2001
From: Neda Moeini <neda.moeini@geant.org>
Date: Wed, 21 Feb 2024 08:52:37 +0100
Subject: [PATCH] Renamed shared_choices to shared_enums.
---
gso/api/v1/imports.py | 2 +-
gso/products/product_blocks/office_router.py | 2 +-
gso/products/product_blocks/router.py | 2 +-
gso/products/product_blocks/super_pop_switch.py | 2 +-
gso/utils/helpers.py | 2 +-
gso/utils/{shared_choices.py => shared_enums.py} | 0
gso/workflows/iptrunk/create_iptrunk.py | 2 +-
gso/workflows/iptrunk/migrate_iptrunk.py | 2 +-
gso/workflows/iptrunk/modify_trunk_interface.py | 2 +-
gso/workflows/iptrunk/terminate_iptrunk.py | 2 +-
gso/workflows/router/create_router.py | 2 +-
gso/workflows/router/terminate_router.py | 2 +-
gso/workflows/tasks/import_office_router.py | 2 +-
gso/workflows/tasks/import_router.py | 2 +-
gso/workflows/tasks/import_super_pop_switch.py | 2 +-
test/api/test_imports.py | 2 +-
test/fixtures.py | 2 +-
test/utils/test_helpers.py | 2 +-
test/workflows/iptrunk/test_create_iptrunk.py | 2 +-
test/workflows/iptrunk/test_migrate_iptrunk.py | 2 +-
test/workflows/iptrunk/test_modify_trunk_interface.py | 2 +-
test/workflows/router/test_create_router.py | 2 +-
22 files changed, 21 insertions(+), 21 deletions(-)
rename gso/utils/{shared_choices.py => shared_enums.py} (100%)
diff --git a/gso/api/v1/imports.py b/gso/api/v1/imports.py
index 8920765a..dd77bc80 100644
--- a/gso/api/v1/imports.py
+++ b/gso/api/v1/imports.py
@@ -16,7 +16,7 @@ from gso.products.product_blocks.site import SiteTier
from gso.services import subscriptions
from gso.services.crm import CustomerNotFoundError, get_customer_by_name
from gso.utils.helpers import BaseSiteValidatorModel, LAGMember
-from gso.utils.shared_choices import PortNumber, Vendor
+from gso.utils.shared_enums import PortNumber, Vendor
router = APIRouter(prefix="/imports", tags=["Imports"], dependencies=[Depends(opa_security_default)])
diff --git a/gso/products/product_blocks/office_router.py b/gso/products/product_blocks/office_router.py
index 83471d8f..fec7ad8d 100644
--- a/gso/products/product_blocks/office_router.py
+++ b/gso/products/product_blocks/office_router.py
@@ -10,7 +10,7 @@ from gso.products.product_blocks.site import (
SiteBlockInactive,
SiteBlockProvisioning,
)
-from gso.utils.shared_choices import PortNumber, Vendor
+from gso.utils.shared_enums import PortNumber, Vendor
class OfficeRouterBlockInactive(
diff --git a/gso/products/product_blocks/router.py b/gso/products/product_blocks/router.py
index 04f1b91d..f91bf1c7 100644
--- a/gso/products/product_blocks/router.py
+++ b/gso/products/product_blocks/router.py
@@ -10,7 +10,7 @@ from gso.products.product_blocks.site import (
SiteBlockInactive,
SiteBlockProvisioning,
)
-from gso.utils.shared_choices import PortNumber, Vendor
+from gso.utils.shared_enums import PortNumber, Vendor
class RouterRole(strEnum):
diff --git a/gso/products/product_blocks/super_pop_switch.py b/gso/products/product_blocks/super_pop_switch.py
index 2e2d5b7c..af2f2ba7 100644
--- a/gso/products/product_blocks/super_pop_switch.py
+++ b/gso/products/product_blocks/super_pop_switch.py
@@ -10,7 +10,7 @@ from gso.products.product_blocks.site import (
SiteBlockInactive,
SiteBlockProvisioning,
)
-from gso.utils.shared_choices import PortNumber, Vendor
+from gso.utils.shared_enums import PortNumber, Vendor
class SuperPopSwitchBlockInactive(
diff --git a/gso/utils/helpers.py b/gso/utils/helpers.py
index 237d080e..6c30324e 100644
--- a/gso/utils/helpers.py
+++ b/gso/utils/helpers.py
@@ -18,7 +18,7 @@ from gso.products.product_blocks.site import SiteTier
from gso.products.product_types.router import Router
from gso.services.netbox_client import NetboxClient
from gso.services.subscriptions import get_active_subscriptions_by_field_and_value
-from gso.utils.shared_choices import Vendor
+from gso.utils.shared_enums import Vendor
class LAGMember(BaseModel):
diff --git a/gso/utils/shared_choices.py b/gso/utils/shared_enums.py
similarity index 100%
rename from gso/utils/shared_choices.py
rename to gso/utils/shared_enums.py
diff --git a/gso/workflows/iptrunk/create_iptrunk.py b/gso/workflows/iptrunk/create_iptrunk.py
index 8a094e40..e9e304d2 100644
--- a/gso/workflows/iptrunk/create_iptrunk.py
+++ b/gso/workflows/iptrunk/create_iptrunk.py
@@ -37,7 +37,7 @@ from gso.utils.helpers import (
validate_router_in_netbox,
validate_tt_number,
)
-from gso.utils.shared_choices import Vendor
+from gso.utils.shared_enums import Vendor
def initial_input_form_generator(product_name: str) -> FormGenerator:
diff --git a/gso/workflows/iptrunk/migrate_iptrunk.py b/gso/workflows/iptrunk/migrate_iptrunk.py
index edcc87df..5f1240c5 100644
--- a/gso/workflows/iptrunk/migrate_iptrunk.py
+++ b/gso/workflows/iptrunk/migrate_iptrunk.py
@@ -40,7 +40,7 @@ from gso.utils.helpers import (
validate_interface_name_list,
validate_tt_number,
)
-from gso.utils.shared_choices import Vendor
+from gso.utils.shared_enums import Vendor
from gso.utils.workflow_steps import set_isis_to_90000
diff --git a/gso/workflows/iptrunk/modify_trunk_interface.py b/gso/workflows/iptrunk/modify_trunk_interface.py
index 0e0aa525..d4e6edb1 100644
--- a/gso/workflows/iptrunk/modify_trunk_interface.py
+++ b/gso/workflows/iptrunk/modify_trunk_interface.py
@@ -33,7 +33,7 @@ from gso.utils.helpers import (
validate_iptrunk_unique_interface,
validate_tt_number,
)
-from gso.utils.shared_choices import Vendor
+from gso.utils.shared_enums import Vendor
def initialize_ae_members(subscription: Iptrunk, initial_user_input: dict, side_index: int) -> type[LAGMember]:
diff --git a/gso/workflows/iptrunk/terminate_iptrunk.py b/gso/workflows/iptrunk/terminate_iptrunk.py
index aa5a91ea..330c90c3 100644
--- a/gso/workflows/iptrunk/terminate_iptrunk.py
+++ b/gso/workflows/iptrunk/terminate_iptrunk.py
@@ -24,7 +24,7 @@ from gso.services import infoblox
from gso.services.netbox_client import NetboxClient
from gso.services.provisioning_proxy import execute_playbook, pp_interaction
from gso.utils.helpers import get_router_vendor, validate_tt_number
-from gso.utils.shared_choices import Vendor
+from gso.utils.shared_enums import Vendor
from gso.utils.workflow_steps import set_isis_to_90000
diff --git a/gso/workflows/router/create_router.py b/gso/workflows/router/create_router.py
index bdf829b7..f33dcec5 100644
--- a/gso/workflows/router/create_router.py
+++ b/gso/workflows/router/create_router.py
@@ -21,7 +21,7 @@ from gso.services.crm import get_customer_by_name
from gso.services.netbox_client import NetboxClient
from gso.services.provisioning_proxy import pp_interaction
from gso.utils.helpers import generate_fqdn, iso_from_ipv4
-from gso.utils.shared_choices import PortNumber, Vendor
+from gso.utils.shared_enums import PortNumber, Vendor
from gso.utils.workflow_steps import deploy_base_config_dry, deploy_base_config_real, run_checks_after_base_config
diff --git a/gso/workflows/router/terminate_router.py b/gso/workflows/router/terminate_router.py
index 1c5052b5..20ac88dd 100644
--- a/gso/workflows/router/terminate_router.py
+++ b/gso/workflows/router/terminate_router.py
@@ -22,7 +22,7 @@ from gso.products.product_types.router import Router
from gso.services import infoblox
from gso.services.netbox_client import NetboxClient
from gso.services.provisioning_proxy import execute_playbook, pp_interaction
-from gso.utils.shared_choices import Vendor
+from gso.utils.shared_enums import Vendor
logger = logging.getLogger(__name__)
diff --git a/gso/workflows/tasks/import_office_router.py b/gso/workflows/tasks/import_office_router.py
index ce7b3664..9b8de86f 100644
--- a/gso/workflows/tasks/import_office_router.py
+++ b/gso/workflows/tasks/import_office_router.py
@@ -15,7 +15,7 @@ from gso.products.product_types.office_router import OfficeRouterInactive
from gso.services import subscriptions
from gso.services.crm import get_customer_by_name
from gso.services.subscriptions import get_site_by_name
-from gso.utils.shared_choices import PortNumber, Vendor
+from gso.utils.shared_enums import PortNumber, Vendor
@step("Create subscription")
diff --git a/gso/workflows/tasks/import_router.py b/gso/workflows/tasks/import_router.py
index e7e332ff..8346b973 100644
--- a/gso/workflows/tasks/import_router.py
+++ b/gso/workflows/tasks/import_router.py
@@ -18,7 +18,7 @@ from gso.services import subscriptions
from gso.services.crm import get_customer_by_name
from gso.services.subscriptions import get_site_by_name
from gso.utils.helpers import generate_fqdn
-from gso.utils.shared_choices import PortNumber, Vendor
+from gso.utils.shared_enums import PortNumber, Vendor
@step("Create subscription")
diff --git a/gso/workflows/tasks/import_super_pop_switch.py b/gso/workflows/tasks/import_super_pop_switch.py
index e13896f2..5d7aa4ab 100644
--- a/gso/workflows/tasks/import_super_pop_switch.py
+++ b/gso/workflows/tasks/import_super_pop_switch.py
@@ -16,7 +16,7 @@ from gso.services import subscriptions
from gso.services.crm import get_customer_by_name
from gso.services.subscriptions import get_site_by_name
from gso.utils.helpers import generate_fqdn
-from gso.utils.shared_choices import PortNumber, Vendor
+from gso.utils.shared_enums import PortNumber, Vendor
@step("Create subscription")
diff --git a/test/api/test_imports.py b/test/api/test_imports.py
index 07378609..b4d58f86 100644
--- a/test/api/test_imports.py
+++ b/test/api/test_imports.py
@@ -9,7 +9,7 @@ from gso.products.product_blocks.iptrunk import IptrunkType, PhyPortCapacity
from gso.products.product_blocks.router import RouterRole
from gso.products.product_blocks.site import SiteTier
from gso.utils.helpers import iso_from_ipv4
-from gso.utils.shared_choices import Vendor
+from gso.utils.shared_enums import Vendor
SITE_IMPORT_ENDPOINT = "/api/v1/imports/sites"
ROUTER_IMPORT_ENDPOINT = "/api/v1/imports/routers"
diff --git a/test/fixtures.py b/test/fixtures.py
index 933fcfc1..73243952 100644
--- a/test/fixtures.py
+++ b/test/fixtures.py
@@ -18,7 +18,7 @@ from gso.products.product_types.iptrunk import IptrunkInactive
from gso.products.product_types.router import Router, RouterInactive
from gso.products.product_types.site import Site, SiteInactive
from gso.services import subscriptions
-from gso.utils.shared_choices import Vendor
+from gso.utils.shared_enums import Vendor
CUSTOMER_ID: UUIDstr = "2f47f65a-0911-e511-80d0-005056956c1a"
diff --git a/test/utils/test_helpers.py b/test/utils/test_helpers.py
index a7a09ade..5dee0aa8 100644
--- a/test/utils/test_helpers.py
+++ b/test/utils/test_helpers.py
@@ -4,7 +4,7 @@ import pytest
from gso.products.product_blocks.iptrunk import IptrunkInterfaceBlock
from gso.utils.helpers import available_interfaces_choices_including_current_members, validate_tt_number
-from gso.utils.shared_choices import Vendor
+from gso.utils.shared_enums import Vendor
@pytest.fixture()
diff --git a/test/workflows/iptrunk/test_create_iptrunk.py b/test/workflows/iptrunk/test_create_iptrunk.py
index d8ca8c09..b85f6d3f 100644
--- a/test/workflows/iptrunk/test_create_iptrunk.py
+++ b/test/workflows/iptrunk/test_create_iptrunk.py
@@ -7,7 +7,7 @@ from gso.products import Iptrunk, ProductType
from gso.products.product_blocks.iptrunk import IptrunkType, PhyPortCapacity
from gso.services.subscriptions import get_product_id_by_name
from gso.utils.helpers import LAGMember
-from gso.utils.shared_choices import Vendor
+from gso.utils.shared_enums import Vendor
from test.services.conftest import MockedNetboxClient
from test.workflows import (
assert_complete,
diff --git a/test/workflows/iptrunk/test_migrate_iptrunk.py b/test/workflows/iptrunk/test_migrate_iptrunk.py
index 634bd527..825b9e7c 100644
--- a/test/workflows/iptrunk/test_migrate_iptrunk.py
+++ b/test/workflows/iptrunk/test_migrate_iptrunk.py
@@ -5,7 +5,7 @@ import pytest
from gso.products import Iptrunk
from gso.products.product_types.router import Router
-from gso.utils.shared_choices import Vendor
+from gso.utils.shared_enums import Vendor
from test import USER_CONFIRM_EMPTY_FORM
from test.conftest import UseJuniperSide
from test.workflows import (
diff --git a/test/workflows/iptrunk/test_modify_trunk_interface.py b/test/workflows/iptrunk/test_modify_trunk_interface.py
index 5a7d1596..78bedca5 100644
--- a/test/workflows/iptrunk/test_modify_trunk_interface.py
+++ b/test/workflows/iptrunk/test_modify_trunk_interface.py
@@ -4,7 +4,7 @@ import pytest
from gso.products import Iptrunk
from gso.products.product_blocks.iptrunk import IptrunkType, PhyPortCapacity
-from gso.utils.shared_choices import Vendor
+from gso.utils.shared_enums import Vendor
from test.conftest import UseJuniperSide
from test.workflows import (
assert_complete,
diff --git a/test/workflows/router/test_create_router.py b/test/workflows/router/test_create_router.py
index 1f54bba2..efa7e673 100644
--- a/test/workflows/router/test_create_router.py
+++ b/test/workflows/router/test_create_router.py
@@ -7,7 +7,7 @@ from gso.products import ProductType, Site
from gso.products.product_blocks.router import RouterRole
from gso.products.product_types.router import Router
from gso.services.subscriptions import get_product_id_by_name
-from gso.utils.shared_choices import Vendor
+from gso.utils.shared_enums import Vendor
from test import USER_CONFIRM_EMPTY_FORM
from test.workflows import (
assert_complete,
--
GitLab