From 61fb6155a3601572b92e5859ccd507a8562d1a0b Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Thu, 12 Apr 2012 21:27:22 -0400 Subject: [PATCH] add 'authority' param to urn_to_sliver_id() --- sfa/util/xrn.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sfa/util/xrn.py b/sfa/util/xrn.py index f48a3773..c38fff50 100644 --- a/sfa/util/xrn.py +++ b/sfa/util/xrn.py @@ -32,8 +32,8 @@ 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 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): - return Xrn(urn).get_sliver_id(slice_id, node_id, index) +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: @@ -162,9 +162,13 @@ class Xrn: self._normalize() return ':'.join( [Xrn.unescape(x) for x in self.authority] ) - def get_sliver_id(self, slice_id, node_id, index=0): + def get_sliver_id(self, slice_id, node_id, index=0, authority=None): self._normalize() - return ":".join(map(str, [self.get_urn(), slice_id, node_id, index])) + urn = self.get_urn() + if authority: + tmp_hrn = ".".join([authority,self.get_authority_hrn(), self.get_leaf()]) + urn = Xrn(tmp_hrn, self.get_type()).get_urn() + return ":".join(map(str, [urn, slice_id, node_id, index])) def urn_to_hrn(self): """ -- 2.47.0