X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=bin%2Fcheck-hrns.py;h=120eaac52fceb7397ccfde717d7b75806a32f20e;hb=b175e732f17b909fdcffa4869ceee48dbbc860dc;hp=777d2587f01dacbb2aaefce5256076a412b06517;hpb=02d3482536dbd282f3eb7acc6920c8f320c63859;p=myplc.git

diff --git a/bin/check-hrns.py b/bin/check-hrns.py
index 777d258..120eaac 100755
--- a/bin/check-hrns.py
+++ b/bin/check-hrns.py
@@ -2,7 +2,7 @@
 import sys
 from optparse import OptionParser
 
-from PLC.Namespace import hostname_to_hrn, email_to_hrn
+from PLC.Namespace import hostname_to_hrn, email_to_hrn, slicename_to_hrn
 # (auth_hrn, email):
 
 toplevel=api.config.PLC_HRN_ROOT
@@ -21,14 +21,14 @@ def handle_nodes (sites,sites_by_id, dry_run, verbose):
                 if dry_run: continue
                 SetNodeHrn (node['node_id'],hrn)
             else:
-                if verbose: print "host %s OK"%node['hostname']
+                if verbose: print "Node %s OK"%node['hostname']
 
 def handle_persons (sites,sites_by_id, dry_run,verbose): 
     persons=GetPersons ({'peer_id':None},['person_id','email','hrn','site_ids'])
     for person in persons:
         how_many=len(person['site_ids'])
         if how_many !=1:
-            if verbose: print "person %s not in 1 site (%s instead) -- ignored"%(person['email'],how_many)
+            if verbose: print "Checking persons in exactly one site -- person %s in %s site(s) -- ignored"%(person['email'],how_many)
             continue
         try:    login_base=sites_by_id[person['site_ids'][0]]['login_base']
         except: print "Cannot handle person %s - site not found"%person['email']; continue
@@ -38,7 +38,22 @@ def handle_persons (sites,sites_by_id, dry_run,verbose):
             if dry_run: continue
             SetPersonHrn (person['person_id'],hrn)
         else:
-            if verbose: print "host %s OK"%person['email']
+            if verbose: print "Person %s OK"%person['email']
+
+
+def handle_slices (sites,sites_by_id, dry_run,verbose):
+    slices=GetSlices ({'peer_id':None},['slice_id','name','hrn','site_id'])
+    for slice in slices:
+        try:    login_base=sites_by_id[slice['site_id']]['login_base']
+        except: print "Cannot handle slice %s - site not found"%slice['name']; continue
+        hrn=slicename_to_hrn (toplevel, slice['name'])
+        if slice['hrn'] != hrn:
+            print "Slice %s - current hrn %s, should be %s"%(slice['name'], slice['hrn'], hrn)
+            if dry_run: continue
+            SetSliceHrn (slice['slice_id'],hrn)
+        else:
+            if verbose: print "Slice %s OK"%slice['name']
+
         
             
 def main():
@@ -52,6 +67,8 @@ Example:
                       dest='persons',help="run on persons")
     parser.add_option("-n", "--node", action = "store_true", default = False, 
                       dest='nodes',help="run on nodes")
+    parser.add_option("-S", "--slice", action = "store_true", default = False,
+                      dest='slices',help="run on slices")
     parser.add_option("-s", "--show", action = "store_true", default = False, 
                       dest='show', help="dry run, only show discrepencies")
     parser.add_option("-v", "--verbose", action = "store_true", default = False, 
@@ -62,17 +79,22 @@ Example:
         parser.print_help()
         sys.exit(1)
     # if neither -p nor -n, run both
-    if not options.nodes and not options.persons:
+    if not options.nodes and not options.persons and not options.slices:
         options.nodes=True
         options.persons=True
-    
+        options.slices=True        
+
     dry_run=options.show
     verbose=options.verbose
     # optimizing : we compute the set of sites only once
-    sites = GetSites({'peer_id':None},['site_id','login_base','node_ids','person_ids'])
+    sites = GetSites({'peer_id':None},['site_id','login_base','node_ids','person_ids','name'])
+    # remove external sites created through SFA
+    sites = [site for site in sites if not site['name'].startswith('sfa.')]
+
     sites_by_id = dict ( [ (site['site_id'], site) for site in sites ] )
     if options.nodes: handle_nodes(sites,sites_by_id,dry_run,verbose)
     if options.persons: handle_persons(sites,sites_by_id,dry_run,verbose)
+    if options.slices: handle_slices(sites,sites_by_id,dry_run,verbose)
 
 if __name__ == "__main__":
     main()