unify the model by which probes are made to collect information about nodes or

[monitor.git] / monitor / wrapper / plccache.py

diff --git a/monitor/wrapper/plccache.py b/monitor/wrapper/plccache.py
index 978e6bb..96b5646 100755 (executable)
--- a/monitor/wrapper/plccache.py
+++ b/monitor/wrapper/plccache.py
@@ -14,7 +14,8 @@ def dsites_from_lsites(l_sites):
                        id2lb[site['site_id']] = site['login_base']
                else:
                        #print "Two sites have the same login_base value %s!" % site['login_base']
-                       sys.exit(1)
+                       #sys.exit(1)
+                       continue
        return (d_sites, id2lb)
 
 def dsn_from_dsln(d_sites, id2lb, l_nodes):
@@ -74,6 +75,7 @@ l_nodenetworks = None
 plcdb_hn2lb = None
 plcdb_lb2hn = None
 plcdb_netid2ip = None
+plcdb_id2lb = None
 
 def init():
        global l_sites
@@ -83,11 +85,12 @@ def init():
        global plcdb_hn2lb
        global plcdb_lb2hn
        global plcdb_netid2ip
+       global plcdb_id2lb
 
        api = plc.getCachedAuthAPI()
        l_sites = api.GetSites({'peer_id':None}, 
                                                        ['login_base', 'site_id', 'abbreviated_name', 'latitude', 
-                                                       'longitude', 'max_slices', 'slice_ids', 'node_ids' ])
+                                                       'longitude', 'max_slices', 'slice_ids', 'node_ids', 'enabled' ])
        l_nodes = api.GetNodes({'peer_id':None}, 
                                                        ['hostname', 'node_id', 'ports', 'site_id', 'version', 'last_updated', 
                                                         'date_created', 'last_contact', 'pcu_ids', 'nodenetwork_ids'])
@@ -101,6 +104,7 @@ def init():
        plcdb_hn2lb = hn2lb
        plcdb_lb2hn = lb2hn
        plcdb_netid2ip = netid2ip
+       plcdb_id2lb = id2lb
        
        return l_nodes
 
@@ -111,6 +115,7 @@ def create_plcdb():
        l_sites = plc.getSites({'peer_id':None}, ['login_base', 'site_id', 'abbreviated_name', 'latitude', 'longitude', 
                                                                                          'max_slices', 'slice_ids', 'node_ids' ])
        if len(l_sites) == 0:
+               print "no sites! exiting..."
                sys.exit(1)
        (d_sites,id2lb) = dsites_from_lsites(l_sites)