many improvements.

[monitor.git] / grouprins.py

diff --git a/grouprins.py b/grouprins.py
index 1eeb092..ba3ba88 100755 (executable)
--- a/grouprins.py
+++ b/grouprins.py
@@ -17,7 +17,7 @@ from monitor import util
 from monitor import const
 from monitor import database
 from monitor import parser as parsermodule
 from monitor import const
 from monitor import database
 from monitor import parser as parsermodule

-from monitor.pcu import reboot
+from pcucontrol  import reboot

 from monitor.wrapper import plc
 api = plc.getAuthAPI()
 
 from monitor.wrapper import plc
 api = plc.getAuthAPI()
 


@@ -26,11 +26,10 @@ from optparse import OptionParser
 
 from nodecommon import *
 from nodequery import verify,query_to_dict,node_select
 
 from nodecommon import *
 from nodequery import verify,query_to_dict,node_select

-from unified_model import *
+from monitor.model import *

 import os
 
 import time
 import os
 
 import time

-from model import *

 
 import bootman                 # debug nodes
 import mailmonitor     # down nodes without pcu
 
 import bootman                 # debug nodes
 import mailmonitor     # down nodes without pcu