From cb58294ed1430760a3232c72a15ef27577deda27 Mon Sep 17 00:00:00 2001
From: Karel van Klink <karel.vanklink@geant.org>
Date: Wed, 11 Sep 2024 14:11:03 +0200
Subject: [PATCH] Apply two suggestions
---
gso/services/subscriptions.py | 4 +++-
gso/workflows/iptrunk/create_iptrunk.py | 9 ++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/gso/services/subscriptions.py b/gso/services/subscriptions.py
index eed969a7..8a8bcf98 100644
--- a/gso/services/subscriptions.py
+++ b/gso/services/subscriptions.py
@@ -242,7 +242,9 @@ def get_active_site_subscriptions(includes: list[str] | None = None) -> list[Sub
:return: A list of Subscription objects for sites.
:rtype: list[Subscription]
"""
- return get_subscriptions(product_types=["Site"], lifecycles=[SubscriptionLifecycle.ACTIVE], includes=includes) # type: ignore[list-item]
+ return get_subscriptions(
+ product_types=[ProductType.SITE], lifecycles=[SubscriptionLifecycle.ACTIVE], includes=includes
+ )
def get_site_by_name(site_name: str) -> Site:
diff --git a/gso/workflows/iptrunk/create_iptrunk.py b/gso/workflows/iptrunk/create_iptrunk.py
index 9cab8df3..56907a6c 100644
--- a/gso/workflows/iptrunk/create_iptrunk.py
+++ b/gso/workflows/iptrunk/create_iptrunk.py
@@ -50,11 +50,10 @@ from gso.utils.workflow_steps import prompt_sharepoint_checklist_url
def initial_input_form_generator(product_name: str) -> FormGenerator:
"""Gather input from the user in three steps. General information, and information on both sides of the trunk."""
# Add both provisioning and active routers, since trunks are required for promoting a router to active.
- routers = {
- str(router["subscription_id"]): router["description"]
- for router in subscriptions.get_active_router_subscriptions(includes=["subscription_id", "description"])
- + subscriptions.get_provisioning_router_subscriptions(includes=["subscription_id", "description"])
- }
+ active_and_provisioning_routers = subscriptions.get_active_router_subscriptions(
+ includes=["subscription_id", "description"]
+ ) + subscriptions.get_provisioning_router_subscriptions(includes=["subscription_id", "description"])
+ routers = {str(router["subscription_id"]): router["description"] for router in active_and_provisioning_routers}
class CreateIptrunkForm(FormPage):
model_config = ConfigDict(title=product_name)
--
GitLab