-### $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 *
"""
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):
"""
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
"""
# 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("+")
# 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):
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)