deprecated sfa.util.misc (duplicate for namespace)
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 18 Oct 2010 16:58:02 +0000 (19:58 +0300)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 18 Oct 2010 16:58:02 +0000 (19:58 +0300)
sfa/util/misc.py [deleted file]
tests/testAll.py
tests/testMisc.py [deleted file]

diff --git a/sfa/util/misc.py b/sfa/util/misc.py
deleted file mode 100644 (file)
index ca8dbba..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-### $Id$
-### $URL$
-
-from sfa.util.faults import *
-
-def get_leaf(hrn):
-    parts = hrn.split(".")
-    return ".".join(parts[-1:])
-
-def get_authority(hrn):
-    parts = hrn.split(".")
-    return ".".join(parts[:-1])
-
-def hrn_to_pl_slicename(hrn):
-    parts = hrn.split(".")
-    return parts[-2] + "_" + parts[-1]
-
-# assuming hrn is the hrn of an authority, return the plc authority name
-def hrn_to_pl_authname(hrn):
-    parts = hrn.split(".")
-    return parts[-1]
-
-# assuming hrn is the hrn of an authority, return the plc login_base
-def hrn_to_pl_login_base(hrn):
-    return hrn_to_pl_authname(hrn)
-
-def hostname_to_hrn(auth_hrn, login_base, hostname):
-    """
-    Convert hrn to plantelab name.
-    """
-    sfa_hostname = ".".join([auth_hrn, login_base, hostname.split(".")[0]])
-    return sfa_hostname
-
-def slicename_to_hrn(auth_hrn, slicename):
-    """
-    Convert hrn to planetlab name.
-    """
-    parts = slicename.split("_")
-    slice_hrn = ".".join([auth_hrn, parts[0]]) + "." + "_".join(parts[1:])
-
-    return slice_hrn
-
-def email_to_hrn(auth_hrn, email):
-    parts = email.split("@")
-    username = parts[0]
-    username = username.replace(".", "_") 
-    person_hrn = ".".join([auth_hrn, username])
-    
-    return person_hrn 
index 540a53c..875b139 100755 (executable)
@@ -10,7 +10,6 @@ from testXrn import *
 # xxx broken-test
 #from testCred import *
 from testKeypair import *
-from testMisc import *
 # xxx broken-test
 #from testHierarchy import *
 from testRecord import *
diff --git a/tests/testMisc.py b/tests/testMisc.py
deleted file mode 100755 (executable)
index 831d949..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-import unittest
-from sfa.util.misc import *
-
-class TestMisc(unittest.TestCase):
-   def setUp(self):
-      pass
-
-   def testGetLeft(self):
-      self.assertEqual(get_leaf("foo"), "foo")
-      self.assertEqual(get_leaf("foo.bar"), "bar")
-
-   def testGetAuthority(self):
-      self.assertEqual(get_authority("foo"), "")
-      self.assertEqual(get_authority("foo.bar"), "foo")
-      self.assertEqual(get_authority("foo.bar.x"), "foo.bar")
-
-if __name__ == "__main__":
-    unittest.main()