add getNodeAPI()

[monitor.git] / monitor / scanapi.py

diff --git a/monitor/scanapi.py b/monitor/scanapi.py
index 3e95ef2..194ab40 100644 (file)
--- 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})