fix various glitches for getting this branch to pass wsdl generation

diff --git a/sfa/methods/Delete.py b/sfa/methods/Delete.py
index 9ed6e98..74ff838 100644 (file)
--- a/sfa/methods/Delete.py
+++ b/sfa/methods/Delete.py
@@ -16,7 +16,7 @@ class Delete(Method):
     interfaces = ['aggregate', 'slicemgr', 'component']
     
     accepts = [
-        Parameter([str], "Human readable name of slice to delete (hrn or urn)"),
+        Parameter(type([str]), "Human readable name of slice to delete (hrn or urn)"),
         Parameter(dict, "Credentials"),
         Parameter(dict, "options"),
         ]

diff --git a/sfa/methods/Provision.py b/sfa/methods/Provision.py
index 6051093..21ab93d 100644 (file)
--- a/sfa/methods/Provision.py
+++ b/sfa/methods/Provision.py
@@ -22,7 +22,7 @@ class Provision(Method):
     """
     interfaces = ['aggregate', 'slicemgr']
     accepts = [
-        Parameter([str], "URNs"),
+        Parameter(type([str]), "URNs"),
         Parameter(dict, "Credentials"),
         Parameter(dict, "options"),
         ]

diff --git a/sfa/methods/Shutdown.py b/sfa/methods/Shutdown.py
index d288036..e532d1d 100644 (file)
--- a/sfa/methods/Shutdown.py
+++ b/sfa/methods/Shutdown.py
@@ -13,7 +13,7 @@ class Shutdown(Method):
     interfaces = ['aggregate', 'slicemgr']
     accepts = [
         Parameter(str, "Slice URN"),
-        Parameter(type(dict), "Credentials"),
+        Parameter(dict, "Credentials"),
         ]
     returns = Parameter(bool, "Success or Failure")
 

diff --git a/sfa/methods/Status.py b/sfa/methods/Status.py
index 951871d..83aa023 100644 (file)
--- a/sfa/methods/Status.py
+++ b/sfa/methods/Status.py
@@ -12,8 +12,8 @@ class Status(Method):
     """
     interfaces = ['aggregate', 'slicemgr', 'component']
     accepts = [
-        Parameter([str], "Slice or sliver URNs"),
-        Parameter(dict), "credentials")),
+        Parameter(type([str]), "Slice or sliver URNs"),
+        Parameter(dict, "credentials"),
         Parameter(dict, "Options")
         ]
     returns = Parameter(dict, "Status details")