Added the possibility of genearting sm, am and registry separately

diff --git a/wsdl/gw2wsdl.py b/wsdl/gw2wsdl.py
index cf3fc68..558ad1f 100755 (executable)
--- a/wsdl/gw2wsdl.py
+++ b/wsdl/gw2wsdl.py
@@ -225,17 +225,19 @@ def add_wsdl_ports_and_bindings (wsdl):
 
 def add_wsdl_service(wsdl):
     for service in services.keys():
-        service_el = wsdl.firstChild.appendChild(wsdl.createElement("service"))
-        service_el.setAttribute("name", service)
+        global interface_options
+        if (getattr(interface_options,service)):
+            service_el = wsdl.firstChild.appendChild(wsdl.createElement("service"))
+            service_el.setAttribute("name", service)
 
-        for method in services[service]:
-            name=method
-            servport_el = service_el.appendChild(wsdl.createElement("port"))
-            servport_el.setAttribute("name", name + "_port")
-            servport_el.setAttribute("binding", "tns:" + name + "_binding")
+            for method in services[service]:
+                    name=method
+                    servport_el = service_el.appendChild(wsdl.createElement("port"))
+                    servport_el.setAttribute("name", name + "_port")
+                    servport_el.setAttribute("binding", "tns:" + name + "_binding")
 
-            soapaddress = servport_el.appendChild(wsdl.createElement("soap:address"))
-            soapaddress.setAttribute("location", "%s/%s" % (globals.plc_ns,service))
+                    soapaddress = servport_el.appendChild(wsdl.createElement("soap:address"))
+                    soapaddress.setAttribute("location", "%s/%s" % (globals.plc_ns,service))
 
 
 def get_wsdl_definitions():
@@ -275,13 +277,28 @@ def get_wsdl_definitions_and_types():
     wsdl = xml.dom.minidom.parseString(wsdl_text_header)
     return wsdl
 
-    
-types = get_wsdl_definitions_and_types()
-
-wsdl = get_wsdl_definitions()
-add_wsdl_ports_and_bindings(wsdl)
-wsdl_types = wsdl.importNode(types.getElementsByTagName("types")[0], True)
-wsdl.firstChild.appendChild(wsdl_types)
-add_wsdl_service(wsdl)
-
-xml.dom.ext.PrettyPrint(wsdl)
+def main():
+    global types
+    global interface_options
+
+    parser = OptionParser()
+    parser.add_option("-r", "--registry", dest="registry", action="store_true", 
+                              help="Generate registry.wsdl", metavar="FILE")
+    parser.add_option("-s", "--slice-manager",
+                              action="store_true", dest="slicemgr", 
+                              help="Generate sm.wsdl")
+    parser.add_option("-a", "--aggregate", action="store_true", dest="aggregate",
+                              help="Generate am.wsdl")
+
+    (interface_options, args) = parser.parse_args()
+    types = get_wsdl_definitions_and_types()
+    wsdl = get_wsdl_definitions()
+    add_wsdl_ports_and_bindings(wsdl)
+    wsdl_types = wsdl.importNode(types.getElementsByTagName("types")[0], True)
+    wsdl.firstChild.appendChild(wsdl_types)
+    add_wsdl_service(wsdl)
+
+    xml.dom.ext.PrettyPrint(wsdl)
+
+if __name__ == "__main__":
+        main()

diff --git a/wsdl/sfa.wsdl b/wsdl/sfa.wsdl
index 8a8fc9f..7564c16 100644 (file)
--- a/wsdl/sfa.wsdl
+++ b/wsdl/sfa.wsdl
@@ -383,7 +383,7 @@
     <xsd:schema xmlns='http://www.w3.org/2001/XMLSchema' targetNamespace='http://www.planet-lab.org/geniwrapper/2009/07/schema'>
       <xsd:complexType name='Type1'>
         <xsd:choice>
-          <element type='xsd:string' name='uuid' minOccurs='0'/>
+          <element type='xsd:string' name='Unique identifier for new GID (uuid)' minOccurs='0'/>
         </xsd:choice>
       </xsd:complexType>
       <xsd:complexType name='Type2'>
@@ -393,7 +393,7 @@
       </xsd:complexType>
       <xsd:complexType name='Type3'>
         <xsd:choice>
-          <element type='xsd:string' name='hrn' minOccurs='0'/>
+          <element type='xsd:string' name='Human readable name (hrn)' minOccurs='0'/>
         </xsd:choice>
       </xsd:complexType>
       <xsd:simpleType name='Type4'>