From: Tony Mack <tmack@cs.princeton.edu>
Date: Wed, 20 May 2009 19:30:17 +0000 (+0000)
Subject: fix how GENI_INTERFACE_HRN is generated
X-Git-Tag: sfa-0.9-0@14641~375
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1e8c940dfb79fc23d5a3a305a3298c18305394c9;p=sfa.git

fix how GENI_INTERFACE_HRN is generated
---

diff --git a/geni-config-tty b/geni-config-tty
index f9b6d375..e99a6c09 100755
--- a/geni-config-tty
+++ b/geni-config-tty
@@ -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