from TestSsh import TestSsh
from Completer import Completer, CompleterTask
-from TestSlice import CompleterTaskSshSlice
+from TestSlice import CompleterTaskSliceSsh
class TestSliceSfa:
# shortcuts
self.test_plc=self.test_auth_sfa.test_plc
- def qualified(self,name): return self.test_auth_sfa.qualified(name)
- def hrn (self): return self.qualified(self.slice_spec['name'])
- def sfi_path (self): return self.test_auth_sfa.sfi_path()
+ def hrn (self):
+ return self.test_auth_sfa.obj_hrn(self.slice_spec['name'])
+ def sfi_path (self):
+ return self.test_auth_sfa.sfi_path()
# send back up to the TestAuthSfa
def rspec_style (self): return self.test_auth_sfa.rspec_style()
def sfi_user(self,*args,**kwds): return self.test_auth_sfa.sfi_user(*args, **kwds)
def discover_option(self):
- if self.rspec_style()=='pg': return "-r protogeni"
+ if self.rspec_style()=='pg': return "-r GENI"
else: return "-r sfa"
# 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 add (on Registry)"
- sfi_command="add"
+ def sfa_register_slice(self,options):
+ "run sfi register (on Registry)"
+ sfi_command="register"
sfi_command += " --type slice"
sfi_command += " --xrn %s"%self.hrn()
- for opt in self.slice_spec['add_options']:
+ for opt in self.slice_spec['register_options']:
sfi_command += " %s"%(opt)
return self.test_plc.run_in_guest(self.sfi_pi(sfi_command))==0
"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"%\
(self.sfi_path(),self.adfile(),self.sfi_path(),self.nodefile(),self.sfi_path(),self.reqfile()),
- self.sfi_user("create %s %s"%(self.hrn(),self.reqfile())),
+ self.sfi_user("allocate %s %s"%(self.hrn(),self.reqfile())),
+ self.sfi_user("provision %s"%(self.hrn())),
]
for command in commands:
if self.test_plc.run_in_guest(command)!=0: return False
dry_run = getattr(options,'dry_run',False)
for nodename in self.slice_spec['nodenames']:
(site_spec,node_spec) = self.test_plc.locate_node(nodename)
- tasks.append( CompleterTaskSshSlice(self.test_plc,node_spec['node_fields']['hostname'],
+ tasks.append( CompleterTaskSliceSsh(self.test_plc,node_spec['node_fields']['hostname'],
slicename,private_key,command,expected=True,dry_run=dry_run))
return Completer (tasks).run (timeout, graceout, period)