X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Ffederica%2Ffddriver.py;h=cec702d6aefafed4d2c2076d8bf0b8b2469ab32f;hb=f8c653decd381476c40184f6c6859a4e36a7b12f;hp=1e16d7faa49a11f600267e2818854181bf55cacd;hpb=aa755156bae0e1547be749a9d1256ff02807bd34;p=sfa.git diff --git a/sfa/federica/fddriver.py b/sfa/federica/fddriver.py index 1e16d7fa..cec702d6 100644 --- a/sfa/federica/fddriver.py +++ b/sfa/federica/fddriver.py @@ -2,7 +2,7 @@ from sfa.util.sfalogging import logger from sfa.util.faults import SfaFault # this is probably too big to swallow but for a starting point.. -from sfa.plc.pldriver import PlDriver +from sfa.planetlab.pldriver import PlDriver from sfa.federica.fdshell import FdShell @@ -23,8 +23,9 @@ federica_version_string="RSpecV2" class FdDriver (PlDriver): - def __init__ (self,config): - PlDriver.__init__ (self, config) + def __init__ (self,api): + PlDriver.__init__ (self, api) + config = api.config self.shell=FdShell(config) # the agreement with the federica driver is for them to expose results in a way @@ -54,7 +55,11 @@ class FdDriver (PlDriver): return "federica" def list_slices (self, creds, options): - return self.response(self.shell.listSlices()) + # the issue is that federica returns the list of slice's urn in a string format + # this is why this dirty hack is needed until federica fixes it. + slices_str = self.shell.listSlices()['value'][1:-1] + slices_list = slices_str.split(", ") + return slices_list def sliver_status (self, slice_urn, slice_hrn): return "fddriver.sliver_status: undefined/todo for slice %s"%slice_hrn