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.hierarchy import *
+from sfa.util.xrn import Xrn
from sfa.plc.api import *
+from sfa.util.sfalogging import logger
from sfa.trust.gid import create_uuid
from sfa.plc.sfaImport import sfaImport
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()
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',
# start importing
for site in sites:
site_hrn = interface_hrn + "." + site['login_base']
- print "Importing site: %s" % site_hrn
+ 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
hrn = hostname_to_hrn(interface_hrn, site['login_base'], 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']:
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']:
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']: