quick logging tmp dir change

[sfa.git] / sfa / util / namespace.py

diff --git a/sfa/util/namespace.py b/sfa/util/namespace.py
index 86af66f..45ce06a 100644 (file)
--- a/sfa/util/namespace.py
+++ b/sfa/util/namespace.py
@@ -1,5 +1,5 @@
-### $Id: namespace.py 15020 2009-09-14 23:11:37Z tmack $
-### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/util/namespace.py $
+### $Id$
+### $URL$
 
 from sfa.util.faults import *
 
@@ -9,7 +9,11 @@ def get_leaf(hrn):
     parts = hrn.split(".")
     return ".".join(parts[-1:])
 
-def get_authority(hrn):
+def get_authority(xrn):
+    hrn, type = urn_to_hrn(xrn)
+    if type and type == 'authority':
+        return hrn
+    
     parts = hrn.split(".")
     return ".".join(parts[:-1])
 
@@ -30,8 +34,8 @@ def hostname_to_hrn(auth_hrn, login_base, hostname):
     """
     Convert hrn to plantelab name.
     """
-    genihostname = ".".join([auth_hrn, login_base, hostname.split(".")[0]])
-    return genihostname
+    sfa_hostname = ".".join([auth_hrn, login_base, hostname.split(".")[0]])
+    return sfa_hostname
 
 def slicename_to_hrn(auth_hrn, slicename):
     """
@@ -45,7 +49,7 @@ def slicename_to_hrn(auth_hrn, slicename):
 def email_to_hrn(auth_hrn, email):
     parts = email.split("@")
     username = parts[0]
-    username = username.replace(".", "_") 
+    username = username.replace(".", "_").replace("+", "_") 
     person_hrn = ".".join([auth_hrn, username])
     
     return person_hrn 
@@ -57,8 +61,9 @@ def urn_to_hrn(urn):
     """
 
     # if this is already a hrn dont do anything
-    if not urn.startswith(URN_PREFIX):
+    if not urn or not urn.startswith(URN_PREFIX):
         return urn, None
+
     name = urn[len(URN_PREFIX):]
     hrn_parts = name.split("+")
     
@@ -71,7 +76,7 @@ def urn_to_hrn(urn):
     # join list elements using '.'
     hrn = '.'.join([part.replace(':', '.') for part in hrn_parts if part]) 
    
-    return hrn, type 
+    return str(hrn), str(type) 
     
     
 def hrn_to_urn(hrn, type=None):
@@ -79,12 +84,19 @@ def hrn_to_urn(hrn, type=None):
     convert an hrn and type to a urn string
     """
     # if  this is already a urn dont do anything 
-    if hrn.startswith(URN_PREFIX):
+    if not hrn or hrn.startswith(URN_PREFIX):
         return hrn
 
     authority = get_authority(hrn)
     name = get_leaf(hrn)
-    urn = "+".join([unicode(part).replace('.', ':') \
-                    for part in ['',authority,type,name]])
-
+    
+    if authority.startswith("plc"):
+        if type == None:
+            urn = "+".join(['',authority.replace('.',':'),name])
+        else:
+            urn = "+".join(['',authority.replace('.',':'),type,name])
+
+    else:
+        urn = "+".join(['',authority,type,name])
+        
     return URN_PREFIX + urn