From 446de166deb100191bb3005c061106ac1cc2bf69 Mon Sep 17 00:00:00 2001 From: Sapan Bhatia Date: Tue, 14 Jul 2009 15:00:40 +0000 Subject: [PATCH] fix --- sfa/client/sfi.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index 7b063633..f9aad359 100755 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -312,20 +312,21 @@ def create_cmd_parser(command, additional_cmdargs = None): if command in ("resources"): parser.add_option("-f", "--format", dest="format",type="choice", - help="display format (dns|ip|rspec)",default="rspec", + help="display format (dns|ip|xml)",default="xml", choices=("dns","ip","xml")) + parser.add_option("-o", "--output", dest="file", + help="output XML to file", metavar="FILE", default=None) + if command in ("list", "show", "remove"): parser.add_option("-t", "--type", dest="type",type="choice", help="type filter (user|slice|sa|ma|node|aggregate)", choices=("user","slice","sa","ma","node","aggregate", "all"), default="all") - if command in ("show", "list", "resources"): - # This option is for all commands + if command in ("show", "list"): parser.add_option("-f", "--format", dest="format", type="choice", help="display format (text|xml)",default="text", choices=("text","xml")) - parser.add_option("-o", "--output", dest="file", - help="output XML to file", metavar="FILE", default=None) + if command in ("delegate"): parser.add_option("-u", "--user", action="store_true", dest="delegate_user", default=False, -- 2.47.0