diff options
| author | John Estabrook <jestabro@vyos.io> | 2023-11-27 21:13:22 -0600 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2023-11-27 21:13:22 -0600 |
| commit | bb578a1cab177e8cee6e4d02144d21387ba13a93 (patch) | |
| tree | f399b38bb7fa987b541ca8c947697c429478af16 | |
| parent | 5f575360b0c996187e7f05cccc5caff6a658544d (diff) | |
| download | vyos-1x-bb578a1cab177e8cee6e4d02144d21387ba13a93.tar.gz vyos-1x-bb578a1cab177e8cee6e4d02144d21387ba13a93.zip | |
image-tools: T5751: normalize args using hyphen instead of underscore
| -rw-r--r-- | op-mode-definitions/system-image.xml.in | 14 | ||||
| -rwxr-xr-x | src/op_mode/image_installer.py | 2 | ||||
| -rwxr-xr-x | src/op_mode/image_manager.py | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/op-mode-definitions/system-image.xml.in b/op-mode-definitions/system-image.xml.in index 463b985d6..c131087be 100644 --- a/op-mode-definitions/system-image.xml.in +++ b/op-mode-definitions/system-image.xml.in @@ -17,7 +17,7 @@ <list>/path/to/vyos-image.iso "http://example.com/vyos-image.iso"</list> </completionHelp> </properties> - <command>sudo ${vyos_op_scripts_dir}/image_installer.py --action add --image_path "${4}"</command> + <command>sudo ${vyos_op_scripts_dir}/image_installer.py --action add --image-path "${4}"</command> <children> <tagNode name="vrf"> <properties> @@ -26,7 +26,7 @@ <path>vrf name</path> </completionHelp> </properties> - <command>sudo ${vyos_op_scripts_dir}/image_installer.py --action add --image_path "${4}" --vrf "${6}"</command> + <command>sudo ${vyos_op_scripts_dir}/image_installer.py --action add --image-path "${4}" --vrf "${6}"</command> <children> <tagNode name="username"> <properties> @@ -37,7 +37,7 @@ <properties> <help>Password to use with authentication</help> </properties> - <command>sudo ${vyos_op_scripts_dir}/image_installer.py --action add --image_path "${4}" --vrf "${6}" --username "${8}" --password "${10}"</command> + <command>sudo ${vyos_op_scripts_dir}/image_installer.py --action add --image-path "${4}" --vrf "${6}" --username "${8}" --password "${10}"</command> </tagNode> </children> </tagNode> @@ -52,7 +52,7 @@ <properties> <help>Password to use with authentication</help> </properties> - <command>sudo ${vyos_op_scripts_dir}/image_installer.py --action add --image_path "${4}" --username "${6}" --password "${8}"</command> + <command>sudo ${vyos_op_scripts_dir}/image_installer.py --action add --image-path "${4}" --username "${6}" --password "${8}"</command> </tagNode> </children> </tagNode> @@ -90,7 +90,7 @@ <script>sudo ${vyos_op_scripts_dir}/image_manager.py --action list</script> </completionHelp> </properties> - <command>sudo ${vyos_op_scripts_dir}/image_manager.py --action set --image_name "${5}"</command> + <command>sudo ${vyos_op_scripts_dir}/image_manager.py --action set --image-name "${5}"</command> </tagNode> </children> </node> @@ -134,7 +134,7 @@ <script>sudo ${vyos_op_scripts_dir}/image_manager.py --action list</script> </completionHelp> </properties> - <command>sudo ${vyos_op_scripts_dir}/image_manager.py --action delete --image_name "${4}"</command> + <command>sudo ${vyos_op_scripts_dir}/image_manager.py --action delete --image-name "${4}"</command> </tagNode> </children> </node> @@ -162,7 +162,7 @@ <properties> <help>A new name for an image</help> </properties> - <command>sudo ${vyos_op_scripts_dir}/image_manager.py --action rename --image_name "${4}" --image_new_name "${6}"</command> + <command>sudo ${vyos_op_scripts_dir}/image_manager.py --action rename --image-name "${4}" --image-new-name "${6}"</command> </tagNode> </children> </tagNode> diff --git a/src/op_mode/image_installer.py b/src/op_mode/image_installer.py index aa4cf301b..380393a34 100755 --- a/src/op_mode/image_installer.py +++ b/src/op_mode/image_installer.py @@ -728,7 +728,7 @@ def parse_arguments() -> Namespace: required=True, help='action to perform with an image') parser.add_argument( - '--image_path', + '--image-path', help='a path (HTTP or local file) to an image that needs to be installed' ) # parser.add_argument('--image_new_name', help='a new name for image') diff --git a/src/op_mode/image_manager.py b/src/op_mode/image_manager.py index e4b2f4833..dcbd290c9 100755 --- a/src/op_mode/image_manager.py +++ b/src/op_mode/image_manager.py @@ -172,10 +172,10 @@ def parse_arguments() -> Namespace: required=True, help='action to perform with an image') parser.add_argument( - '--image_name', + '--image-name', help= 'a name of an image to add, delete, install, rename, or set as default') - parser.add_argument('--image_new_name', help='a new name for image') + parser.add_argument('--image-new-name', help='a new name for image') args: Namespace = parser.parse_args() # Validate arguments if args.action == 'rename' and (not args.image_name or |