fixes for pcucontrol and DRAC control.

[monitor.git] / monitor / scanapi.py

diff --git a/monitor/scanapi.py b/monitor/scanapi.py
index 3e95ef2..d9e17b5 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})
@@ -496,7 +494,7 @@ class ScanPCU(ScanInterface):
 
 
                        ######  DRY RUN  ############################
-                       if 'node_ids' in values['plc_pcu_stats'] and \
+                       if continue_probe and 'node_ids' in values['plc_pcu_stats'] and \
                                len(values['plc_pcu_stats']['node_ids']) > 0:
                                rb_ret = reboot.reboot_test_new(values['plc_pcu_stats']['nodenames'][0], 
                                                                                                values, 1, True)
@@ -512,7 +510,8 @@ class ScanPCU(ScanInterface):
                        print "____________________________________"
                        errors['traceback'] = traceback.format_exc()
                        print errors['traceback']
-                       values['reboot_trial_status'] = errors['traceback']
+                       values['reboot_trial_status'] = str(errors['traceback'])
+                       print values
 
                values['entry_complete']=" ".join(values['entry_complete'])