NetApp
diff --git a/‎cloud-cli/cloudapis/amazon.py‎
Lines changed: 0 additions & 63 deletions b/‎cloud-cli/cloudapis/amazon.py‎
Lines changed: 0 additions & 63 deletions
diff --git a/‎cloud-cli/cloudapis/cloud.py‎
Lines changed: 16 additions & 9 deletions b/‎cloud-cli/cloudapis/cloud.py‎
Lines changed: 16 additions & 9 deletions
diff --git a/‎cloud-cli/cloudtool/__init__.py‎
Lines changed: 10 additions & 8 deletions b/‎cloud-cli/cloudtool/__init__.py‎
Lines changed: 10 additions & 8 deletions
diff --git a/‎cloud-cli/cloudtool/utils.py‎
Lines changed: 5 additions & 38 deletions b/‎cloud-cli/cloudtool/utils.py‎
Lines changed: 5 additions & 38 deletions
@@ -58,26 +58,32 @@ def getText(nodelist):
 		name = getText(cmd.getElementsByTagName('name')[0].childNodes).strip()
 		assert name
 
-		description = cmd.getElementsByTagName('name')[0].getAttribute("description")
-		if description: description = '"""%s"""' % description
+		description = getText(cmd.getElementsByTagName('description')[0].childNodes).strip()
+		if description: 
+                    description = '"""%s"""' % description
 		else: description = ''
 		arguments = []
 		options = []
 		descriptions = []
 
-		for param in cmd.getElementsByTagName('arg'):
-			argname = getText(param.childNodes).strip()
+		for param in cmd.getElementsByTagName("request")[0].getElementsByTagName("arg"):
+			argname = getText(param.getElementsByTagName('name')[0].childNodes).strip()
 			assert argname
 
-			required = param.getAttribute("required").strip()
+			required = getText(param.getElementsByTagName('required')[0].childNodes).strip()
 			if required == 'true': required = True
 			elif required == 'false': required = False
 			else: raise AssertionError, "Not reached"
 			if required: arguments.append(argname)
 			options.append(argname)
 
-			description = param.getAttribute("description").strip()
-			if description: descriptions.append( (argname,description) )
+                        #import ipdb; ipdb.set_trace()
+			requestDescription = param.getElementsByTagName('description')
+			if requestDescription:			
+			    descriptionParam = getText(requestDescription[0].childNodes)
+                        else: 
+                            descriptionParam = ''
+			if descriptionParam: descriptions.append( (argname,descriptionParam) )
 
 		funcparams = ["self"] + [ "%s=None"%o for o in options ]
 		funcparams = ", ".join(funcparams)
@@ -95,7 +101,7 @@ def %s(%s):
 			output = self._make_request("%s",parms)
 			return output
 		"""%(name,funcparams,description,arguments,name)
-		
+
 		namespace = {}
 		exec code.strip() in namespace
 
@@ -106,7 +112,8 @@ def %s(%s):
 		yield (name,func)
 
 
-for name,meth in load_dynamic_methods(): setattr(CloudAPI,name,meth)
+for name,meth in load_dynamic_methods(): 
+    setattr(CloudAPI, name, meth)
 
 implementor = CloudAPI
 
 
@@ -11,25 +11,27 @@
 
 def main(argv=None):
 
+    #import ipdb; ipdb.set_trace()
     if argv == None:
        argv = sys.argv
 
-    prelim_args = [ x for x in argv[1:] if not x.startswith('-') ]
+    prelim_args = [ x for x in argv[0:] if not x.startswith('-') ]
     parser = utils.get_parser()
-    
+     
     api = __import__("cloudapis")
     apis = getattr(api, "implementor")
-    if len(prelim_args) == 0:
-        parser.error("you need to specify an API as the first argument\n\nSupported APIs:\n" + "\n".join(utils.get_api_list(apis)))
-    elif len(prelim_args) == 1:
+    if len(prelim_args) == 1:
         commandlist = utils.get_command_list(apis)
-        parser.error("you need to specify a command name as the second argument\n\nCommands supported by the %s API:\n"%prelim_args[0] + "\n".join(commandlist))
+        parser.error("you need to specify a command name as the first argument\n\nCommands supported by the %s API:\n"%prelim_args[0] + "\n".join(commandlist))
 
     command = utils.lookup_command_in_api(apis,prelim_args[1])
     if not command: parser.error("command %r not supported by the %s API"%(prelim_args[1],prelim_args[0]))
+   
+    argv = argv[1:] 
+    if len(argv) == 1:
+	argv.append("--help")
 
     parser = utils.get_parser(apis.__init__,command)
-    argv = argv[1:]
     opts,args,api_optionsdict,cmd_optionsdict = parser.parse_args(argv)
 
 
@@ -38,7 +40,7 @@ def main(argv=None):
     except utils.OptParseError,e:
         parser.error(str(e))
 
-    command = utils.lookup_command_in_api(api,args[1])
+    command = utils.lookup_command_in_api(api,args[0])
 
     # we now discard the first two arguments as those necessarily are the api and command names
     args = args[2:]
 
@@ -112,51 +112,18 @@ def get_arguments_and_options(callable):
     group = parser.add_option_group("General options")
     group.add_option('-v', '--verbose', dest="verbose", help="Print extra output")
 
-    # now we need to derive the short options.  we initialize the known fixed longopts and shortopts
-    longopts = [ '--verbose' ]
-
-    # we add the known long options, sorted and grouped to guarantee a stable short opt set regardless of order
-    if api_callable and api_options:
-        longopts += sorted([ x[0][0] for x in api_options ])
-    if cmd_callable and cmd_options:
-        longopts += sorted([ x[0][0] for x in cmd_options ])
-
-    # we use this function to derive a suitable short option and remember the already-used short options
-    def derive_shortopt(longopt,usedopts):
-        """longopt begins with a dash"""
-        shortopt = None
-        for x in xrange(2,10000):
-            try: shortopt = "-" + longopt[x]
-            except IndexError:
-                shortopt = None
-                break
-            if shortopt in usedopts: continue
-            usedopts.append(shortopt)
-            break
-        return shortopt
-
-    # now we loop through the long options and assign a suitable short option, saving the short option for later use
-    long_to_short = {}
-    alreadyusedshorts = []
-    for longopt in longopts:
-        long_to_short[longopt] = derive_shortopt(longopt,alreadyusedshorts)
-
     parser.api_dests = []
     if api_callable and api_options:
         group = parser.add_option_group("Options for the %s API"%api_name)
         for a in api_options:
-            shortopt = long_to_short[a[0][0]]
-            if shortopt: group.add_option(shortopt,a[0][0],**a[1])
-            else: group.add_option(a[0][0],**a[1])
+            group.add_option(a[0][0],**a[1])
             parser.api_dests.append(a[1]["dest"])
 
     parser.cmd_dests = []
     if cmd_callable and cmd_options:
         group = parser.add_option_group("Options for the %s command"%cmd_name)
         for a in cmd_options:
-            shortopt = long_to_short[a[0][0]]
-            if shortopt: group.add_option(shortopt,a[0][0],**a[1])
-            else: group.add_option(a[0][0],**a[1])
+            group.add_option(a[0][0],**a[1])
             parser.cmd_dests.append(a[1]["dest"])
 
     return parser
@@ -178,7 +145,7 @@ def get_command_list(api):
         for cmd_name in dir(api):
             cmd = getattr(api,cmd_name)
             if callable(cmd) and not cmd_name.startswith("_"):
-		if cmd.__doc__: docstring = cmd.__doc__
-		else: docstring = ''
-		cmds.append( "    %s	%s"%(cmd_name.replace('_','-'),docstring) )
+		if cmd.__doc__:docstring = cmd.__doc__
+		else:docstring = ''
+		cmds.append( "    %s" % (cmd_name.replace('_','-')) )
         return cmds