diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-08-01 14:30:27 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-08-01 14:30:27 +0200 |
| commit | f69fccfead3f2b0608d14d099f5583bb397d6131 (patch) | |
| tree | 7e3d67cbd33be2fac56bbd6a9278ad1053ad2800 | |
| parent | 50a0781b3f3e0c86d6418acb72b0036729a72283 (diff) | |
| download | vyos-1x-f69fccfead3f2b0608d14d099f5583bb397d6131.tar.gz vyos-1x-f69fccfead3f2b0608d14d099f5583bb397d6131.zip | |
T2690: add VRF support to "add system image"
| -rw-r--r-- | op-mode-definitions/add-system-image.xml | 28 | ||||
| -rw-r--r-- | op-mode-definitions/show-vrf.xml | 6 |
2 files changed, 29 insertions, 5 deletions
diff --git a/op-mode-definitions/add-system-image.xml b/op-mode-definitions/add-system-image.xml index a39f4cc22..3dc1c67ab 100644 --- a/op-mode-definitions/add-system-image.xml +++ b/op-mode-definitions/add-system-image.xml @@ -14,8 +14,32 @@ <list>/path/to/vyos-image.iso http://example.com/vyos-image.iso</list> </completionHelp> </properties> - <command>sudo ${vyatta_sbindir}/install-image --url "$4"</command> + <command>sudo ${vyatta_sbindir}/install-image --url "${4}"</command> <children> + <tagNode name="vrf"> + <properties> + <help>Download image via specified VRF</help> + <completionHelp> + <path>vrf name</path> + </completionHelp> + </properties> + <command>sudo ${vyatta_sbindir}/install-image --url "${4}" --vrf "${6}"</command> + <children> + <tagNode name="username"> + <properties> + <help>Username for authentication</help> + </properties> + <children> + <tagNode name="password"> + <properties> + <help>Password to use with authentication</help> + </properties> + <command>sudo ${vyatta_sbindir}/install-image --url "${4}" --vrf "${6}" --username "${8}" --password "${10}"</command> + </tagNode> + </children> + </tagNode> + </children> + </tagNode> <tagNode name="username"> <properties> <help>Username for authentication</help> @@ -25,7 +49,7 @@ <properties> <help>Password to use with authentication</help> </properties> - <command>sudo ${vyatta_sbindir}/install-image --url "$4" --username "$6" --password "$8"</command> + <command>sudo ${vyatta_sbindir}/install-image --url "${4}" --username "${6}" --password "${8}"</command> </tagNode> </children> </tagNode> diff --git a/op-mode-definitions/show-vrf.xml b/op-mode-definitions/show-vrf.xml index 1c806908b..438e7c334 100644 --- a/op-mode-definitions/show-vrf.xml +++ b/op-mode-definitions/show-vrf.xml @@ -11,9 +11,9 @@ <tagNode name="vrf"> <properties> <help>Show information on specific VRF instance</help> - <completionHelp> - <path>vrf name</path> - </completionHelp> + <completionHelp> + <path>vrf name</path> + </completionHelp> </properties> <command>${vyos_op_scripts_dir}/show_vrf.py -e "$3"</command> <children> |