a little nicer wrt pep8

[sfa.git] / sfa / methods / PerformOperationalAction.py

diff --git a/sfa/methods/PerformOperationalAction.py b/sfa/methods/PerformOperationalAction.py
index 01d853d..0d33b0c 100644 (file)
--- a/sfa/methods/PerformOperationalAction.py
+++ b/sfa/methods/PerformOperationalAction.py
@@ -2,39 +2,50 @@ from sfa.util.faults import SfaInvalidArgument, InvalidRSpec
 from sfa.util.xrn import urn_to_hrn
 from sfa.util.method import Method
 from sfa.util.sfatablesRuntime import run_sfatables
+from sfa.util.sfalogging import logger
+
 from sfa.trust.credential import Credential
+
 from sfa.storage.parameter import Parameter, Mixed
 
+
 class PerformOperationalAction(Method):
     """
-    Request that the named geni_allocated slivers be made 
-    geni_provisioned, instantiating or otherwise realizing the 
-    resources, such that they have a valid geni_operational_status 
-    and may possibly be made geni_ready for experimenter use. This 
-    operation is synchronous, but may start a longer process, such 
+    Request that the named geni_allocated slivers be made
+    geni_provisioned, instantiating or otherwise realizing the
+    resources, such that they have a valid geni_operational_status
+    and may possibly be made geni_ready for experimenter use. This
+    operation is synchronous, but may start a longer process, such
     as creating and imaging a virtual machine
 
     @param slice urns ([string]) URNs of slivers to provision to
     @param credentials (dict) of credentials
     @param options (dict) options
-    
+
     """
-    interfaces = ['aggregate', 'slicemgr']
+    interfaces = ['aggregate']
     accepts = [
         Parameter(type([str]), "URNs"),
         Parameter(type([dict]), "Credentials"),
         Parameter(str, "Action"),
         Parameter(dict, "Options"),
-        ]
+    ]
     returns = Parameter(dict, "Provisioned Resources")
 
     def call(self, xrns, creds, action, options):
-        self.api.logger.info("interface: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, xrns, self.name))
+        logger.info("interface: %s\ttarget-hrn: %s\tmethod-name: %s" %
+                    (self.api.interface, xrns, self.name))
+
+        (speaking_for, _) = urn_to_hrn(options.get('geni_speaking_for'))
 
         # Find the valid credentials
-        valid_creds = self.api.auth.checkCredentials(creds, 'createsliver', xrns,
-                      check_sliver_callback = self.api.driver.check_sliver_credentials) 
+        valid_creds = self.api.auth.checkCredentialsSpeaksFor(
+            creds, 'createsliver', xrns,
+            check_sliver_callback=self.api.driver.check_sliver_credentials,
+            options=options)
         origin_hrn = Credential(cred=valid_creds[0]).get_gid_caller().get_hrn()
-        self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, xrns, self.name))
-        result = self.api.manager.PerformOperationalAction(self.api, xrns, creds, action, options)
+        logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s" %
+                    (self.api.interface, origin_hrn, xrns, self.name))
+        result = self.api.manager.PerformOperationalAction(
+            self.api, xrns, creds, action, options)
         return result