diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-11-18 21:53:35 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2023-11-19 09:17:59 +0100 |
| commit | e6c1f1ed512e969ff3d4b11692e35b4d0293c3eb (patch) | |
| tree | dbe5d12b7e77fe210fc725ca593e5e0ad55c614f | |
| parent | 949a4babb3daf1c585125fa71942fc7fa7832cdf (diff) | |
| download | vyos-1x-e6c1f1ed512e969ff3d4b11692e35b4d0293c3eb.tar.gz vyos-1x-e6c1f1ed512e969ff3d4b11692e35b4d0293c3eb.zip | |
config-mgmt: T4957: T2405: add proper valueHelp strings for remote URL
vyos@vyos# set system config-management commit-archive location
Possible completions:
uri Uniform Resource Identifier
Unfortunately URI is a bit "less" specific - add proper help strings:
vyos@vyos# set system config-management commit-archive location
Possible completions:
http://<user>:<passwd>@<host>/<path>
https://<user>:<passwd>@<host>/<path>
ftp://<user>:<passwd>@<host>/<path>
sftp://<user>:<passwd>@<host>/<path>
scp://<user>:<passwd>@<host>/<path>
tftp://<user>:<passwd>@<host>/<path>
git+https://<user>:<passwd>@<host>/<path>
(cherry picked from commit dcb277ba0aed4a02f48572d10d3ba242942b8639)
| -rw-r--r-- | interface-definitions/system-config-mgmt.xml.in | 28 | ||||
| -rwxr-xr-x | scripts/build-command-templates | 2 |
2 files changed, 28 insertions, 2 deletions
diff --git a/interface-definitions/system-config-mgmt.xml.in b/interface-definitions/system-config-mgmt.xml.in index 794f9f1a0..b01b44bf9 100644 --- a/interface-definitions/system-config-mgmt.xml.in +++ b/interface-definitions/system-config-mgmt.xml.in @@ -17,8 +17,32 @@ <properties> <help>Commit archive location</help> <valueHelp> - <format>uri</format> - <description>Uniform Resource Identifier</description> + <format>http://<user>:<passwd>@<host>/<path></format> + <description/> + </valueHelp> + <valueHelp> + <format>https://<user>:<passwd>@<host>/<path></format> + <description/> + </valueHelp> + <valueHelp> + <format>ftp://<user>:<passwd>@<host>/<path></format> + <description/> + </valueHelp> + <valueHelp> + <format>sftp://<user>:<passwd>@<host>/<path></format> + <description/> + </valueHelp> + <valueHelp> + <format>scp://<user>:<passwd>@<host>/<path></format> + <description/> + </valueHelp> + <valueHelp> + <format>tftp://<user>:<passwd>@<host>/<path></format> + <description/> + </valueHelp> + <valueHelp> + <format>git+https://<user>:<passwd>@<host>/<path></format> + <description/> </valueHelp> <constraint> <validator name="url --file-transport"/> diff --git a/scripts/build-command-templates b/scripts/build-command-templates index c8ae83d9d..2e7f8b994 100755 --- a/scripts/build-command-templates +++ b/scripts/build-command-templates @@ -145,6 +145,8 @@ def get_properties(p, default=None): description = v.find("description").text if default != None and default.text == format: description += f' (default)' + # Is no description was specified, keep it empty + if not description: description = '' vh.append( (format, description) ) props["val_help"] = vh except: |