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
8a9e13d
..
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,7
+66,7
@@
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():
# however now import s expected to be done after service creation..
def main():