X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplc%2Fsfa-import-plc.py;h=352486cb58285fa981197e4d59c3dbec89939020;hb=f7d7cee729d9b3be3457d25151fc88b134a27bd3;hp=18727c6a094cc71c712bc11cc01f2d23314eb718;hpb=eababa96fb603cdd552bc03091813544b099befd;p=sfa.git

diff --git a/sfa/plc/sfa-import-plc.py b/sfa/plc/sfa-import-plc.py
index 18727c6a..352486cb 100755
--- a/sfa/plc/sfa-import-plc.py
+++ b/sfa/plc/sfa-import-plc.py
@@ -17,18 +17,19 @@
 import getopt
 import sys
 import tempfile
-import logging
 
 from sfa.util.record import *
 from sfa.util.table import SfaTable
-from sfa.util.namespace import *
+from sfa.util.xrn import get_leaf, get_authority
+from sfa.util.plxrn import hostname_to_hrn, slicename_to_hrn, email_to_hrn, hrn_to_pl_slicename
 from sfa.util.config import Config
 from sfa.trust.certificate import convert_public_key, Keypair
-from sfa.trust.trustedroot import *
+from sfa.trust.trustedroots import *
 from sfa.trust.hierarchy import *
+from sfa.util.xrn import Xrn
 from sfa.plc.api import *
 from sfa.trust.gid import create_uuid
-from sfa.plc.sfaImport import sfaImport
+from sfa.plc.sfaImport import sfaImport, _cleanup_string
 
 def process_options():
 
@@ -54,6 +55,16 @@ def save_keys(filename, keys):
     f.write("keys = %s" % str(keys))
     f.close()
 
+def _get_site_hrn(interface_hrn, site):
+    # Hardcode 'internet2' into the hrn for sites hosting
+    # internet2 nodes. This is a special operation for some vini
+    # sites only
+    hrn = ".".join([interface_hrn, site['login_base']]) 
+    if ".vini" in interface_hrn and interface_hrn.endswith('vini'):
+        if site['login_base'].startswith("i2") or site['login_base'].startswith("nlr"):
+            hrn = ".".join([interface_hrn, "internet2", site['login_base']])
+    return hrn
+
 def main():
 
     process_options()
@@ -64,11 +75,12 @@ def main():
     interface_hrn = config.SFA_INTERFACE_HRN
     keys_filename = config.config_path + os.sep + 'person_keys.py' 
     sfaImporter = sfaImport()
-    if config.SFA_API_DEBUG: sfaImporter.logger.setLevel(logging.DEBUG)
+    if config.SFA_API_DEBUG: sfaImporter.logger.setLevelDebug()
     shell = sfaImporter.shell
     plc_auth = sfaImporter.plc_auth 
+    
+    # initialize registry db table
     table = SfaTable()
-
     if not table.exists():
        table.create()
 
@@ -77,10 +89,16 @@ def main():
     if not root_auth == interface_hrn:
         sfaImporter.create_top_level_auth_records(interface_hrn)
 
+    # create interface records
+    sfaImporter.logger.info("Import: creating interface records")
+    sfaImporter.create_interface_records()
+
+    # add local root authority's cert  to trusted list
     sfaImporter.logger.info("Import: adding " + interface_hrn + " to trusted list")
     authority = sfaImporter.AuthHierarchy.get_auth_info(interface_hrn)
     sfaImporter.TrustedRoots.add_gid(authority.get_gid_object())
 
+    # special case for vini
     if ".vini" in interface_hrn and interface_hrn.endswith('vini'):
         # create a fake internet2 site first
         i2site = {'name': 'Internet2', 'abbreviated_name': 'I2',
@@ -137,24 +155,26 @@ def main():
         slices_dict[slice['slice_id']] = slice
     # start importing 
     for site in sites:
-        site_hrn = interface_hrn + "." + site['login_base']
-        print "Importing site: %s" % site_hrn
+        site_hrn = _get_site_hrn(interface_hrn, site)
+        sfaImporter.logger.info("Importing site: %s" % site_hrn)
 
         # import if hrn is not in list of existing hrns or if the hrn exists
         # but its not a site record
         if site_hrn not in existing_hrns or \
            (site_hrn, 'authority') not in existing_records:
-            site_hrn = sfaImporter.import_site(interface_hrn, site)
+            sfaImporter.import_site(site_hrn, site)
              
         # import node records
         for node_id in site['node_ids']:
             if node_id not in nodes_dict:
                 continue 
             node = nodes_dict[node_id]
-            hrn =  hostname_to_hrn(interface_hrn, site['login_base'], node['hostname'])
+            root_auth = get_authority(site_hrn)
+            site_name = get_leaf(site_hrn)
+            hrn =  hostname_to_hrn(root_auth, site_name, node['hostname'])
             if hrn not in existing_hrns or \
                (hrn, 'node') not in existing_records:
-                sfaImporter.import_node(site_hrn, node)
+                sfaImporter.import_node(hrn, node)
 
         # import slices
         for slice_id in site['slice_ids']:
@@ -217,7 +237,7 @@ def main():
                 site = sites_dict[login_base]
                 for person in persons:
                     tmp_username = person['email'].split("@")[0]
-                    alt_username = person['email'].split("@")[0].replace(".", "_")
+                    alt_username = person['email'].split("@")[0].replace(".", "_").replace("+", "_")
                     if username in [tmp_username, alt_username] and \
                        site['site_id'] in person['site_ids'] and \
                        person['person_id'] == record['pointer']:
@@ -234,11 +254,11 @@ def main():
  
         elif type == 'node':
             login_base = get_leaf(get_authority(record_hrn))
-            nodename = get_leaf(record_hrn)
+            nodename = Xrn.unescape(get_leaf(record_hrn))
             if login_base in sites_dict:
                 site = sites_dict[login_base]
                 for node in nodes:
-                    tmp_nodename = node['hostname'].split(".")[0]
+                    tmp_nodename = node['hostname']
                     if tmp_nodename == nodename and \
                        node['site_id'] == site['site_id'] and \
                        node['node_id'] == record['pointer']: