Commit 0fd85b58 authored by Boris Glimcher's avatar Boris Glimcher Committed by Jim Harris
Browse files

python/cli: use add_mutually_exclusive_group consistently 



Change-Id: If0c49b46387fcf9c5a05d689e73f45275cc93b60
Signed-off-by: default avatarBoris Glimcher <Boris.Glimcher@emc.com>
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/26775


Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz@tzawadzki.com>
Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
parent c4d5156e

python/spdk/cli/bdev.py

+6 −4
Original line number Diff line number Diff line
@@ -477,8 +477,9 @@ def add_parser(subparsers): 
        args.client.bdev_nvme_set_hotplug(enable=args.enable, period_us=args.period_us)



    p = subparsers.add_parser('bdev_nvme_set_hotplug', help='Set hotplug options for bdev nvme type.')

    p.add_argument('-d', '--disable', dest='enable', default=False, action='store_false', help="Disable hotplug (default)")

    p.add_argument('-e', '--enable', dest='enable', action='store_true', help="Enable hotplug")

    group = p.add_mutually_exclusive_group()

    group.add_argument('-d', '--disable', dest='enable', action='store_false', help="Disable hotplug (default)", default=False)

    group.add_argument('-e', '--enable',  dest='enable', action='store_true', help="Enable hotplug")

    p.add_argument('-r', '--period-us',

                   help='How often the hotplug is processed for insert and remove events', type=int)

    p.set_defaults(func=bdev_nvme_set_hotplug)
@@ -1050,8 +1051,9 @@ def add_parser(subparsers): 


    p = subparsers.add_parser('bdev_enable_histogram',

                              help='Enable or disable histogram for specified bdev')

    p.add_argument('-e', '--enable', default=True, dest='enable', action='store_true', help='Enable histograms on specified device')

    p.add_argument('-d', '--disable', dest='enable', action='store_false', help='Disable histograms on specified device')

    group = p.add_mutually_exclusive_group()

    group.add_argument('-e', '--enable',  dest='enable', action='store_true', help='Enable histograms on specified device', default=True)

    group.add_argument('-d', '--disable', dest='enable', action='store_false', help='Disable histograms on specified device')

    p.add_argument('-o', '--opc', help='Enable histogram for specified io type. Defaults to all io types if not specified.'

                   ' Refer to bdev_get_bdevs RPC for the list of io types.')

    p.add_argument('--granularity', help='Histogram bucket granularity.', type=int)

python/spdk/cli/fsdev.py

+8 −5
Original line number Diff line number Diff line
@@ -36,13 +36,16 @@ def add_parser(subparsers): 
    p.add_argument('root_path', help='Path on the system fs to expose as SPDK filesystem')



    group = p.add_mutually_exclusive_group()

    group.add_argument('--enable-xattr', help='Enable extended attributes', action='store_true', default=None)

    group.add_argument('--disable-xattr', help='Disable extended attributes', dest='enable_xattr', action='store_false', default=None)

    group.add_argument('--enable-xattr',  help='Enable extended attributes', dest='enable_xattr',

                       action='store_true', default=None)

    group.add_argument('--disable-xattr', help='Disable extended attributes', dest='enable_xattr',

                       action='store_false', default=None)



    group = p.add_mutually_exclusive_group()

    group.add_argument('--enable-writeback-cache', help='Enable writeback cache', action='store_true', default=None)

    group.add_argument('--disable-writeback-cache', help='Disable writeback cache', dest='enable_writeback_cache', action='store_false',

                       default=None)

    group.add_argument('--enable-writeback-cache',  help='Enable writeback cache', dest='enable_writeback_cache',

                       action='store_true', default=None)

    group.add_argument('--disable-writeback-cache', help='Disable writeback cache', dest='enable_writeback_cache',

                       action='store_false', default=None)



    p.add_argument('-w', '--max-write', help='Max write size in bytes', type=int)

python/spdk/cli/iscsi.py

+5 −2
Original line number Diff line number Diff line
@@ -163,8 +163,11 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 


    p = subparsers.add_parser('iscsi_enable_histogram',

                              help='Enable or disable histogram for specified iscsi target')

    p.add_argument('-e', '--enable', default=True, dest='enable', action='store_true', help='Enable histograms on specified iscsi target')

    p.add_argument('-d', '--disable', dest='enable', action='store_false', help='Disable histograms on specified iscsi target')

    group = p.add_mutually_exclusive_group()

    group.add_argument('-e', '--enable', dest='enable', action='store_true',

                       help='Enable histograms on specified iscsi target', default=True)

    group.add_argument('-d', '--disable', dest='enable', action='store_false',

                       help='Disable histograms on specified iscsi target')

    p.add_argument('name', help='iscsi target name')

    p.set_defaults(func=iscsi_enable_histogram)

python/spdk/cli/log.py

+3 −2
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ def add_parser(subparsers): 
        ret = args.client.log_enable_timestamps(enabled=args.enabled)

    p = subparsers.add_parser('log_enable_timestamps',

                              help='Enable or disable timestamps.')

    p.add_argument('-d', '--disable', dest='enabled', default=False, action='store_false', help="Disable timestamps")

    p.add_argument('-e', '--enable', dest='enabled', action='store_true', help="Enable timestamps")

    group = p.add_mutually_exclusive_group()

    group.add_argument('-d', '--disable', dest='enabled', action='store_false', help="Disable timestamps", default=False)

    group.add_argument('-e', '--enable',  dest='enabled', action='store_true', help="Enable timestamps")

    p.set_defaults(func=log_enable_timestamps)

python/spdk/cli/sock.py

+20 −16
Original line number Diff line number Diff line
@@ -41,23 +41,27 @@ def add_parser(subparsers): 
                   action='store_true', dest='enable_recv_pipe')

    p.add_argument('--disable-recv-pipe', help='Disable receive pipe',

                   action='store_false', dest='enable_recv_pipe')

    p.add_argument('--enable-quickack', help='Enable quick ACK',

    group = p.add_mutually_exclusive_group()

    group.add_argument('--enable-quickack', help='Enable quick ACK',

                       action='store_true', dest='enable_quickack')

    p.add_argument('--disable-quickack', help='Disable quick ACK',

    group.add_argument('--disable-quickack', help='Disable quick ACK',

                       action='store_false', dest='enable_quickack')

    p.add_argument('--enable-zerocopy-send-server', help='Enable zerocopy on send for server sockets',

    group = p.add_mutually_exclusive_group()

    group.add_argument('--enable-zerocopy-send-server', help='Enable zerocopy on send for server sockets',

                       action='store_true', dest='enable_zerocopy_send_server')

    p.add_argument('--disable-zerocopy-send-server', help='Disable zerocopy on send for server sockets',

    group.add_argument('--disable-zerocopy-send-server', help='Disable zerocopy on send for server sockets',

                       action='store_false', dest='enable_zerocopy_send_server')

    p.add_argument('--enable-zerocopy-send-client', help='Enable zerocopy on send for client sockets',

    group = p.add_mutually_exclusive_group()

    group.add_argument('--enable-zerocopy-send-client', help='Enable zerocopy on send for client sockets',

                       action='store_true', dest='enable_zerocopy_send_client')

    p.add_argument('--disable-zerocopy-send-client', help='Disable zerocopy on send for client sockets',

    group.add_argument('--disable-zerocopy-send-client', help='Disable zerocopy on send for client sockets',

                       action='store_false', dest='enable_zerocopy_send_client')

    p.add_argument('--zerocopy-threshold', help='Set zerocopy_threshold in bytes', type=int)

    p.add_argument('--tls-version', help='TLS protocol version', type=int)

    p.add_argument('--enable-ktls', help='Enable Kernel TLS',

    group = p.add_mutually_exclusive_group()

    group.add_argument('--enable-ktls', help='Enable Kernel TLS',

                       action='store_true', dest='enable_ktls')

    p.add_argument('--disable-ktls', help='Disable Kernel TLS',

    group.add_argument('--disable-ktls', help='Disable Kernel TLS',

                       action='store_false', dest='enable_ktls')

    p.set_defaults(func=sock_impl_set_options, enable_recv_pipe=None, enable_quickack=None,

                   enable_placement_id=None, enable_zerocopy_send_server=None, enable_zerocopy_send_client=None,