From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Wed, 9 Jan 2013 14:29:14 +0000 (-0500)
Subject: support sliver ids
X-Git-Tag: sfa-3.0-0~36
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=16867afe1c1bb791de3d9d4b7174e0cb60a4cd43

support sliver ids
---

diff --git a/sfa/methods/Delete.py b/sfa/methods/Delete.py
index 88990e17..e8c5128f 100644
--- a/sfa/methods/Delete.py
+++ b/sfa/methods/Delete.py
@@ -24,7 +24,8 @@ class Delete(Method):
     returns = Parameter(int, "1 if successful")
     
     def call(self, xrns, creds, options):
-        valid_creds = self.api.auth.checkCredentials(creds, 'deletesliver', xrns)
+        valid_creds = self.api.auth.checkCredentials(creds, 'deletesliver', xrns,
+                      check_sliver_callback = self.api.manager.driver.check_sliver_credentials)
 
         #log the call
         origin_hrn = Credential(cred=valid_creds[0]).get_gid_caller().get_hrn()
diff --git a/sfa/methods/Provision.py b/sfa/methods/Provision.py
index 5a857ec7..74ee350e 100644
--- a/sfa/methods/Provision.py
+++ b/sfa/methods/Provision.py
@@ -32,7 +32,8 @@ class Provision(Method):
         self.api.logger.info("interface: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, xrns, self.name))
 
         # Find the valid credentials
-        valid_creds = self.api.auth.checkCredentials(creds, 'createsliver', xrns) 
+        valid_creds = self.api.auth.checkCredentials(creds, 'createsliver', xrns,
+                      check_sliver_callback = self.api.manager.driver.check_sliver_credentials) 
         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.Provision(self.api, xrns, creds, options)
diff --git a/sfa/methods/Renew.py b/sfa/methods/Renew.py
index ca412bd5..288e9700 100644
--- a/sfa/methods/Renew.py
+++ b/sfa/methods/Renew.py
@@ -33,7 +33,8 @@ class Renew(Method):
         self.api.logger.info("interface: %s\ttarget-hrn: %s\tcaller-creds: %s\tmethod-name: %s"%(self.api.interface, urns, creds, self.name))
 
         # Find the valid credentials
-        valid_creds = self.api.auth.checkCredentials(creds, 'renewsliver', urns)
+        valid_creds = self.api.auth.checkCredentials(creds, 'renewsliver', urns,
+                      check_sliver_callback = self.api.manager.driver.check_sliver_credentials)
 
         # Validate that the time does not go beyond the credential's expiration time
         requested_time = utcparse(expiration_time)
diff --git a/sfa/methods/Shutdown.py b/sfa/methods/Shutdown.py
index e97738c0..8641bd0e 100644
--- a/sfa/methods/Shutdown.py
+++ b/sfa/methods/Shutdown.py
@@ -19,7 +19,8 @@ class Shutdown(Method):
 
     def call(self, xrn, creds):
 
-        valid_creds = self.api.auth.checkCredentials(creds, 'stopslice', xrn)
+        valid_creds = self.api.auth.checkCredentials(creds, 'stopslice', xrn,
+                      check_sliver_callback = self.api.manager.driver.check_sliver_credentials)
         #log the call
         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, xrn, self.name))
diff --git a/sfa/methods/Status.py b/sfa/methods/Status.py
index 8415cb13..044e2529 100644
--- a/sfa/methods/Status.py
+++ b/sfa/methods/Status.py
@@ -19,7 +19,8 @@ class Status(Method):
     returns = Parameter(dict, "Status details")
 
     def call(self, xrns, creds, options):
-        valid_creds = self.api.auth.checkCredentials(creds, 'sliverstatus', xrns)
+        valid_creds = self.api.auth.checkCredentials(creds, 'sliverstatus', xrns,
+                      check_sliver_callback = self.api.manager.driver.check_sliver_credentials)
 
         self.api.logger.info("interface: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, xrns, self.name))
         return self.api.manager.Status(self.api, xrns, creds, options)
diff --git a/sfa/planetlab/plaggregate.py b/sfa/planetlab/plaggregate.py
index b4f796bf..1d06c4b4 100644
--- a/sfa/planetlab/plaggregate.py
+++ b/sfa/planetlab/plaggregate.py
@@ -136,6 +136,7 @@ class PlAggregate:
             return []
         slice = slices[0]
         if node_ids:
+            node_ids = [node_id for node_id in node_ids if node_id in slice['node_ids']]
             slice['node_ids'] = node_ids
         tags_dict = self.get_slice_tags(slice)
         nodes_dict = self.get_slice_nodes(slice, options)