From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Mon, 5 Nov 2007 22:29:50 +0000 (+0000)
Subject: removes function definitions consolidated in reboot.py
X-Git-Tag: Monitor-1.0-0~42
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=05eceee03b5070737640db94ad30efbfdccc597f;p=monitor.git

removes function definitions consolidated in reboot.py
---

diff --git a/findbadpcu.py b/findbadpcu.py
index 365c281..c7dc9d4 100755
--- a/findbadpcu.py
+++ b/findbadpcu.py
@@ -61,6 +61,7 @@ externalState = {'round': round, 'nodes': {'a': None}}
 count = 0
 
 import reboot
+from reboot import pcu_name
 
 import soltesz
 import plc
@@ -68,14 +69,6 @@ import comon
 import threadpool
 import syncplcdb
 
-def pcu_name(pcu):
-	if pcu['hostname'] is not None and pcu['hostname'] is not "":
-		return pcu['hostname']
-	elif pcu['ip'] is not None and pcu['ip'] is not "":
-		return pcu['ip']
-	else:
-		return None
-
 def nmap_portstatus(status):
 	ps = {}
 	l_nmap = status.split()