X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fscanapi.py;h=194ab400e49f3164fe94f26818dd6a279c32d863;hb=3c2648a922cb7c34352f0a35a9d4aafe442a77be;hp=3e95ef21be40975c90e3a59592243b372b37a508;hpb=d8c4f261680cbc9cb2708cf12d97202716120dc7;p=monitor.git

diff --git a/monitor/scanapi.py b/monitor/scanapi.py
index 3e95ef2..194ab40 100644
--- a/monitor/scanapi.py
+++ b/monitor/scanapi.py
@@ -20,9 +20,8 @@ from monitor.database.info.model import *
 from monitor.sources import comon
 from monitor.wrapper import plc, plccache
 
-from nodequery import verify,query_to_dict,node_select
 import traceback
-from nodecommon import nmap_port_status
+from monitor.common import nmap_port_status
 
 COMON_COTOPURL= "http://summer.cs.princeton.edu/status/tabulator.cgi?" + \
 			"table=table_nodeview&" + \
@@ -342,7 +341,7 @@ class ScanNodeInternal(ScanInterface):
 			values['plc_node_stats'] = d_node
 
 			##### NMAP  ###################
-			(n, v) = collectNMAP(nodename, None)
+			(n, v) = self.collectNMAP(nodename, None)
 			values.update(v)
 
 			### GET PLC PCU ######################
@@ -376,7 +375,6 @@ class ScanNodeInternal(ScanInterface):
 
 		return (nodename, values)
 
-
 def internalprobe(hostname):
 	fbsync = FindbadNodeRecordSync.findby_or_create(hostname="global", 
 													if_new_set={'round' : 1})