From fd3298512903685d7926fbfdff56be8e5207fdd1 Mon Sep 17 00:00:00 2001
From: Tony Mack <tmack@cs.princeton.edu>
Date: Tue, 3 Aug 2010 22:34:34 +0000
Subject: [PATCH] now exported by aggregate, slicemgr and component interfaces
---
sfa/methods/SliverStatus.py | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/sfa/methods/SliverStatus.py b/sfa/methods/SliverStatus.py
index 24d6ff2a..0da6b501 100644
--- a/sfa/methods/SliverStatus.py
+++ b/sfa/methods/SliverStatus.py
@@ -10,26 +10,22 @@ class SliverStatus(Method):
@param slice_urn (string) URN of slice to allocate to
"""
- interfaces = ['geni_am']
+ interfaces = ['aggregate', 'slicemgr', 'component', 'geni_am']
accepts = [
Parameter(str, "Slice URN"),
+ Mixed(Parameter(str, "Credential string"),
+ Parameter(type([str]), "List of credentials")),
]
- returns = Parameter(bool, "Success or Failure")
+ returns = Parameter(dict, "Status details")
def call(self, slice_xrn, creds):
hrn, type = urn_to_hrn(slice_xrn)
-
- ValidCreds = self.api.auth.checkCredentials(creds, 'sliverstatus', hrn)
+ valid_creds = self.api.auth.checkCredentials(creds, 'sliverstatus', hrn)
self.api.logger.info("interface: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, hrn, self.name))
+
+ manager = self.api.get_interface_manager()
+ status = manager.delete_slice(self.api, xrn, valid_creds)
- manager_base = 'sfa.managers'
-
- if self.api.interface in ['geni_am']:
- mgr_type = self.api.config.SFA_GENI_AGGREGATE_TYPE
- manager_module = manager_base + ".geni_am_%s" % mgr_type
- manager = __import__(manager_module, fromlist=[manager_base])
- return manager.SliverStatus(self.api, slice_xrn, ValidCreds)
-
- return ''
+ return status
--
2.47.0