From: Thierry Parmentelat Date: Thu, 20 Oct 2011 19:08:51 +0000 (+0200) Subject: don't use protogeni yet as the tests are not yet smooth with that X-Git-Tag: tests-5.0-30~7 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=796f86c53d2fd020b84b4c36ef2781784780136c;p=tests.git don't use protogeni yet as the tests are not yet smooth with that --- diff --git a/system/TestSliceSfa.py b/system/TestSliceSfa.py index a220c0b..725574c 100644 --- a/system/TestSliceSfa.py +++ b/system/TestSliceSfa.py @@ -71,7 +71,7 @@ class TestSliceSfa: # those are step names exposed as methods of TestPlc, hence the _sfa def sfa_add_slice(self,options): - return self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ add slice.xml")==0 + return self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ add %s"%(self.addslicefile()))==0 def sfa_discover(self,options): return self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ %s resources -o /root/.sfi/%s"%(self.discover_option(),self.adfile()))==0 diff --git a/system/config_default.py b/system/config_default.py index 24c84e7..e8ab943 100644 --- a/system/config_default.py +++ b/system/config_default.py @@ -312,7 +312,8 @@ def sfa (options,index) : 'SFA_PLC_DB_PASSWORD' : 'mnbvcxzlkjhgfdsapoiuytrewq', 'SFA_PLC_URL' : 'deferred-myplc-api-url', 'SFA_API_DEBUG': True, - 'sfa_slice_specs' : [ sfa_slice_spec(options,index,piuser,regularuser,i) for i in [0,1]], +# 'sfa_slice_specs' : [ sfa_slice_spec(options,index,piuser,regularuser,i) for i in [0,1]], + 'sfa_slice_specs' : [ sfa_slice_spec(options,index,piuser,regularuser,i) for i in [0]], 'sfa_slice_rspec' : sfa_slice_rspec(options,index), 'login_base' : login_base(index), 'piuser' : piuser,