From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Sat, 20 Oct 2012 02:23:06 +0000 (-0400)
Subject: fix PerformOperationalAction
X-Git-Tag: sfa-3.0-0~102
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=bdc21c79e2a03885010166355b7036b14cc95dd5

fix PerformOperationalAction
---

diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
index 3f34ac6c..20d4b990 100644
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -1371,6 +1371,7 @@ or with an slice hrn, shows currently provisioned resources
         Perform the named operational action on the named slivers
         """
         server = self.sliceapi()
+        api_options = {}
         # slice urn
         slice_hrn = args[0]
         action = args[1]
@@ -1382,7 +1383,7 @@ or with an slice hrn, shows currently provisioned resources
             delegated_cred = self.delegate_cred(slice_cred, get_authority(self.authority))
             creds.append(delegated_cred)
         
-        result = server.PerformOperationalAction(slice_urn, creds, action )
+        result = server.PerformOperationalAction([slice_urn], creds, action , api_options)
         value = ReturnValue.get_value(result)
         if self.options.raw:
             save_raw_to_file(result, self.options.raw, self.options.rawformat, self.options.rawbanner)
diff --git a/sfa/managers/aggregate_manager.py b/sfa/managers/aggregate_manager.py
index 0b97c638..0bb9553c 100644
--- a/sfa/managers/aggregate_manager.py
+++ b/sfa/managers/aggregate_manager.py
@@ -134,7 +134,7 @@ class AggregateManager:
     def PerformOperationalAction(self, api, xrns, creds, action, options={}):
         call_id = options.get('call_id')
         if Callids().already_handled(call_id): return True
-        return self.driver.performOperationalAction(xrns, action, options) 
+        return self.driver.perform_operational_action(xrns, action, options) 
 
     def Shutdown(self, api, xrn, creds, options={}):
         call_id = options.get('call_id')
diff --git a/sfa/methods/__init__.py b/sfa/methods/__init__.py
index 89c8bf7c..10766fe5 100644
--- a/sfa/methods/__init__.py
+++ b/sfa/methods/__init__.py
@@ -11,6 +11,7 @@ GetVersion
 List
 ListResources
 ListSlices
+PerformOperationalAction
 Provision
 RedeemTicket
 Register
diff --git a/sfa/planetlab/pldriver.py b/sfa/planetlab/pldriver.py
index 42da6ec2..75c230f3 100644
--- a/sfa/planetlab/pldriver.py
+++ b/sfa/planetlab/pldriver.py
@@ -763,7 +763,7 @@ class PlDriver (Driver):
             pass
         else:
             raise UnsupportedOperation(action)
-        description = self.describe(urns)
+        description = self.describe(urns, None, options)
         return description['geni_slivers']
 
     # set the 'enabled' tag to 0