return ".".join(parts[:-1])
def hrn_to_pl_slicename(hrn):
+ # remove any escaped no alpah numeric characters
+ #hrn = re.sub('\\\[^a-zA-Z0-9]', '', hrn)
+ # remove any escaped '.' (i.e. '\.')
+ hrn.replace('\\.', '')
parts = hrn.split(".")
return parts[-2] + "_" + parts[-1]
# assuming hrn is the hrn of an authority, return the plc authority name
def hrn_to_pl_authname(hrn):
+ # remove any escaped '.' (i.e. '\.')
+ hrn.replace('\\.', '')
parts = hrn.split(".")
return parts[-1]
# assuming hrn is the hrn of an authority, return the plc login_base
def hrn_to_pl_login_base(hrn):
+ # remove any escaped '.' (i.e. '\.')
+ hrn.replace('\\.', '')
return hrn_to_pl_authname(hrn)
def hostname_to_hrn(auth_hrn, login_base, hostname):
"""
convert a urn to hrn
return a tuple (hrn, type)
- Warning: urn_to_hrn() replces some special characters that
- are not replaced in hrn_to_urn(). Due to this,
- urn_to_hrn() -> hrn_to_urn() may not return the original urn
"""
# if this is already a hrn dont do anything
if type == 'authority':
hrn_parts = hrn_parts[:-1]
- # convert hrn_parts (list) into hrn (str) by doing the following
- # dont allow special characters (except ':') in the site login base
- # remove blank elements
- # replace ':' with '.'
- # join list elements using '.'
- only_alphanum = re.compile('[^a-zA-Z0-9:]+')
- valid_chars = lambda x: only_alphanum.sub('', x).replace(':', '.')
- hrn = '.'.join([valid_chars(part) for part in hrn_parts if part])
+ # convert hrn_parts (list) into hrn (str) by doing the following
+ # 1. remove blank elements
+ # 2. escape '.' # '.' exists in protogeni object names and are not delimiters
+ # 3. replace ':' with '.' # ':' is the urn hierarchy delimiter
+ # 4. join list elements using '.'
+ hrn = '.'.join([part.replace('.', '\.').replace(':', '.') for part in hrn_parts if part])
return str(hrn), str(type)
if not hrn or hrn.startswith(URN_PREFIX):
return hrn
- authority = get_authority(hrn)
- name = get_leaf(hrn)
-
if type == 'authority':
authority = hrn
name = 'sa'
+ else:
+ authority = get_authority(hrn)
+ name = get_leaf(hrn)
+
+ # We have to do the following conversion
+ # '\\.' -> '.' # where '.' belongs in the urn name
+ # '.' -> ':" # where ':' is the urn hierarchy delimiter
+ # by doing the following
+ # 1. split authority around '\\.'
+ # 2. replace '.' with ':' in all parts
+ # 3. join parts around '.'
+ parts = authority.split('\\.')
+ authority = '.'.join([part.replace('.', ':') for part in parts])
- if authority.startswith("plc"):
- if type == None:
- urn = "+".join(['',authority.replace('.',':'),name])
- else:
- urn = "+".join(['',authority.replace('.',':'),type,name])
-
+ if type == None:
+ urn = "+".join(['',authority,name])
else:
urn = "+".join(['',authority,type,name])
+
return URN_PREFIX + urn