From d4a2edc2c468a122fd8aba176e22e9d25874a714 Mon Sep 17 00:00:00 2001
From: Neda Moeini <neda.moeini@geant.org>
Date: Fri, 22 Mar 2024 11:35:07 +0100
Subject: [PATCH] Made tox happy.
---
.../router/modify_connection_strategy.py | 24 ++++++++-----------
.../router/test_modify_connection_stratey.py | 5 +---
2 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/gso/workflows/router/modify_connection_strategy.py b/gso/workflows/router/modify_connection_strategy.py
index b5a204a5..a3f5b5ae 100644
--- a/gso/workflows/router/modify_connection_strategy.py
+++ b/gso/workflows/router/modify_connection_strategy.py
@@ -1,4 +1,5 @@
"""Modify connection strategy workflow. Flipping the connection between in-band to out-of-band."""
+
from orchestrator.forms import FormPage
from orchestrator.targets import Target
from orchestrator.types import FormGenerator, State, UUIDstr
@@ -11,13 +12,11 @@ from gso.utils.shared_enums import ConnectionStrategy
def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
- """Initial form with a choice field to modify the connection strategy."""
+ """Modify the connection strategy initial formruff format."""
subscription = Router.from_subscription(subscription_id)
current_connection_strategy = (
- ConnectionStrategy.OUT_OF_BAND
- if subscription.router.router_access_via_ts
- else ConnectionStrategy.IN_BAND
+ ConnectionStrategy.OUT_OF_BAND if subscription.router.router_access_via_ts else ConnectionStrategy.IN_BAND
)
class ModifyConnectionStrategyForm(FormPage):
@@ -33,8 +32,12 @@ def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
@step("Update subscription model")
def update_subscription_model(subscription: Router, connection_strategy: str) -> State:
- """Update the database model to update connection strategy."""
- subscription.router.router_access_via_ts = False if connection_strategy == ConnectionStrategy.IN_BAND else True
+ """Update the database model to reflect the new connection strategy.
+
+ If the connection strategy is set to IN-BAND, then access_via_ts should be set to False.
+ Conversely, if the connection strategy is set to OUT-OF-BAND, access_via_ts should be set to True.
+ """
+ subscription.router.router_access_via_ts = connection_strategy == ConnectionStrategy.OUT_OF_BAND
return {"subscription": subscription}
@@ -46,11 +49,4 @@ def update_subscription_model(subscription: Router, connection_strategy: str) ->
)
def modify_connection_strategy() -> StepList:
"""Modify the connection strategy."""
- return (
- init
- >> store_process_subscription(Target.MODIFY)
- >> unsync
- >> update_subscription_model
- >> resync
- >> done
- )
+ return init >> store_process_subscription(Target.MODIFY) >> unsync >> update_subscription_model >> resync >> done
diff --git a/test/workflows/router/test_modify_connection_stratey.py b/test/workflows/router/test_modify_connection_stratey.py
index 831fb048..669ad10f 100644
--- a/test/workflows/router/test_modify_connection_stratey.py
+++ b/test/workflows/router/test_modify_connection_stratey.py
@@ -12,9 +12,7 @@ def test_modify_connection_strategy(responses, nokia_router_subscription_factory
assert subscription.router.router_access_via_ts is True
form_data = [
{"subscription_id": subscription_id},
- {
- "connection_strategy": ConnectionStrategy.IN_BAND
- },
+ {"connection_strategy": ConnectionStrategy.IN_BAND},
]
result, _, _ = run_workflow("modify_connection_strategy", form_data)
assert_complete(result)
@@ -23,4 +21,3 @@ def test_modify_connection_strategy(responses, nokia_router_subscription_factory
updated_subscription = Router.from_subscription(subscription_id)
assert updated_subscription.status == "active"
assert updated_subscription.router.router_access_via_ts is False
-
--
GitLab