X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=bootman.py;h=5e8b908359f025fe9f0cb1bd4e1fbbee5df5b365;hb=refs%2Fheads%2F1.0;hp=f8f6d48ebf2c1b24ca40f356a16959222499192d;hpb=a048ec7065ad812c5dfbe23efa8a4d67b04724af;p=monitor.git

diff --git a/bootman.py b/bootman.py
index f8f6d48..5e8b908 100755
--- a/bootman.py
+++ b/bootman.py
@@ -60,15 +60,18 @@ class NodeConnection:
 			return "unknown"
 
 	def get_dmesg(self):
+		t_stamp = time.strftime("%Y-%m-%d-%H:%M")
 		self.c.modules.os.system("dmesg > /var/log/dmesg.bm.log")
-		download(self.c, "/var/log/dmesg.bm.log", "log/dmesg.%s.log" % self.node)
+		download(self.c, "/var/log/dmesg.bm.log", "log/history/%s-dmesg.%s.log" % (t_stamp, self.node))
+		os.system("cp log/history/%s-dmesg.%s.log log/dmesg.%s.log" % (t_stamp, self.node, self.node))
 		log = open("log/dmesg.%s.log" % self.node, 'r')
 		return log
 
 	def get_bootmanager_log(self):
-		download(self.c, "/tmp/bm.log", "log/bm.%s.log.gz" % self.node)
+		t_stamp = time.strftime("%Y-%m-%d-%H:%M")
+		download(self.c, "/tmp/bm.log", "log/history/%s-bm.%s.log" % (t_stamp, self.node))
 		#os.system("zcat log/bm.%s.log.gz > log/bm.%s.log" % (self.node, self.node))
-		os.system("cp log/bm.%s.log.gz log/bm.%s.log" % (self.node, self.node))
+		os.system("cp log/history/%s-bm.%s.log log/bm.%s.log" % (t_stamp, self.node, self.node))
 		log = open("log/bm.%s.log" % self.node, 'r')
 		return log
 
@@ -383,7 +386,7 @@ def reboot(hostname, config=None, forced_action=None):
 			return False
 
 	if forced_action == "reboot":
-		conn.restart_node('rins')
+		conn.restart_node('reinstall')
 		return True
 
 	boot_state = conn.get_boot_state()
@@ -590,7 +593,7 @@ def reboot(hostname, config=None, forced_action=None):
 			]:
 		sequences.update({n : "restart_bootmanager_boot"})
 
-	#	conn.restart_bootmanager('rins')
+	#	conn.restart_bootmanager('reinstall')
 	for n in [ "bminit-cfg-auth-getplc-installinit-validate-exception-modulefail-update-debug-done",
 			"bminit-cfg-auth-getplc-update-installinit-validate-exception-modulefail-update-debug-done",
 			"bminit-cfg-auth-getplc-installinit-validate-bmexceptmount-exception-noinstall-update-debug-done",
@@ -612,13 +615,15 @@ def reboot(hostname, config=None, forced_action=None):
 			"bminit-cfg-auth-getplc-update-installinit-validate-rebuildinitrd-netcfg-disk-update4-update3-update3-implementerror-update-debug-done",
 			"bminit-cfg-auth-getplc-installinit-validate-exception-bmexceptmount-exception-noinstall-update-debug-done",
 			"bminit-cfg-auth-getplc-update-installinit-validate-exception-bmexceptmount-exception-noinstall-update-debug-done",
+			"bminit-cfg-auth-getplc-update-installinit-validate-bmexceptvgscan-exception-noinstall-update-debug-validate-bmexceptvgscan-done",
+			"bminit-cfg-auth-getplc-update-installinit-validate-exception-noinstall-update-debug-validate-done",
 			]:
 		sequences.update({n : "restart_bootmanager_rins"})
 
 	# repair_node_keys
 	sequences.update({"bminit-cfg-auth-bootcheckfail-authfail-exception-update-bootupdatefail-authfail-debug-done": "repair_node_keys"})
 
-	#   conn.restart_node('rins')
+	#   conn.restart_node('reinstall')
 	for n in ["bminit-cfg-auth-getplc-update-installinit-validate-rebuildinitrd-exception-chrootfail-update-debug-done",
 			"bminit-cfg-auth-getplc-update-installinit-validate-rebuildinitrd-netcfg-update3-disk-update4-exception-chrootfail-update-debug-done",
 			"bminit-cfg-auth-getplc-hardware-installinit-installdisk-installbootfs-installcfg-exception-chrootfail-update-debug-done",
@@ -712,16 +717,16 @@ def reboot(hostname, config=None, forced_action=None):
 			conn.restart_bootmanager('boot')
 		elif sequences[s] == "restart_bootmanager_rins":
 			if config and not config.quiet: print "...Restarting BootManager.py on %s "% node
-			conn.restart_bootmanager('rins')
+			conn.restart_bootmanager('reinstall')
 		elif sequences[s] == "restart_node_rins":
-			conn.restart_node('rins')
+			conn.restart_node('reinstall')
 		elif sequences[s] == "restart_node_boot":
 			conn.restart_node('boot')
 		elif sequences[s] == "repair_node_keys":
 			if conn.compare_and_repair_nodekeys():
 				# the keys either are in sync or were forced in sync.
 				# so try to reboot the node again.
-				conn.restart_bootmanager('rins')
+				conn.restart_bootmanager('reinstall')
 				pass
 			else:
 				# there was some failure to synchronize the keys.
@@ -816,7 +821,7 @@ def reboot(hostname, config=None, forced_action=None):
 			args = {}
 			try:
 				node = api.GetNodes(hostname)[0]
-				net = api.GetNodeNetworks(node['nodenetwork_ids'])[0]
+				net = api.GetInterfaces(node['interface_ids'])[0]
 			except:
 				from nodecommon import email_exception
 				email_exception()
@@ -828,7 +833,7 @@ def reboot(hostname, config=None, forced_action=None):
 
 			args['hostname'] = hostname
 			args['network_config'] = nodenet_str
-			args['nodenetwork_id'] = net['nodenetwork_id']
+			args['interface_id'] = net['interface_id']
 			m = PersistMessage(hostname, mailtxt.baddns[0] % args,
 										 mailtxt.baddns[1] % args, True, db='baddns_persistmessages')