##
# 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 = 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"
def import_node(parent_hrn, node):
AuthHierarchy = Hierarchy()
- nodename = node['hostname']
+ nodename = node['hostname'].split(".")[0]
nodename = cleanup_string(nodename)
if not nodename:
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)
process_options()
+ print "Base Directory: ", config.GENI_BASE_DIR
+
AuthHierarchy = Hierarchy()
TrustedRoots = TrustedRootList()
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)