git://git.onelab.eu
/
tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master'
[tests.git]
/
system
/
TestSlice.py
diff --git
a/system/TestSlice.py
b/system/TestSlice.py
index
b4f719e
..
0de8d3e
100644
(file)
--- a/
system/TestSlice.py
+++ b/
system/TestSlice.py
@@
-1,3
+1,7
@@
+#
+# $Id$
+# $URL$
+#
import utils
import os, os.path
import datetime
import utils
import os, os.path
import datetime
@@
-55,10
+59,10
@@
class TestSlice:
if self.slice_spec.has_key('initscriptname'):
isname=self.slice_spec['initscriptname']
utils.header("Adding initscript %s in %s"%(isname,slice_name))
if self.slice_spec.has_key('initscriptname'):
isname=self.slice_spec['initscriptname']
utils.header("Adding initscript %s in %s"%(isname,slice_name))
- self.test_plc.apiserver.AddSlice
Attribute
(self.test_plc.auth_root(), slice_name,'initscript',isname)
+ self.test_plc.apiserver.AddSlice
Tag
(self.test_plc.auth_root(), slice_name,'initscript',isname)
if self.slice_spec.has_key ('vref'):
vref_value=self.slice_spec['vref']
if self.slice_spec.has_key ('vref'):
vref_value=self.slice_spec['vref']
- self.test_plc.apiserver.AddSlice
Attribute
(self.test_plc.auth_root(), slice_name,'vref',vref_value)
+ self.test_plc.apiserver.AddSlice
Tag
(self.test_plc.auth_root(), slice_name,'vref',vref_value)
def locate_key(self):
# locate the first avail. key
def locate_key(self):
# locate the first avail. key
@@
-75,7
+79,7
@@
class TestSlice:
found=True
return (found,privatekey)
found=True
return (found,privatekey)
- def check_slice(self,options,timeout_minutes=20,silent_minutes=
4
,period=15):
+ def check_slice(self,options,timeout_minutes=20,silent_minutes=
10
,period=15):
timeout = datetime.datetime.now()+datetime.timedelta(minutes=timeout_minutes)
graceout = datetime.datetime.now()+datetime.timedelta(minutes=silent_minutes)
# locate a key
timeout = datetime.datetime.now()+datetime.timedelta(minutes=timeout_minutes)
graceout = datetime.datetime.now()+datetime.timedelta(minutes=silent_minutes)
# locate a key
@@
-92,15
+96,16
@@
class TestSlice:
(site_spec,node_spec) = self.test_plc.locate_node(nodename)
tocheck.append(node_spec['node_fields']['hostname'])
(site_spec,node_spec) = self.test_plc.locate_node(nodename)
tocheck.append(node_spec['node_fields']['hostname'])
+ utils.header("checking ssh access into slice %s on nodes %r"%(self.name(),tocheck))
+ utils.header("max timeout is %d minutes, silent for %d minutes (period is %s)"%\
+ (timeout_minutes,silent_minutes,period))
while tocheck:
for hostname in tocheck:
(site_spec,node_spec) = self.test_plc.locate_hostname(hostname)
date_test_ssh = TestSsh (hostname,key=remote_privatekey,username=self.name())
while tocheck:
for hostname in tocheck:
(site_spec,node_spec) = self.test_plc.locate_hostname(hostname)
date_test_ssh = TestSsh (hostname,key=remote_privatekey,username=self.name())
- if datetime.datetime.now() >= graceout:
- utils.header('Trying to enter into slice %s@%s'%(self.name(),hostname))
- # this can be ran locally as we have the key
- date = date_test_ssh.run("id;hostname")==0
- if date:
+ command = date_test_ssh.actual_command("echo hostname ; hostname; echo id; id; echo uname -a ; uname -a")
+ date = utils.system (command, silent=datetime.datetime.now() < graceout)
+ if date==0:
utils.header("Successfuly entered slice %s on %s"%(self.name(),hostname))
tocheck.remove(hostname)
else:
utils.header("Successfuly entered slice %s on %s"%(self.name(),hostname))
tocheck.remove(hostname)
else:
@@
-111,8
+116,8
@@
class TestSlice:
# nm restart after first failure, if requested
if options.forcenm and hostname not in restarted:
utils.header ("forcenm option : restarting nm on %s"%hostname)
# 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="
/etc/planetlab/root_ssh_key
.rsa")
- access=
self.test_plc.run_in_guest(restart_test_ssh.actual_command('service nm restart')
)
+ restart_test_ssh=TestSsh(hostname,key="
keys/key1
.rsa")
+ access=
restart_test_ssh.actual_command('service nm restart'
)
if (access==0):
utils.header('nm restarted on %s'%hostname)
else:
if (access==0):
utils.header('nm restarted on %s'%hostname)
else: