diff --git a/gso/oss-params-example.json b/gso/oss-params-example.json index 2b60d84c809b1911bd081782821f83f0670d2d73..a929c672798208c86f33186762b9a11a86b3173e 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 9a73d9c78581666645961ff08b70944446c6b8b7..d7bcae66161ab765a159775dec92de2885515909 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: