python3 - 2to3 + miscell obvious tweaks

[sfa.git] / sfa / planetlab / plxrn.py

diff --git a/sfa/planetlab/plxrn.py b/sfa/planetlab/plxrn.py
index 6d57dcc..3df3994 100644 (file)
--- a/sfa/planetlab/plxrn.py
+++ b/sfa/planetlab/plxrn.py
@@ -1,63 +1,101 @@
+
+
 # specialized Xrn class for PlanetLab
 import re
-from sfa.util.xrn import Xrn
+from sfa.util.xrn import Xrn, get_authority
 
 # temporary helper functions to use this module instead of namespace
-def hostname_to_hrn (auth, login_base, hostname):
-    return PlXrn(auth=auth+'.'+login_base,hostname=hostname).get_hrn()
+
+
+def hostname_to_hrn(auth, login_base, hostname):
+    return PlXrn(auth=auth + '.' + login_base, hostname=hostname).get_hrn()
+
+
 def hostname_to_urn(auth, login_base, hostname):
-    return PlXrn(auth=auth+'.'+login_base,hostname=hostname).get_urn()
-def slicename_to_hrn (auth_hrn, slicename):
-    return PlXrn(auth=auth_hrn,slicename=slicename).get_hrn()
-def email_to_hrn (auth_hrn, email):
+    return PlXrn(auth=auth + '.' + login_base, hostname=hostname).get_urn()
+
+
+def slicename_to_hrn(auth_hrn, slicename):
+    return PlXrn(auth=auth_hrn, slicename=slicename).get_hrn()
+
+
+def email_to_hrn(auth_hrn, email):
     return PlXrn(auth=auth_hrn, email=email).get_hrn()
-def hrn_to_pl_slicename (hrn):
-    return PlXrn(xrn=hrn,type='slice').pl_slicename()
+
+
+def hrn_to_pl_slicename(hrn):
+    return PlXrn(xrn=hrn, type='slice').pl_slicename()
 # removed-dangerous - was used for non-slice objects
-#def hrn_to_pl_login_base (hrn):
+# def hrn_to_pl_login_base (hrn):
 #    return PlXrn(xrn=hrn,type='slice').pl_login_base()
-def hrn_to_pl_authname (hrn):
-    return PlXrn(xrn=hrn,type='any').pl_authname()
+
+
+def hrn_to_pl_authname(hrn):
+    return PlXrn(xrn=hrn, type='any').pl_authname()
+
+
 def xrn_to_hostname(hrn):
     return Xrn.unescape(PlXrn(xrn=hrn, type='node').get_leaf())
 
+# helpers to handle external objects created via fedaration
+
+
+def top_auth(hrn):
+    return hrn.split('.')[0]
+
+
+def hash_loginbase(site_hrn):
+    if len(site_hrn) <= 12:
+        return site_hrn.replace('.', '8').replace('_', '8')
+    ratio = float(12) / len(site_hrn)
+    auths_tab = site_hrn.split('.')
+    auths_tab2 = []
+    for auth in auths_tab:
+
+        auth = auth.replace('_', '8')
+        auth2 = auth[:int(len(auth) * ratio)]
+        auths_tab2.append(auth2)
+    return '8'.join(auths_tab2)
+
+
 class PlXrn (Xrn):
 
-    @staticmethod 
-    def site_hrn (auth, login_base):
-        return '.'.join([auth,login_base])
+    @staticmethod
+    def site_hrn(auth, login_base):
+        return '.'.join([auth, login_base])
 
-    def __init__ (self, auth=None, hostname=None, slicename=None, email=None, interface=None, **kwargs):
-        #def hostname_to_hrn(auth_hrn, login_base, hostname):
+    def __init__(self, auth=None, hostname=None, slicename=None, email=None, interface=None, **kwargs):
+        # def hostname_to_hrn(auth_hrn, login_base, hostname):
         if hostname is not None:
-            self.type='node'
+            self.type = 'node'
             # keep only the first part of the DNS name
             #self.hrn='.'.join( [auth,hostname.split(".")[0] ] )
             # escape the '.' in the hostname
-            self.hrn='.'.join( [auth,Xrn.escape(hostname)] )
+            self.hrn = '.'.join([auth, Xrn.escape(hostname)])
             self.hrn_to_urn()
-        #def slicename_to_hrn(auth_hrn, slicename):
+        # def slicename_to_hrn(auth_hrn, slicename):
         elif slicename is not None:
-            self.type='slice'
+            self.type = 'slice'
             # split at the first _
-            parts = slicename.split("_",1)
-            self.hrn = ".".join([auth] + parts )
+            parts = slicename.split("_", 1)
+            self.hrn = ".".join([auth] + parts)
             self.hrn_to_urn()
-        #def email_to_hrn(auth_hrn, email):
+        # def email_to_hrn(auth_hrn, email):
         elif email is not None:
-            self.type='person'
+            self.type = 'person'
             # keep only the part before '@' and replace special chars into _
-            self.hrn='.'.join([auth,email.split('@')[0].replace(".", "_").replace("+", "_")])
+            self.hrn = '.'.join(
+                [auth, email.split('@')[0].replace(".", "_").replace("+", "_")])
             self.hrn_to_urn()
         elif interface is not None:
             self.type = 'interface'
             self.hrn = auth + '.' + interface
             self.hrn_to_urn()
         else:
-            Xrn.__init__ (self,**kwargs)
+            Xrn.__init__(self, **kwargs)
 
-    #def hrn_to_pl_slicename(hrn):
-    def pl_slicename (self):
+    # def hrn_to_pl_slicename(hrn):
+    def pl_slicename(self):
         self._normalize()
         leaf = self.leaf
         sliver_id_parts = leaf.split(':')
@@ -65,8 +103,8 @@ class PlXrn (Xrn):
         name = re.sub('[^a-zA-Z0-9_]', '', name)
         return self.pl_login_base() + '_' + name
 
-    #def hrn_to_pl_authname(hrn):
-    def pl_authname (self):
+    # def hrn_to_pl_authname(hrn):
+    def pl_authname(self):
         self._normalize()
         return self.authority[-1]
 
@@ -74,15 +112,27 @@ class PlXrn (Xrn):
         self._normalize()
         return self.leaf
 
-    def pl_login_base (self):
+    def pl_login_base(self):
         self._normalize()
-        base = self.authority[-1]
-        
+        if self.type and self.type.startswith('authority'):
+            base = self.leaf
+        else:
+            base = self.authority[-1]
+
         # Fix up names of GENI Federates
         base = base.lower()
-        base = re.sub('\\\[^a-zA-Z0-9]', '', base)
+        base = re.sub('[\\\\]*[^a-zA-Z0-9]', '', base)
 
-        if len(base) > 20:
-            base = base[len(base)-20:]
-        
         return base
+
+tests = [
+    'inria.foo.x',
+    'in.foo.x_y',
+    'inria.foo.longer',
+    'onelab.upmc.fit_demo',
+    'onelab.upmc.fit_demo.some_other',
+]
+
+if __name__ == '__main__':
+    for test in tests:
+        print(("{} - hash_loginbase -> {}".format(test, hash_loginbase(test))))