From 9d809dbd2e04983fc728293bf889f8fc0b900177 Mon Sep 17 00:00:00 2001
From: Saket Agrahari <saket.agrahari@geant.org>
Date: Wed, 28 May 2025 13:22:21 +0100
Subject: [PATCH] fix value set in iptrunk_config_version
---
gso/oss-params-example.json | 8 ++++----
gso/utils/helpers.py | 13 +++++--------
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/gso/oss-params-example.json b/gso/oss-params-example.json
index 2b60d84c8..a929c6727 100644
--- a/gso/oss-params-example.json
+++ b/gso/oss-params-example.json
@@ -134,15 +134,15 @@
"SERVICE_VERSIONS": {
"IP_TRUNK": {
"version": {
- "1.0": "Base Version",
- "1.1": "Minor Upgrade"
+ "1.0": " 1.0 - Base Version",
+ "2.0": " 2.0 - Minor Upgrade"
},
"default_version": "1.0"
},
"GEANT_IP": {
"version": {
- "1.0": "Base Version",
- "2.0": "Major Upgrade"
+ "1.0": " 1.0 - Base Version",
+ "2.0": " 2.0 - Minor Upgrade"
},
"default_version": "1.0"
}
diff --git a/gso/utils/helpers.py b/gso/utils/helpers.py
index 9a73d9c78..d7bcae661 100644
--- a/gso/utils/helpers.py
+++ b/gso/utils/helpers.py
@@ -283,17 +283,14 @@ def active_edge_port_selector(*, partner_id: UUIDstr | None = None) -> TypeAlias
)
-def ip_trunk_service_version_selector() -> TypeAlias:
+def ip_trunk_service_version_selector() -> Choice:
"""Generate a dropdown selector for choosing a service version."""
iptrunk_versions = load_oss_params().SERVICE_VERSIONS.IP_TRUNK.version
- return cast(
- type[Choice],
- Choice.__call__(
- "Select an IP trunk service version.",
- [(k, f"Version {k} - {iptrunk_versions[k]}") for k in iptrunk_versions],
- ),
- )
+ return Choice("Select an IP trunk service version.",
+ zip(iptrunk_versions.keys(),
+ iptrunk_versions.items(),
+ strict=True)) # type: ignore[arg-type]
def partner_choice() -> Choice:
--
GitLab