From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Thu, 25 Oct 2007 18:05:17 +0000 (+0000)
Subject: A few tweaks.
X-Git-Tag: NodeManager-1.6-1~45
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ff1733dad0a14d97ac61fa3972de7b0076b80431;p=nodemanager.git

A few tweaks.
---

diff --git a/api_calls.py b/api_calls.py
index 002a6ce..9ab32b6 100644
--- a/api_calls.py
+++ b/api_calls.py
@@ -19,7 +19,7 @@ import threading
 import xmlrpclib
 
 try:
-	from PLC.Parameter import Parameter
+	from PLC.Parameter import Parameter, Mixed
 except:
 	pass
 
@@ -197,9 +197,9 @@ def GetRSpec(sliver_name):
 
 @export_to_docbook(roles=['nm-controller', 'self'], 
 					accepts=[Parameter(str, 'A sliver/slice name.')], 
-					returns=(Parameter(str, 'recipient'),
-						     Parameter(str, 'resource'),
-						     Parameter(int, 'amount')) 
+					returns=[Mixed(Parameter(str, 'recipient slice name'),
+						     Parameter(str, 'resource name'),
+						     Parameter(int, 'resource amount')]) 
 				  )
 @export_to_api(1)
 def GetLoans(sliver_name):
@@ -214,9 +214,9 @@ def validate_loans(obj):
 
 @export_to_docbook(roles=['nm-controller', 'self'], 
 				accepts=[ Parameter(str, 'A sliver/slice name.'),
-						  (Parameter(str, 'recipient'),
-						   Parameter(str, 'resource'),
-						   Parameter(int, 'amount')) ],
+						  [Mixed(Parameter(str, 'recipient slice name'),
+						   Parameter(str, 'resource name'),
+						   Parameter(int, 'resource amount'))] ],
 				returns=Parameter(int, '1 if successful'))
 @export_to_api(2)
 def SetLoans(sliver_name, loans):