X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestPlc.py;h=7d3ba22fdd2c374bee827fc5297db2e87f9df265;hb=5550f529209845d103ea5c064de00332bca48646;hp=739cd61fd65bdf7670941c1eece39e3cfa327be5;hpb=a0ef9d5eb3b0539df9d36ee38b2da5cd408cc543;p=tests.git diff --git a/system/TestPlc.py b/system/TestPlc.py index 739cd61..7d3ba22 100644 --- a/system/TestPlc.py +++ b/system/TestPlc.py @@ -1203,7 +1203,7 @@ class TestPlc: for sfa_slice_spec in sfa_spec['sfa_slice_specs']: login_base=sfa_slice_spec['login_base'] - try: self.apiserver.DeleteSite (self.auth.root(),login_base) + try: self.apiserver.DeleteSite (self.auth_root(),login_base) except: print "Site %s already absent from PLC db"%login_base for key in ['piuser','regularuser']: @@ -1352,7 +1352,8 @@ class TestPlc: # cannot use sfa_slice_mapper to pass dir_name for slice_spec in self.plc_spec['sfa']['sfa_slice_specs']: test_slice=TestSliceSfa(self,slice_spec) - dir_name=self.confsubdir("dot-sfi/%s"%slice_spec['slicename'],clean=True,dry_run=self.options.dry_run) + dir_basename=os.path.basename(test_slice.sfi_path()) + dir_name=self.confsubdir("dot-sfi/%s"%dir_basename,clean=True,dry_run=self.options.dry_run) test_slice.sfi_config(dir_name) # push into the remote /root/sfi area location = test_slice.sfi_path()