From 239b4be1e879a180c9d51ebedd0c6a6b44aef3c8 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 18 Oct 2010 19:58:02 +0300
Subject: [PATCH] deprecated sfa.util.misc (duplicate for namespace)
---
sfa/util/misc.py | 49 -----------------------------------------------
tests/testAll.py | 1 -
tests/testMisc.py | 18 -----------------
3 files changed, 68 deletions(-)
delete mode 100644 sfa/util/misc.py
delete mode 100755 tests/testMisc.py
diff --git a/sfa/util/misc.py b/sfa/util/misc.py
deleted file mode 100644
index ca8dbba9..00000000
--- a/sfa/util/misc.py
+++ /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
diff --git a/tests/testAll.py b/tests/testAll.py
index 540a53cc..875b139b 100755
--- a/tests/testAll.py
+++ b/tests/testAll.py
@@ -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
index 831d9495..00000000
--- a/tests/testMisc.py
+++ /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()
--
2.47.0