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
load_from_string() now uses RecordSpec class instead of xmlrpclib ot load xml
[sfa.git]
/
geni
/
gimport.py
diff --git
a/geni/gimport.py
b/geni/gimport.py
index
d9c871b
..
5c8f756
100755
(executable)
--- a/
geni/gimport.py
+++ b/
geni/gimport.py
@@
-38,12
+38,17
@@
else:
##
# Two authorities are specified: the root authority and the level1 authority.
##
# Two authorities are specified: the root authority and the level1 authority.
-root_auth = "plc"
-level1_auth = None
+
#
root_auth = "plc"
+
#
level1_auth = None
#root_auth = "planetlab"
#level1_auth = "planetlab.us"
config = Config()
#root_auth = "planetlab"
#level1_auth = "planetlab.us"
config = Config()
+
+root_auth = config.GENI_REGISTRY_ROOT_AUTH
+level1_auth = config.GENI_REGISTRY_LEVEL1_AUTH
+if not level1_auth or level1_auth in ['']:
+ level1_auth = None
keyconvert_fn = config.GENI_BASE_DIR + os.sep + "keyconvert/keyconvert"
keyconvert_fn = config.GENI_BASE_DIR + os.sep + "keyconvert/keyconvert"
@@
-314,7
+319,9
@@
def import_site(parent_hrn, site):
def create_top_level_auth_records(hrn):
parent_hrn = get_authority(hrn)
def create_top_level_auth_records(hrn):
parent_hrn = get_authority(hrn)
- print hrn, ":", parent_hrn
+ print hrn, ":", parent_hrn
+ if not parent_hrn:
+ parent_hrn = hrn
auth_info = AuthHierarchy.get_auth_info(parent_hrn)
table = get_auth_table(parent_hrn)
auth_info = AuthHierarchy.get_auth_info(parent_hrn)
table = get_auth_table(parent_hrn)
@@
-346,8
+353,7
@@
def main():
if not AuthHierarchy.auth_exists(root_auth):
AuthHierarchy.create_auth(root_auth)
if not AuthHierarchy.auth_exists(root_auth):
AuthHierarchy.create_auth(root_auth)
- #create_top_level_auth_records(root_auth)
-
+ create_top_level_auth_records(root_auth)
if level1_auth:
if not AuthHierarchy.auth_exists(level1_auth):
AuthHierarchy.create_auth(level1_auth)
if level1_auth:
if not AuthHierarchy.auth_exists(level1_auth):
AuthHierarchy.create_auth(level1_auth)