fix how GENI_INTERFACE_HRN is generated
authorTony Mack <tmack@cs.princeton.edu>
Wed, 20 May 2009 19:30:17 +0000 (19:30 +0000)
committerTony Mack <tmack@cs.princeton.edu>
Wed, 20 May 2009 19:30:17 +0000 (19:30 +0000)
geni-config-tty

index f9b6d37..e99a6c0 100755 (executable)
@@ -97,7 +97,8 @@ def validate(changes):
     if not changes:
         return
 
-    # GENI_INTERFACE_HRN is generated by combining GENI_REGISTRY_ROOT_AUTH and 
+    # GENI_INTERFACE_HRN is GENI_REGISTRY_LEVEL1_AUTH, if thats blank it
+    # then defaults to GENI_REGISTRY_ROOT_AUTH 
     # GENI_REGISTRY_LEVEL1_AUTH, so if either of these are present we must 
     # update GENI_INTERFACE_HRN
     if 'GENI_REGISTRY_ROOT_AUTH' in changes:
@@ -110,7 +111,10 @@ def validate(changes):
     else:
         level1_auth = default['GENI_REGISTRY_LEVEL1_AUTH']
                 
-    interface_hrn = ".".join([root_auth, level1_auth])
+    if level1_auth:
+        interface_hrn = level1_auth
+    else:
+        interface_hrn = root_auth
     changes['GENI_INTERFACE_HRN'] = interface_hrn
     return changes