# result name
def resname (self,name,ext): return "%s.%s"%(name,ext)
- def addslicefile (self): return self.resname("slice_record","xml")
- def addpersonfile (self): return self.resname("person_record","xml")
def adfile (self): return self.resname("ad","rspec")
def reqfile (self): return self.resname("req","rspec")
def nodefile (self): return self.resname("nodes","txt")
return "/root/sfi/%s%s"%(self.slicename,self.rspec_style())
def locate_key(self):
- for username,keyname in self.sfa_slice_spec['usernames']:
- key_spec=self.test_plc.locate_key(keyname)
- test_key=TestKey(self.test_plc,key_spec)
- publickey=test_key.publicpath()
- privatekey=test_key.privatepath()
- if os.path.isfile(publickey) and os.path.isfile(privatekey):
- found=True
+ for key_name in self.sfa_slice_spec['slice_key_names']:
+ key_spec=self.test_plc.locate_key(key_name)
+ test_key=TestKey(self.test_plc,key_spec)
+ publickey=test_key.publicpath()
+ privatekey=test_key.privatepath()
+ if os.path.isfile(publickey) and os.path.isfile(privatekey):
+ found=True
return (found,privatekey)
# dir_name is local and will be pushed later on by TestPlc
# by default set SFI_USER to the pi, we'll overload this
# on the command line when needed
- def sfi_config (self,dir_name):
+ def sfi_configure (self,dir_name):
plc_spec=self.test_plc.plc_spec
sfa_spec=self.sfa_spec
sfa_slice_spec=self.sfa_slice_spec
keys=plc_spec['keys']
- for (contents,name) in [ (keys[0]['private'], self.piuser+'.pkey'),
- (keys[0]['key_fields']['key'], self.piuser+'.pub'),
- (keys[1]['private'], self.regularuser+'.pkey'),
- (keys[0]['key_fields']['key'], self.regularuser+'.pub'),
- ]:
- file_name=os.path.join(dir_name,self.qualified_hrn(name))
- fileconf=open(file_name,'w')
- fileconf.write (contents)
- fileconf.close()
- utils.header ("(Over)wrote %s"%file_name)
- #
- file_name=dir_name + os.sep + self.addpersonfile()
- fileconf=open(file_name,'w')
- fileconf.write(sfa_slice_spec['person_record'])
- fileconf.write('\n')
- fileconf.close()
- utils.header ("(Over)wrote %s"%file_name)
+ # fetch keys in config spec and expose to sfi
+ for (hrn_leaf,key_name) in sfa_slice_spec['hrn_keys'].items():
+ key_spec = self.test_plc.locate_key (key_name)
+ for (kind,ext) in [ ('private', 'pkey'), ('public', 'pub') ] :
+ contents=key_spec[kind]
+ file_name=os.path.join(dir_name,self.qualified_hrn(hrn_leaf))+"."+ext
+ fileconf=open(file_name,'w')
+ fileconf.write (contents)
+ fileconf.close()
+ utils.header ("(Over)wrote %s"%file_name)
#
file_name=dir_name + os.sep + 'sfi_config'
fileconf=open(file_name,'w')
fileconf.write('\n')
fileconf.close()
utils.header ("(Over)wrote %s"%file_name)
- #
- file_name=dir_name + os.sep + self.addslicefile()
- fileconf=open(file_name,'w')
- fileconf.write(sfa_slice_spec['slice_record'])
- fileconf.write('\n')
- utils.header ("(Over)wrote %s"%file_name)
- fileconf.close()
# using sfaadmin to bootstrap
def sfa_add_site (self, options):
# user management
def sfa_add_user (self, options):
- "add a regular user using sfi.py add"
+ "add a regular user using sfi add"
return TestUserSfa(self.test_plc, self.sfa_slice_spec, self).add_user()
def sfa_update_user (self, options):
- "update a user record using sfi.py update"
+ "update a user record using sfi update"
return TestUserSfa(self.test_plc, self.sfa_slice_spec, self).update_user()
def sfa_delete_user (self, options):
- "run sfi.py delete"
+ "run sfi delete"
return TestUserSfa(self.test_plc, self.sfa_slice_spec, self).delete_user()
# run as pi
def sfi_pi (self, command):
- return "sfi.py -d %s -u %s %s"%(self.sfi_path(),self.qualified_hrn(self.piuser), command,)
- # the sfi.py command line option to run as a regular user
+ return "sfi -d %s -u %s %s"%(self.sfi_path(),self.qualified_hrn(self.piuser), command,)
+ # the sfi command line option to run as a regular user
def sfi_user (self, command):
- return "sfi.py -d %s -u %s %s"%(self.sfi_path(),self.qualified_hrn(self.regularuser), command,)
+ return "sfi -d %s -u %s %s"%(self.sfi_path(),self.qualified_hrn(self.regularuser), command,)
# those are step names exposed as methods of TestPlc, hence the _sfa
# needs to be run as pi
def sfa_add_slice(self,options):
- "run sfi.py add (on Registry) from slice.xml"
- return self.test_plc.run_in_guest(self.sfi_pi("add %s"%(self.addslicefile())))==0
+ "run sfi add (on Registry) from slice.xml"
+ sfi_options="add"
+ for (k,v) in self.sfa_slice_spec['slice_sfi_options'].items():
+ sfi_options += " %s %s"%(k,v)
+ return self.test_plc.run_in_guest(self.sfi_pi("%s"%(sfi_options)))==0
# run as user
def sfa_discover(self,options):
# run sfi create as a regular user
def sfa_create_slice(self,options):
- "run sfi.py create (on SM) - 1st time"
+ "run sfi create (on SM) - 1st time"
commands=[
"sfiListNodes.py -i %s/%s -o %s/%s"%(self.sfi_path(),self.adfile(),self.sfi_path(),self.nodefile()),
"sfiAddSliver.py -i %s/%s -n %s/%s -o %s/%s"%\
# actually the same for now
def sfa_update_slice(self,options):
- "run sfi.py create (on SM) on existing object"
+ "run sfi create (on SM) on existing object"
return self.sfa_create_slice(options)
# run as pi
def sfa_delete_slice(self,options):
- "run sfi.py delete"
+ "run sfi delete"
self.test_plc.run_in_guest(self.sfi_pi("delete %s"%(self.hrn(),)))
return self.test_plc.run_in_guest(self.sfi_pi("remove -t slice %s"%(self.hrn(),)))==0
# nm restart after first failure, if requested
if options.forcenm and hostname not in restarted:
utils.header ("forcenm option : restarting nm on %s"%hostname)
- restart_test_ssh=TestSsh(hostname,key="keys/key1.rsa")
+ restart_test_ssh=TestSsh(hostname,key="keys/key_admin.rsa")
access=restart_test_ssh.actual_command('service nm restart')
if (access==0):
utils.header('nm restarted on %s'%hostname)
git://git.onelab.eu / tests.git / blobdiff