diff --git a/gso/translations/en-GB.json b/gso/translations/en-GB.json index 77d127c561b7aeb80b31fa0b8b31976a23183bcd..61ba44ca79f8b23d7e3034a3b603705336e50e86 100644 --- a/gso/translations/en-GB.json +++ b/gso/translations/en-GB.json @@ -2,8 +2,34 @@ "forms": { "fields": { "confirm": "Confirm", - "confirm_info": "Please verify this form looks correct." - } + "confirm_info": "Please verify this form looks correct.", + + "pp_run_results": "Provisioning proxy results are not ready yet.", + + "site_bgp_community_id": "Site BGP community ID", + "site_internal_id": "Site internal ID", + "site_tier": "Site tier", + + "hostname": "Hostname of the new device, only the part that comes before the first period", + "ts_address": "IP address of the terminal server", + "ts_port": "Port number of the terminal server", + "device_vendor": "Device vendor", + "device_role": "Device role", + + "geant_s_sid": "GÉANT S-SID", + "iptrunk_description": "IPtrunk description", + "iptrunk_type": "IPtrunk type", + "iptrunk_speed": "Capacity per port (in Gbits/s)", + "iptrunk_minimum_links": "Minimum amount of links", + "iptrunk_sideA_ae_iface": "Aggregated Ethernet interface name", + "iptrunk_sideA_ae_geant_a_sid": "GÉANT A-SID", + "iptrunk_sideA_ae_members": "Aggregated Ethernet member interface names", + "iptrunk_sideA_ae_members_descriptions": "Aggregated Ethernet member interface descriptions", + "iptrunk_sideB_ae_iface": "Aggregated Ethernet interface name", + "iptrunk_sideB_ae_geant_a_sid": "GÉANT A-SID", + "iptrunk_sideB_ae_members": "Aggregated Ethernet member interface names", + "iptrunk_sideB_ae_members_descriptions": "Aggregated Ethernet member interface descriptions" + } }, "workflow": { "modify_generic": "Modify Trunk interface", diff --git a/gso/workflows/device/create_device.py b/gso/workflows/device/create_device.py index 02f7eeba00e2c09003fcec8621b8f7f792f1a61a..6e85e1659ad2361155aed956ad8c004d6fe9035d 100644 --- a/gso/workflows/device/create_device.py +++ b/gso/workflows/device/create_device.py @@ -46,13 +46,9 @@ def site_selector() -> list: site_subscriptions[str(site_id)] = site_description # noinspection PyTypeChecker - return choice_list( - Choice( - "site_selection", - zip(site_subscriptions.keys(), site_subscriptions.items()), - ), # type:ignore - min_items=1, - max_items=1, + return Choice( + "Select a site", + zip(site_subscriptions.keys(), site_subscriptions.items()), ) @@ -181,7 +177,7 @@ def provision_device_real( return { "subscription": subscription, "label_text": ( - "Deployment of base config for a new " + "Deployment of base config for a new " f"{subscription.device_type}. Deployment is being " "taken care of by the provisioning proxy, please " "wait for the results to come back before " diff --git a/gso/workflows/iptrunk/create_iptrunk.py b/gso/workflows/iptrunk/create_iptrunk.py index 3fc8c32a3c6f66b0b5c3ea709c0f2aefe397ebdd..5c5f9febfa452731a80a8f7a7582856aca6a61dd 100644 --- a/gso/workflows/iptrunk/create_iptrunk.py +++ b/gso/workflows/iptrunk/create_iptrunk.py @@ -60,7 +60,8 @@ def initial_input_form_generator(product_name: str) -> FormGenerator: class AeMembersListA(UniqueConstrainedList[str]): min_items = initial_user_input.iptrunk_minimum_links - DeviceEnumA = Choice("Device A", zip(devices.keys(), devices.items())) + DeviceEnumA = Choice("Select a device", zip(devices.keys(), + devices.items())) class CreateIptrunkSideAForm(FormPage): class Config: @@ -76,7 +77,8 @@ def initial_input_form_generator(product_name: str) -> FormGenerator: # We remove the selected device for side A, to prevent any loops devices.pop(str(user_input_side_a.iptrunk_sideA_node_id.name)) - DeviceEnumB = Choice("Device B", zip(devices.keys(), devices.items())) + DeviceEnumB = Choice("Select a device", zip(devices.keys(), + devices.items())) class AeMembersListB(UniqueConstrainedList[str]): min_items = len(user_input_side_a.iptrunk_sideA_ae_members)