X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestAuthSfa.py;h=820b50e62330bb1b158b15cbf0c07dfcf4628eed;hb=3e10f188b2de3707ccfccc1b1e77f9459061e946;hp=981d4e6f108318ce8a14c0ada0dd542c7fdd219b;hpb=4ceca163f5e50dbfcaaed2e5401a14b0bb755696;p=tests.git diff --git a/system/TestAuthSfa.py b/system/TestAuthSfa.py index 981d4e6..820b50e 100644 --- a/system/TestAuthSfa.py +++ b/system/TestAuthSfa.py @@ -1,5 +1,5 @@ # Thierry Parmentelat -# Copyright (C) 2010 INRIA +# Copyright (C) 2010 INRIA # import os, os.path @@ -46,7 +46,7 @@ class TestAuthSfa: self.login_base = self.auth_sfa_spec['login_base'] # self.piuser = self.auth_sfa_spec['piuser'] # self.regularuser = self.auth_sfa_spec['regularuser'] - + def sfi_path (self): return "/root/sfi" @@ -101,7 +101,7 @@ class TestAuthSfa: SFI_REGISTRY='http://{}:{}/'.format(sfa_spec['settings']['SFA_REGISTRY_HOST'], 12345) fileconf.write("SFI_REGISTRY='{}'".format(SFI_REGISTRY)) fileconf.write('\n') - SFI_SM='http://{}:{}/'.format(sfa_spec['settings']['SFA_SM_HOST'], sfa_spec['sfi-connects-to-port']) + SFI_SM='http://{}:{}/'.format(sfa_spec['settings']['SFA_AGGREGATE_HOST'], sfa_spec['sfi-connects-to-port']) fileconf.write("SFI_SM='{}'".format(SFI_SM)) fileconf.write('\n') fileconf.close() @@ -176,7 +176,7 @@ class TestAuthSfa: "run (as PI) sfi show -k researcher -k reg-researchers (on Registry)" return \ self.test_plc.run_in_guest(self.sfi_pi("show {} -k researcher -k reg-researchers".format(self.slice_hrn()))) == 0 - + # those are step names exposed as methods of TestPlc, hence the _sfa @slice_sfa_mapper @@ -198,6 +198,8 @@ class TestAuthSfa: @slice_sfa_mapper def sfa_provision_empty (self, *args, **kwds): pass @slice_sfa_mapper + def sfa_describe (self, *args, **kwds): pass + @slice_sfa_mapper def sfa_check_slice_plc (self, *args, **kwds): pass @slice_sfa_mapper def sfa_check_slice_plc_empty (self, *args, **kwds): pass @@ -207,4 +209,3 @@ class TestAuthSfa: def sfa_delete_slice (self, *args, **kwds): pass @slice_sfa_mapper def ssh_slice_sfa (self, *args, **kwds): pass -