from TestBoxQemu import TestBoxQemu
from TestSsh import TestSsh
from TestApiserver import TestApiserver
-from TestSliceSfa import TestSliceSfa
+from TestAuthSfa import TestAuthSfa
# step methods must take (self) and return a boolean (options is a member of the class)
actual.__doc__=TestSlice.__dict__[method.__name__].__doc__
return actual
-def slice_sfa_mapper (method):
+def auth_sfa_mapper (method):
def actual(self):
overall=True
- slice_method = TestSliceSfa.__dict__[method.__name__]
- for slice_spec in self.plc_spec['sfa']['sfa_slice_specs']:
- test_slice=TestSliceSfa(self,slice_spec)
+ slice_method = TestAuthSfa.__dict__[method.__name__]
+ for slice_spec in self.plc_spec['sfa']['auth_sfa_specs']:
+ test_slice=TestAuthSfa(self,slice_spec)
if not slice_method(test_slice,self.options): overall=False
return overall
# restore the doc text
- actual.__doc__=TestSliceSfa.__dict__[method.__name__].__doc__
+ actual.__doc__=TestAuthSfa.__dict__[method.__name__].__doc__
return actual
SEP='<sep>'
'qemu_export', 'qemu_kill_mine', 'qemu_start', 'timestamp_qemu', SEP,
'sfa_install_all', 'sfa_configure', 'cross_sfa_configure', 'sfa_start', 'sfa_import', SEPSFA,
'sfi_configure@1', 'sfa_add_site@1','sfa_add_pi@1', SEPSFA,
- 'sfa_add_user@1', 'sfa_add_slice@1', 'sfa_discover@1', SEPSFA,
- 'sfa_create_slice@1', 'sfa_check_slice_plc@1', SEPSFA,
- 'sfa_update_user@1', 'sfa_update_slice@1', SEPSFA,
+ 'sfa_add_user@1', 'sfa_update_user@1', 'sfa_add_slice@1', 'sfa_discover@1', SEPSFA,
+ 'sfa_create_slice@1', 'sfa_check_slice_plc@1', 'sfa_update_slice@1', SEPSFA,
'sfi_list@1', 'sfi_show@1', 'sfi_slices@1', 'sfa_utest@1', SEPSFA,
# we used to run plcsh_stress_test, and then ssh_node_debug and ssh_node_boot
# but as the stress test might take a while, we sometimes missed the debug mode..
return step != SEP and step != SEPSFA
# turn off the sfa-related steps when build has skipped SFA
- # this is originally for centos5 as recent SFAs won't build on this platform
+ # this was originally for centos5 but is still valid
+ # for up to f12 as recent SFAs with sqlalchemy won't build before f14
@staticmethod
def check_whether_build_has_sfa (rpms_url):
+ utils.header ("Checking if build provides SFA package...")
# warning, we're now building 'sface' so let's be a bit more picky
retcod=os.system ("curl --silent %s/ | grep -q sfa-"%rpms_url)
# full builds are expected to return with 0 here
- if retcod!=0:
+ if retcod==0:
+ utils.header("build does provide SFA")
+ else:
# move all steps containing 'sfa' from default_steps to other_steps
- sfa_steps= [ step for step in TestPlc.default_steps if step.find('sfa')>=0 ]
+ utils.header("SFA package not found - removing steps with sfa or sfi")
+ sfa_steps= [ step for step in TestPlc.default_steps if step.find('sfa')>=0 or step.find("sfi")>=0 ]
TestPlc.other_steps += sfa_steps
for step in sfa_steps: TestPlc.default_steps.remove(step)
return (site,node)
raise Exception,"Cannot locate hostname %s"%hostname
- def locate_key (self,keyname):
+ def locate_key (self,key_name):
for key in self.plc_spec['keys']:
- if key['name'] == keyname:
+ if key['key_name'] == key_name:
return key
- raise Exception,"Cannot locate key %s"%keyname
+ raise Exception,"Cannot locate key %s"%key_name
+
+ def locate_private_key_from_key_names (self, key_names):
+ # locate the first avail. key
+ found=False
+ for key_name in key_names:
+ key_spec=self.locate_key(key_name)
+ test_key=TestKey(self,key_spec)
+ publickey=test_key.publicpath()
+ privatekey=test_key.privatepath()
+ if os.path.isfile(publickey) and os.path.isfile(privatekey):
+ found=True
+ if found: return privatekey
+ else: return None
def locate_slice (self, slicename):
for slice in self.plc_spec['slices']:
print '+ ======== initscript',initscript['initscript_fields']['name']
def display_key_spec (self,key):
- print '+ ======== key',key['name']
+ print '+ ======== key',key['key_name']
def display_slice_spec (self,slice):
print '+ ======== slice',slice['slice_fields']['name']
local_key = "keys/%(vservername)s-debug.rsa"%locals()
else:
message="boot"
- local_key = "keys/key1.rsa"
+ local_key = "keys/key_admin.rsa"
node_infos = self.all_node_infos()
utils.header("checking ssh access (expected in %s mode) to nodes:"%message)
for (nodename,qemuname) in node_infos:
# ignore result
sfa_spec=self.plc_spec['sfa']
- for sfa_slice_spec in sfa_spec['sfa_slice_specs']:
- login_base=sfa_slice_spec['login_base']
+ for auth_sfa_spec in sfa_spec['auth_sfa_specs']:
+ login_base=auth_sfa_spec['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']:
- username="%s@%s"%(sfa_slice_spec[key],sfa_slice_spec['domain'])
+ for spec_name in ['pi_spec','user_spec']:
+ user_spec=auth_sfa_spec[spec_name]
+ username=user_spec['email']
try: self.apiserver.DeletePerson(self.auth_root(),username)
- except: print "User %s already absent from PLC db"%username
+ except:
+ # this in fact is expected as sites delete their members
+ #print "User %s already absent from PLC db"%username
+ pass
print "REMEMBER TO RUN sfa_import AGAIN"
return True
def sfa_import(self):
"sfa-import-plc"
auth=self.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH']
- return self.run_in_guest('sfa-import.py')==0 or \
- self.run_in_guest('sfa-import-plc.py')==0 or \
- self.run_in_guest('sfaadmin.py registry import_registry')==0
+ return \
+ self.run_in_guest('sfaadmin.py reg import_registry')==0
# not needed anymore
# self.run_in_guest('cp /etc/sfa/authorities/%s/%s.pkey /etc/sfa/authorities/server.key'%(auth,auth))
utils.header("DRY RUN - skipping step")
return True
sfa_spec=self.plc_spec['sfa']
- # cannot use slice_sfa_mapper to pass dir_name
- for slice_spec in self.plc_spec['sfa']['sfa_slice_specs']:
- test_slice=TestSliceSfa(self,slice_spec)
+ # cannot use auth_sfa_mapper to pass dir_name
+ for slice_spec in self.plc_spec['sfa']['auth_sfa_specs']:
+ test_slice=TestAuthSfa(self,slice_spec)
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)
+ test_slice.sfi_configure(dir_name)
# push into the remote /root/sfi area
location = test_slice.sfi_path()
remote="%s/%s"%(self.vm_root_in_host(),location)
self.run_in_guest("rm -rf /root/sfi")
return True
- @slice_sfa_mapper
+ @auth_sfa_mapper
def sfa_add_site (self): pass
- @slice_sfa_mapper
+ @auth_sfa_mapper
def sfa_add_pi (self): pass
- @slice_sfa_mapper
+ @auth_sfa_mapper
def sfa_add_user(self): pass
- @slice_sfa_mapper
+ @auth_sfa_mapper
def sfa_update_user(self): pass
- @slice_sfa_mapper
+ @auth_sfa_mapper
def sfa_add_slice(self): pass
- @slice_sfa_mapper
+ @auth_sfa_mapper
def sfa_discover(self): pass
- @slice_sfa_mapper
+ @auth_sfa_mapper
def sfa_create_slice(self): pass
- @slice_sfa_mapper
+ @auth_sfa_mapper
def sfa_check_slice_plc(self): pass
- @slice_sfa_mapper
+ @auth_sfa_mapper
def sfa_update_slice(self): pass
- @slice_sfa_mapper
+ @auth_sfa_mapper
def sfi_list(self): pass
- @slice_sfa_mapper
+ @auth_sfa_mapper
def sfi_show(self): pass
- @slice_sfa_mapper
+ @auth_sfa_mapper
def sfi_slices(self): pass
- @slice_sfa_mapper
+ @auth_sfa_mapper
def ssh_slice_sfa(self): pass
- @slice_sfa_mapper
+ @auth_sfa_mapper
def sfa_delete_user(self): pass
- @slice_sfa_mapper
+ @auth_sfa_mapper
def sfa_delete_slice(self): pass
def sfa_stop(self):
test_site = TestSite (self,site_spec)
for node_spec in site_spec['nodes']:
test_node=TestNode(self,test_site,node_spec)
- test_ssh = TestSsh (test_node.name(),key="keys/key1.rsa")
+ test_ssh = TestSsh (test_node.name(),key="keys/key_admin.rsa")
command = test_ssh.actual_command("tar -C /var/log -cf - .")
command = command + "| tar -C logs/node.var-log.%s -xf -"%test_node.name()
utils.system("mkdir -p logs/node.var-log.%s"%test_node.name())
git://git.onelab.eu / tests.git / blobdiff