git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed persistentobjs into model
[sfa.git]
/
sfa
/
importer
/
sfa-import-plc.py
diff --git
a/sfa/importer/sfa-import-plc.py
b/sfa/importer/sfa-import-plc.py
index
e10e572
..
cba4323
100755
(executable)
--- a/
sfa/importer/sfa-import-plc.py
+++ b/
sfa/importer/sfa-import-plc.py
@@
-28,7
+28,7
@@
from sfa.trust.certificate import convert_public_key, Keypair
from sfa.plc.plshell import PlShell
from sfa.storage.alchemy import dbsession
from sfa.plc.plshell import PlShell
from sfa.storage.alchemy import dbsession
-from sfa.storage.
persistentobjs
import RegRecord, RegAuthority, RegUser, RegSlice, RegNode
+from sfa.storage.
model
import RegRecord, RegAuthority, RegUser, RegSlice, RegNode
from sfa.importer.sfaImport import sfaImport, _cleanup_string
from sfa.importer.sfaImport import sfaImport, _cleanup_string
@@
-66,28
+66,26
@@
def _get_site_hrn(interface_hrn, site):
hrn = ".".join([interface_hrn, "internet2", site['login_base']])
return hrn
hrn = ".".join([interface_hrn, "internet2", site['login_base']])
return hrn
-# maybe could use a call to
persistentobjs
.init_tables somewhere
+# maybe could use a call to
model
.init_tables somewhere
# however now import s expected to be done after service creation..
def main():
process_options()
config = Config()
# however now import s expected to be done after service creation..
def main():
process_options()
config = Config()
+ sfaImporter = sfaImport()
+ logger=sfaImporter.logger
+ logger.setLevelFromOptVerbose(config.SFA_API_LOGLEVEL)
if not config.SFA_REGISTRY_ENABLED:
sys.exit(0)
root_auth = config.SFA_REGISTRY_ROOT_AUTH
interface_hrn = config.SFA_INTERFACE_HRN
if not config.SFA_REGISTRY_ENABLED:
sys.exit(0)
root_auth = config.SFA_REGISTRY_ROOT_AUTH
interface_hrn = config.SFA_INTERFACE_HRN
- keys_filename = config.config_path + os.sep + 'person_keys.py'
- sfaImporter = sfaImport()
- sfaImporter.create_top_level_records()
- logger=sfaImporter.logger
- logger.setLevelFromOptVerbose(config.SFA_API_LOGLEVEL)
shell = PlShell (config)
shell = PlShell (config)
+ sfaImporter.create_top_level_records()
# create dict of all existing sfa records
existing_records = {}
existing_hrns = []
key_ids = []
# create dict of all existing sfa records
existing_records = {}
existing_hrns = []
key_ids = []
- person_keys = {}
for record in dbsession.query(RegRecord):
existing_records[ (record.hrn, record.type,) ] = record
existing_hrns.append(record.hrn)
for record in dbsession.query(RegRecord):
existing_records[ (record.hrn, record.type,) ] = record
existing_hrns.append(record.hrn)
@@
-113,7
+111,9
@@
def main():
keys_dict[key['key_id']] = key['key']
# create a dict of person keys keyed on key_id
keys_dict[key['key_id']] = key['key']
# create a dict of person keys keyed on key_id
+ keys_filename = config.config_path + os.sep + 'person_keys.py'
old_person_keys = load_keys(keys_filename)
old_person_keys = load_keys(keys_filename)
+ person_keys = {}
for person in persons:
pubkeys = []
for key_id in person['key_ids']:
for person in persons:
pubkeys = []
for key_id in person['key_ids']: