From 8cd15903da64eb8eeaf2679ef61c4d6c46d62705 Mon Sep 17 00:00:00 2001 From: Karel van Klink <karel.vanklink@geant.org> Date: Wed, 16 Apr 2025 14:36:45 +0200 Subject: [PATCH] Move IAS logic into existing function --- gso/workflows/l3_core_service/ias/create_imported_ias.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gso/workflows/l3_core_service/ias/create_imported_ias.py b/gso/workflows/l3_core_service/ias/create_imported_ias.py index 485c96c3..fb64b607 100644 --- a/gso/workflows/l3_core_service/ias/create_imported_ias.py +++ b/gso/workflows/l3_core_service/ias/create_imported_ias.py @@ -19,7 +19,6 @@ from gso.workflows.l3_core_service.base_create_imported_l3_core_service import ( from gso.workflows.l3_core_service.base_create_imported_l3_core_service import ( initialize_subscription, ) -from gso.workflows.l3_core_service.ias.shared import update_ias_subscription_model def initial_input_form_generator() -> FormGenerator: @@ -36,11 +35,14 @@ def initial_input_form_generator() -> FormGenerator: @step("Create subscription") -def create_subscription(partner: str) -> dict: +def create_subscription(partner: str, ias_flavor: IASFlavor) -> dict: """Create a new subscription object in the database.""" partner_id = get_partner_by_name(partner).partner_id product_id = get_product_id_by_name(ProductName.IMPORTED_IAS) subscription = ImportedIASInactive.from_product_id(product_id, partner_id) + + subscription.ias.ias_flavor = ias_flavor + return {"subscription": subscription, "subscription_id": subscription.subscription_id} @@ -54,7 +56,6 @@ def create_imported_ias() -> StepList: return ( begin >> create_subscription - >> update_ias_subscription_model >> store_process_subscription(Target.CREATE) >> initialize_subscription >> set_status(SubscriptionLifecycle.ACTIVE) -- GitLab