diff options
| author | George Kraft <george.kraft@calxeda.com> | 2012-08-15 12:52:06 -0500 |
|---|---|---|
| committer | George Kraft <george.kraft@calxeda.com> | 2012-08-15 12:52:06 -0500 |
| commit | 459b4709a127b8a938de1662ac1039cfc7108b80 (patch) | |
| tree | 2e60309568398438e5d34ccc3b14458e2308c384 | |
| parent | 827cdc25b46b8a3b28c47837bb626cb2b0100845 (diff) | |
| download | cxmanage-459b4709a127b8a938de1662ac1039cfc7108b80.tar.gz | |
cxmanage: Rename --tftp argument to --external-tftp
| -rwxr-xr-x | scripts/cxmanage | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/scripts/cxmanage b/scripts/cxmanage index 7fd60ee..b8f3ba9 100755 --- a/scripts/cxmanage +++ b/scripts/cxmanage @@ -68,10 +68,10 @@ def build_parser(): p['verbosity'].add_argument('-q', '--quiet', action='store_true', help='Quiet output') p['tftp_type'] = p['parser'].add_mutually_exclusive_group() - p['tftp_type'].add_argument('-t', '--tftp', metavar='IP:PORT', - help='Connect to remote TFTP server at ip:port') p['tftp_type'].add_argument('--internal-tftp', metavar='IP:PORT', help='Host an internal TFTP server listening on ip:port') + p['tftp_type'].add_argument('--external-tftp', metavar='IP:PORT', + help='Connect to remote TFTP server at ip:port') p['subparsers'] = p['parser'].add_subparsers() @@ -250,31 +250,32 @@ def main(): def set_tftp(controller, args): """Set up tftp server on controller""" - if args.tftp: - tftp_args = args.tftp.split(':') + if args.internal_tftp: + tftp_args = args.internal_tftp.split(':') if len(tftp_args) == 1: tftp_address = tftp_args[0] - tftp_port = 69 + tftp_port = 0 elif len(tftp_args) == 2: tftp_address = tftp_args[0] tftp_port = int(tftp_args[1]) else: - print 'ERROR: %s is not a valid argument for --tftp' % args.tftp + print ('ERROR: %s is not a valid argument for --internal-tftp' + % args.internal_tftp) sys.exit(1) - controller.set_external_tftp_server(tftp_address, tftp_port) - elif args.internal_tftp: - tftp_args = args.internal_tftp.split(':') + controller.set_internal_tftp_server(tftp_address, tftp_port) + elif args.external_tftp: + tftp_args = args.external_tftp.split(':') if len(tftp_args) == 1: tftp_address = tftp_args[0] - tftp_port = 0 + tftp_port = 69 elif len(tftp_args) == 2: tftp_address = tftp_args[0] tftp_port = int(tftp_args[1]) else: - print ('ERROR: %s is not a valid argument for --internal-tftp' - % args.internal_tftp) + print ('ERROR: %s is not a valid argument for --external-tftp' + % args.external_tftp) sys.exit(1) - controller.set_internal_tftp_server(tftp_address, tftp_port) + controller.set_external_tftp_server(tftp_address, tftp_port) else: controller.set_internal_tftp_server() |