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
knows about the new plcapi interface about ipaddresses and routes
[tests.git]
/
system
/
Substrate.py
diff --git
a/system/Substrate.py
b/system/Substrate.py
index
c8301b8
..
4e67a85
100644
(file)
--- a/
system/Substrate.py
+++ b/
system/Substrate.py
@@
-503,7
+503,7
@@
class PlcVsBox (PlcBox):
return None
def soft_reboot (self, options):
return None
def soft_reboot (self, options):
- self.run_ssh(['service','util-vserver','stop'],"Stopping all running vservers
"
,
+ self.run_ssh(['service','util-vserver','stop'],"Stopping all running vservers
on %s"%(self.hostname,)
,
dry_run=options.dry_run)
def sense (self, options):
dry_run=options.dry_run)
def sense (self, options):
@@
-582,7
+582,7
@@
class PlcLxcBox (PlcBox):
def soft_reboot (self, options):
command="rsync lxc-driver.sh %s:/root"%self.hostname
commands.getstatusoutput(command)
def soft_reboot (self, options):
command="rsync lxc-driver.sh %s:/root"%self.hostname
commands.getstatusoutput(command)
- self.run_ssh(['/root/lxc-driver.sh','-c','stop_all'],"Stopping all running lxc containers
"
,
+ self.run_ssh(['/root/lxc-driver.sh','-c','stop_all'],"Stopping all running lxc containers
on %s"%(self.hostname,)
,
dry_run=options.dry_run)
dry_run=options.dry_run)
@@
-1174,6
+1174,7
@@
class Substrate:
nodemap={'host_box':qemu_boxname,
'node_fields:hostname':vnode_fqdn,
'interface_fields:ip':ip,
nodemap={'host_box':qemu_boxname,
'node_fields:hostname':vnode_fqdn,
'interface_fields:ip':ip,
+ 'ipaddress_fields:ip_addr':ip,
'interface_fields:mac':mac,
}
nodemap.update(self.network_settings())
'interface_fields:mac':mac,
}
nodemap.update(self.network_settings())