#----------------------------------------------------------------------
import re
-import sys
+
from sfa.util.faults import SfaAPIError
# for convenience and smoother translation - we should get rid of these functions eventually
def hrn_to_urn(hrn,type): return Xrn(hrn, type=type).urn
def hrn_authfor_hrn(parenthrn, hrn): return Xrn.hrn_is_auth_for_hrn(parenthrn, hrn)
-def urn_to_sliver_id(urn, slice_id, node_id, index=0, authority=None):
- return Xrn(urn).get_sliver_id(slice_id, node_id, index, authority)
-
class Xrn:
########## basic tools on HRNs
# A better alternative than childHRN.startswith(parentHRN)
# e.g. hrn_is_auth_for_hrn('a\.b', 'a\.b.c.d') -> True,
# but hrn_is_auth_for_hrn('a', 'a\.b.c.d') -> False
- # Also hrn_is_uauth_for_hrn('a\.b.c.d', 'a\.b.c.d') -> True
+ # Also hrn_is_auth_for_hrn('a\.b.c.d', 'a\.b.c.d') -> True
@staticmethod
def hrn_is_auth_for_hrn(parenthrn, hrn):
if parenthrn == hrn:
def urn_split (urn):
return Xrn.urn_meaningful(urn).split('+')
+ @staticmethod
+ def filter_type(urns=None, type=None):
+ if urns is None: urns=[]
+ urn_list = []
+ if not type:
+ return urns
+
+ for urn in urns:
+ xrn = Xrn(xrn=urn)
+ if (xrn.type == type):
+ # Xrn is probably a urn so we can just compare types
+ urn_list.append(urn)
+ return urn_list
####################
# the local fields that are kept consistent
# self.urn
# self.type
# self.path
# provide either urn, or (hrn + type)
- def __init__ (self, xrn, type=None):
+ def __init__ (self, xrn="", type=None, id=None):
if not xrn: xrn = ""
-
# user has specified xrn : guess if urn or hrn
+ self.id = id
if Xrn.is_urn(xrn):
self.hrn=None
self.urn=xrn
+ if id:
+ self.urn = "%s:%s" % (self.urn, str(id))
self.urn_to_hrn()
else:
self.urn=None
self.hrn=xrn
self.type=type
self.hrn_to_urn()
+ self._normalize()
# happens all the time ..
# if not type:
# debug_logger.debug("type-less Xrn's are not safe")
def get_hrn_type(self): return (self.hrn, self.type)
def _normalize(self):
- if self.hrn is None: raise SfaAPIError, "Xrn._normalize"
+ if self.hrn is None: raise SfaAPIError("Xrn._normalize")
if not hasattr(self,'leaf'):
self.leaf=Xrn.hrn_split(self.hrn)[-1]
# self.authority keeps a list
if not hasattr(self,'authority'):
self.authority=Xrn.hrn_auth_list(self.hrn)
-
-
+
def get_leaf(self):
self._normalize()
return self.leaf
def get_authority_urn(self):
self._normalize()
return ':'.join( [Xrn.unescape(x) for x in self.authority] )
-
- def get_sliver_id(self, slice_id, node_id, index=0, authority=None):
+
+ def set_authority(self, authority):
+ """
+ update the authority section of an existing urn
+ """
+ authority_hrn = self.get_authority_hrn()
+ if not authority_hrn.startswith(authority):
+ hrn = ".".join([authority,authority_hrn, self.get_leaf()])
+ else:
+ hrn = ".".join([authority_hrn, self.get_leaf()])
+
+ self.hrn = hrn
+ self.hrn_to_urn()
self._normalize()
- urn = self.get_urn()
- if authority:
- authority_hrn = self.get_authority_hrn()
- if not authority_hrn.startswith(authority):
- hrn = ".".join([authority,self.get_authority_hrn(), self.get_leaf()])
- else:
- hrn = ".".join([self.get_authority_hrn(), self.get_leaf()])
- urn = Xrn(hrn, self.get_type()).get_urn()
- return ":".join(map(str, [urn, slice_id, node_id, index]))
-
+
+ # sliver_id_parts is list that contains the sliver's
+ # slice id and node id
+ def get_sliver_id_parts(self):
+ sliver_id_parts = []
+ if self.type == 'sliver' or '-' in self.leaf:
+ sliver_id_parts = self.leaf.split('-')
+ return sliver_id_parts
+
+
def urn_to_hrn(self):
"""
compute tuple (hrn, type) from urn
# if not self.urn or not self.urn.startswith(Xrn.URN_PREFIX):
if not Xrn.is_urn(self.urn):
- raise SfaAPIError, "Xrn.urn_to_hrn"
+ raise SfaAPIError("Xrn.urn_to_hrn")
parts = Xrn.urn_split(self.urn)
type=parts.pop(2)
hrn = '.'.join([Xrn.escape(part).replace(':','.') for part in parts if part])
# dont replace ':' in the name section
if name:
+ parts = name.split(':')
+ if len(parts) > 1:
+ self.id = ":".join(parts[1:])
+ name = parts[0]
hrn += '.%s' % Xrn.escape(name)
self.hrn=str(hrn)
# if not self.hrn or self.hrn.startswith(Xrn.URN_PREFIX):
if Xrn.is_urn(self.hrn):
- raise SfaAPIError, "Xrn.hrn_to_urn, hrn=%s"%self.hrn
+ raise SfaAPIError("Xrn.hrn_to_urn, hrn=%s"%self.hrn)
if self.type and self.type.startswith('authority'):
- self.authority = Xrn.hrn_split(self.hrn)
+ self.authority = Xrn.hrn_auth_list(self.hrn)
+ leaf = self.get_leaf()
+ #if not self.authority:
+ # self.authority = [self.hrn]
type_parts = self.type.split("+")
self.type = type_parts[0]
name = 'sa'
if len(type_parts) > 1:
name = type_parts[1]
+ auth_parts = [part for part in [self.get_authority_urn(), leaf] if part]
+ authority_string = ":".join(auth_parts)
else:
self.authority = Xrn.hrn_auth_list(self.hrn)
name = Xrn.hrn_leaf(self.hrn)
-
- authority_string = self.get_authority_urn()
+ authority_string = self.get_authority_urn()
if self.type == None:
urn = "+".join(['',authority_string,Xrn.unescape(name)])
else:
urn = "+".join(['',authority_string,self.type,Xrn.unescape(name)])
-
+
+ if hasattr(self, 'id') and self.id:
+ urn = "%s:%s" % (urn, self.id)
+
self.urn = Xrn.URN_PREFIX + urn
def dump_string(self):
git://git.onelab.eu / sfa.git / blobdiff