git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
need to cast ids to string
[sfa.git]
/
sfa
/
util
/
xrn.py
diff --git
a/sfa/util/xrn.py
b/sfa/util/xrn.py
index
0d5e6bf
..
31f77f2
100644
(file)
--- a/
sfa/util/xrn.py
+++ b/
sfa/util/xrn.py
@@
-1,7
+1,6
@@
import re
from sfa.util.faults import *
import re
from sfa.util.faults import *
-from sfa.util.sfalogging import sfa_logger
# for convenience and smoother translation - we should get rid of these functions eventually
def get_leaf(hrn): return Xrn(hrn).get_leaf()
# for convenience and smoother translation - we should get rid of these functions eventually
def get_leaf(hrn): return Xrn(hrn).get_leaf()
@@
-9,6
+8,9
@@
def get_authority(hrn): return Xrn(hrn).get_authority_hrn()
def urn_to_hrn(urn): xrn=Xrn(urn); return (xrn.hrn, xrn.type)
def hrn_to_urn(hrn,type): return Xrn(hrn, type=type).urn
def urn_to_hrn(urn): xrn=Xrn(urn); return (xrn.hrn, xrn.type)
def hrn_to_urn(hrn,type): return Xrn(hrn, type=type).urn
+def urn_to_sliver_id(urn, slice_id, node_id, index=0):
+ return ":".join([urn, str(slice_id), str(node_id), str(index)])
+
class Xrn:
########## basic tools on HRNs
class Xrn:
########## basic tools on HRNs
@@
-74,7
+76,7
@@
class Xrn:
self.hrn_to_urn()
# happens all the time ..
# if not type:
self.hrn_to_urn()
# happens all the time ..
# if not type:
-#
sfa_logger()
.debug("type-less Xrn's are not safe")
+#
debug_logger
.debug("type-less Xrn's are not safe")
def get_urn(self): return self.urn
def get_hrn(self): return self.hrn
def get_urn(self): return self.urn
def get_hrn(self): return self.hrn
@@
-113,7
+115,12
@@
class Xrn:
parts = Xrn.urn_split(self.urn)
type=parts.pop(2)
# Remove the authority name (e.g. '.sa')
parts = Xrn.urn_split(self.urn)
type=parts.pop(2)
# Remove the authority name (e.g. '.sa')
- if type == 'authority': parts.pop()
+ if type == 'authority':
+ name = parts.pop()
+ # Drop the sa. This is a bad hack, but its either this
+ # or completely change how record types are generated/stored
+ if name != 'sa':
+ type = type + "+" + name
# convert parts (list) into hrn (str) by doing the following
# 1. remove blank parts
# convert parts (list) into hrn (str) by doing the following
# 1. remove blank parts
@@
-134,9
+141,13
@@
class Xrn:
if self.hrn.startswith(Xrn.URN_PREFIX):
raise SfaAPIError, "Xrn.hrn_to_urn, hrn=%s"%self.hrn
if self.hrn.startswith(Xrn.URN_PREFIX):
raise SfaAPIError, "Xrn.hrn_to_urn, hrn=%s"%self.hrn
- if self.type
== 'authority'
:
+ if self.type
and self.type.startswith('authority')
:
self.authority = Xrn.hrn_split(self.hrn)
self.authority = Xrn.hrn_split(self.hrn)
- name = 'sa'
+ type_parts = self.type.split("+")
+ self.type = type_parts[0]
+ name = 'sa'
+ if len(type_parts) > 1:
+ name = type_parts[1]
else:
self.authority = Xrn.hrn_auth_list(self.hrn)
name = Xrn.hrn_leaf(self.hrn)
else:
self.authority = Xrn.hrn_auth_list(self.hrn)
name = Xrn.hrn_leaf(self.hrn)
@@
-144,9
+155,9
@@
class Xrn:
authority_string = self.get_authority_urn()
if self.type == None:
authority_string = self.get_authority_urn()
if self.type == None:
- urn = "+".join(['',authority_string,
name
])
+ urn = "+".join(['',authority_string,
Xrn.unescape(name)
])
else:
else:
- urn = "+".join(['',authority_string,self.type,
name
])
+ urn = "+".join(['',authority_string,self.type,
Xrn.unescape(name)
])
self.urn = Xrn.URN_PREFIX + urn
self.urn = Xrn.URN_PREFIX + urn