small updates to generated login base and site name for geni users

[sfa.git] / wsdl / sfa2wsdl.py

diff --git a/wsdl/sfa2wsdl.py b/wsdl/sfa2wsdl.py
index 0075cc4..f3a6b93 100755 (executable)
--- a/wsdl/sfa2wsdl.py
+++ b/wsdl/sfa2wsdl.py
@@ -16,7 +16,6 @@ import inspect
 from types import *
 from optparse import OptionParser
 
-from sfa.trust.auth import Auth
 from sfa.util.parameter import Parameter,Mixed
 
 import globals
@@ -143,6 +142,8 @@ class WSDLGen:
             return "none"
         if arg_type == DictType:
             return "xsd:anyType"
+        if arg_type in (ListType, TupleType):
+            return "xsd:arrayType"
         elif arg_type == IntType or arg_type == LongType:
             return "xsd:int"
         elif arg_type == bool:
@@ -324,6 +325,10 @@ def main():
                               help="Generate sm.wsdl")
     parser.add_option("-a", "--aggregate", action="store_true", dest="aggregate",
                               help="Generate am.wsdl")
+    parser.add_option("-c", "--component", action="store_true", dest="component",
+                              help="Generate cm.wsdl")
+    parser.add_option("-g", "--geni-aggregate", action="store_true", dest="geni_am",
+                      help="Generate gm.wsdl")
     parser.add_option("-l", "--lite", action="store_true", dest="lite",
                               help="Generate LITE version of the interface, in which calls exclude credentials")
     (interface_options, args) = parser.parse_args()