X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Futil%2Fxrn.py;h=764bd41872f089b894f088b218ca49f12ac37f2d;hb=1bde0b9053480e43a5fe3e81647f4cd9c2f20fb6;hp=083e620f2158c4264197356db28de2f14c872a36;hpb=3cbf73ef3ad0220291dbadb1d80d02928482b845;p=sfa.git

diff --git a/sfa/util/xrn.py b/sfa/util/xrn.py
index 083e620f..764bd418 100644
--- a/sfa/util/xrn.py
+++ b/sfa/util/xrn.py
@@ -32,9 +32,6 @@ 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, authority=None):
-    return Xrn(urn).get_sliver_id(slice_id, node_id, index, authority)
-
 class Xrn:
 
     ########## basic tools on HRNs
@@ -82,7 +79,7 @@ class Xrn:
     # 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:
@@ -119,18 +116,25 @@ class Xrn:
     # 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
+        self.type = type
+
         if Xrn.is_urn(xrn):
             self.hrn=None
             self.urn=xrn
             self.urn_to_hrn()
+            if id:
+                self.hrn_to_urn()
         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")
@@ -166,19 +170,17 @@ class Xrn:
     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+"."):
+            self.hrn = authority + "." + self.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])) 
- 
+        
     def urn_to_hrn(self):
         """
         compute tuple (hrn, type) from urn
@@ -208,6 +210,10 @@ class Xrn:
         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)
@@ -223,23 +229,31 @@ class Xrn:
             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()
+            # separate name from id
+            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):