steps towards computing wsdl files at build-time:

* review makefile to make sure the __init__.py files get created
* add python-uuid to the build packages
* remove () in class definitions when no inheritance - for python2.4/centos
still cannot update wsdl output at build-time b/c of missing config
config cleanup needed first (import config should not raise exception)

diff --git a/docs/Makefile b/docs/Makefile
index 8af1482..43f9ad0 100644 (file)
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,11 +1,11 @@
 ### this seems like totally out-of-date
 doc:
-       pythondoc.py ../util/certificate.py ../util/credential.py ../util/gid.py \
-                     ../util/rights.py ../util/config.py ../util/hierarchy.py \
-                     ../util/record.py ../util/geniclient.py \
-                     ../util/geniserver.py 
+       pythondoc.py ../sfa/util/certificate.py ../sfa/util/credential.py ../sfa/util/gid.py \
+                     ../sfa/util/rights.py ../sfa/util/config.py ../sfa/trust/hierarchy.py \
+                     ../sfa/util/record.py ../sfa/util/geniclient.py \
+                     ../sfa/util/geniserver.py 
 
-       pythondoc.py ../registry/registry.py ../registry/import.py \
-                     ../registry/nuke.py
+       pythondoc.py ../sfa/registry/registry.py ../sfa/registry/import.py \
+                     ../sfa/registry/nuke.py
 
        pythondoc.py ../component/component.py

diff --git a/sfa/trust/hierarchy.py b/sfa/trust/hierarchy.py
index 7953df3..336fd9e 100644 (file)
--- a/sfa/trust/hierarchy.py
+++ b/sfa/trust/hierarchy.py
@@ -30,7 +30,7 @@ from sfa.util.geniticket import *
 # The AuthInfo class contains the information for an authority. This information
 # includes the GID, private key, and database connection information.
 
-class AuthInfo():
+class AuthInfo:
     hrn = None
     gid_object = None
     gid_filename = None
@@ -102,7 +102,7 @@ class AuthInfo():
 # contains the GID, pkey, and dbinfo files for that authority (as well as
 # subdirectories for each sub-authority)
 
-class Hierarchy():
+class Hierarchy:
     ##
     # Create the hierarchy object.
     #

diff --git a/sfa/trust/trustedroot.py b/sfa/trust/trustedroot.py
index 9940d58..52ea2a2 100644 (file)
--- a/sfa/trust/trustedroot.py
+++ b/sfa/trust/trustedroot.py
@@ -6,7 +6,7 @@ import os
 from sfa.trust.gid import *
 from sfa.util.config import Config
 
-class TrustedRootList():
+class TrustedRootList:
     def __init__(self, dir=None):
         if not dir:
             config = Config()

diff --git a/sfa/util/geniclient.py b/sfa/util/geniclient.py
index 00553ff..91932b5 100644 (file)
--- a/sfa/util/geniclient.py
+++ b/sfa/util/geniclient.py
@@ -69,7 +69,7 @@ class GeniTransport(xmlrpclib.Transport):
 # public key that is containing in the GID that the client is providing for
 # those functions that take a GID.
 
-class GeniClient():
+class GeniClient:
     ##
     # Create a new GeniClient object.
     #

diff --git a/sfa/util/genitable.py b/sfa/util/genitable.py
index d814c0f..7eb8335 100644 (file)
--- a/sfa/util/genitable.py
+++ b/sfa/util/genitable.py
@@ -17,7 +17,7 @@ from sfa.util.debug import *
 
 GENI_TABLE_PREFIX = "geni$"
 
-class GeniTable():
+class GeniTable:
     def __init__(self, create=False, hrn="unspecified.default.registry", cninfo=None):
         global GENI_TABLE_PREFIX
 

diff --git a/sfa/util/rspec.py b/sfa/util/rspec.py
index a184dc0..6008b8d 100644 (file)
--- a/sfa/util/rspec.py
+++ b/sfa/util/rspec.py
@@ -8,7 +8,7 @@ import httplib
 from xml.dom import minidom
 from types import StringTypes, ListType
 
-class Rspec():
+class Rspec:
 
     def __init__(self, xml = None, xsd = None, NSURL = None):
         '''

diff --git a/wsdl/Makefile b/wsdl/Makefile
index 0a77907..e5bbab8 100644 (file)
--- a/wsdl/Makefile
+++ b/wsdl/Makefile
@@ -1,2 +1,21 @@
-all: sfa.wsdl
-       PYTHONPATH=../ ./gw2wsdl.py --registry --slice-manager --aggregate > sfa.wsdl
+# attempt to update at build-time
+SFA := sfa.wsdl
+ALL := $(SFA) registry.wsdl slice-manager.wsdl aggregate.wsdl 
+
+all: $(SFA)
+
+# create missing __init__.py files
+../sfa/__init__.py:
+       make -C .. index
+
+registry.wsdl: ../sfa/__init__.py
+       PYTHONPATH=../ ./gw2wsdl.py --registry > $@
+
+slice-manager.wsdl: ../sfa/__init__.py
+       PYTHONPATH=../ ./gw2wsdl.py --slice-manager > $@
+
+aggregate.wsdl: ../sfa/__init__.py
+       PYTHONPATH=../ ./gw2wsdl.py --aggregate > $@
+
+sfa.wsdl: ../sfa/__init__.py
+       PYTHONPATH=../ ./gw2wsdl.py --registry --slice-manager --aggregate > $@