From a2e21bef1545bbb68c86ec1a84a611bde7f17a45 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Sun, 5 Jul 2009 11:44:28 +0000
Subject: [PATCH] move auth and hierarchy into sfa/trust

---
 config/sfa-config-tty            | 2 +-
 sfa/methods/create_gid.py        | 2 +-
 sfa/methods/create_slice.py      | 2 +-
 sfa/methods/delete_slice.py      | 2 +-
 sfa/methods/get_credential.py    | 2 +-
 sfa/methods/get_resources.py     | 2 +-
 sfa/methods/get_slices.py        | 2 +-
 sfa/methods/get_ticket.py        | 2 +-
 sfa/methods/list.py              | 2 +-
 sfa/methods/register.py          | 2 +-
 sfa/methods/remove.py            | 2 +-
 sfa/methods/reset_slice.py       | 2 +-
 sfa/methods/resolve.py           | 2 +-
 sfa/methods/start_slice.py       | 2 +-
 sfa/methods/stop_slice.py        | 2 +-
 sfa/methods/update.py            | 2 +-
 sfa/plc/sfa-import-plc.py        | 2 +-
 sfa/server/sfa-server.py         | 2 +-
 sfa/{util => trust}/auth.py      | 2 +-
 sfa/{util => trust}/hierarchy.py | 0
 sfa/util/api.py                  | 2 +-
 sfa/util/method.py               | 2 +-
 tests/testHierarchy.py           | 2 +-
 wsdl/gw2wsdl.py                  | 2 +-
 24 files changed, 23 insertions(+), 23 deletions(-)
 rename sfa/{util => trust}/auth.py (99%)
 rename sfa/{util => trust}/hierarchy.py (100%)

diff --git a/config/sfa-config-tty b/config/sfa-config-tty
index e50be263..da238875 100755
--- a/config/sfa-config-tty
+++ b/config/sfa-config-tty
@@ -20,7 +20,7 @@ import distutils.file_util
 from optparse import OptionParser
 
 from sfa.util.config import Config
-from sfa.util.hierarchy import *
+from sfa.trust.hierarchy import *
 from sfa.util.misc import *
 
 
diff --git a/sfa/methods/create_gid.py b/sfa/methods/create_gid.py
index 1b6a94b1..2cd9e190 100644
--- a/sfa/methods/create_gid.py
+++ b/sfa/methods/create_gid.py
@@ -6,7 +6,7 @@ from sfa.trust.certificate import Keypair
 from sfa.util.faults import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.util.auth import Auth
+from sfa.trust.auth import Auth
 
 class create_gid(Method):
     """
diff --git a/sfa/methods/create_slice.py b/sfa/methods/create_slice.py
index 8710c6f5..b052eacc 100644
--- a/sfa/methods/create_slice.py
+++ b/sfa/methods/create_slice.py
@@ -5,7 +5,7 @@ from sfa.util.faults import *
 from sfa.util.misc import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.util.auth import Auth
+from sfa.trust.auth import Auth
 from sfa.util.slices import Slices
 
 class create_slice(Method):
diff --git a/sfa/methods/delete_slice.py b/sfa/methods/delete_slice.py
index 3f065b79..02df39b2 100644
--- a/sfa/methods/delete_slice.py
+++ b/sfa/methods/delete_slice.py
@@ -5,7 +5,7 @@ from sfa.util.faults import *
 from sfa.util.misc import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.util.auth import Auth
+from sfa.trust.auth import Auth
 
 from sfa.util.slices import Slices
 
diff --git a/sfa/methods/get_credential.py b/sfa/methods/get_credential.py
index c67831b4..1c7d2710 100644
--- a/sfa/methods/get_credential.py
+++ b/sfa/methods/get_credential.py
@@ -6,7 +6,7 @@ from sfa.trust.rights import *
 from sfa.util.faults import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.util.auth import Auth
+from sfa.trust.auth import Auth
 from sfa.util.record import GeniRecord
 from sfa.util.debug import log
 
diff --git a/sfa/methods/get_resources.py b/sfa/methods/get_resources.py
index c56d2b29..19e0bda2 100644
--- a/sfa/methods/get_resources.py
+++ b/sfa/methods/get_resources.py
@@ -4,7 +4,7 @@
 from sfa.util.faults import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.util.auth import Auth
+from sfa.trust.auth import Auth
 from sfa.util.nodes import Nodes
 
 class get_resources(Method):
diff --git a/sfa/methods/get_slices.py b/sfa/methods/get_slices.py
index a21f093a..d3976e86 100644
--- a/sfa/methods/get_slices.py
+++ b/sfa/methods/get_slices.py
@@ -5,7 +5,7 @@ from sfa.util.faults import *
 from sfa.util.misc import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.util.auth import Auth
+from sfa.trust.auth import Auth
 from sfa.util.slices import Slices
 
 class get_slices(Method):
diff --git a/sfa/methods/get_ticket.py b/sfa/methods/get_ticket.py
index fa7f6b69..f328dd7a 100644
--- a/sfa/methods/get_ticket.py
+++ b/sfa/methods/get_ticket.py
@@ -4,7 +4,7 @@
 from sfa.util.faults import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.util.auth import Auth
+from sfa.trust.auth import Auth
 from sfa.util.geniticket import *
 
 class get_ticket(Method):
diff --git a/sfa/methods/list.py b/sfa/methods/list.py
index b5e9b34c..efbf8d3c 100644
--- a/sfa/methods/list.py
+++ b/sfa/methods/list.py
@@ -4,7 +4,7 @@
 from sfa.util.faults import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.util.auth import Auth
+from sfa.trust.auth import Auth
 from sfa.util.record import GeniRecord
 
 from sfa.server.registry import Registries
diff --git a/sfa/methods/register.py b/sfa/methods/register.py
index 3fcc20a6..83a21f3a 100644
--- a/sfa/methods/register.py
+++ b/sfa/methods/register.py
@@ -8,7 +8,7 @@ from sfa.util.faults import *
 from sfa.util.misc import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.util.auth import Auth
+from sfa.trust.auth import Auth
 from sfa.util.record import GeniRecord
 from sfa.util.debug import log
 
diff --git a/sfa/methods/remove.py b/sfa/methods/remove.py
index 59cc0af9..aabaadb6 100644
--- a/sfa/methods/remove.py
+++ b/sfa/methods/remove.py
@@ -4,7 +4,7 @@
 from sfa.util.faults import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.util.auth import Auth
+from sfa.trust.auth import Auth
 from sfa.util.record import GeniRecord
 from sfa.util.debug import log
 
diff --git a/sfa/methods/reset_slice.py b/sfa/methods/reset_slice.py
index d4ae10e4..e5fa1129 100644
--- a/sfa/methods/reset_slice.py
+++ b/sfa/methods/reset_slice.py
@@ -5,7 +5,7 @@ from sfa.util.faults import *
 from sfa.util.misc import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.util.auth import Auth
+from sfa.trust.auth import Auth
 from sfa.util.slices import Slices
 
 class reset_slices(Method):
diff --git a/sfa/methods/resolve.py b/sfa/methods/resolve.py
index f9d3223f..8ad247ff 100644
--- a/sfa/methods/resolve.py
+++ b/sfa/methods/resolve.py
@@ -4,7 +4,7 @@
 from sfa.util.faults import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.util.auth import Auth
+from sfa.trust.auth import Auth
 from sfa.util.record import GeniRecord
 from sfa.util.debug import log
 
diff --git a/sfa/methods/start_slice.py b/sfa/methods/start_slice.py
index 074e7de8..8e7311d6 100644
--- a/sfa/methods/start_slice.py
+++ b/sfa/methods/start_slice.py
@@ -5,7 +5,7 @@ from sfa.util.faults import *
 from sfa.util.misc import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.util.auth import Auth
+from sfa.trust.auth import Auth
 from sfa.util.slices import Slices
 
 class start_slice(Method):
diff --git a/sfa/methods/stop_slice.py b/sfa/methods/stop_slice.py
index 42ad6628..66124738 100644
--- a/sfa/methods/stop_slice.py
+++ b/sfa/methods/stop_slice.py
@@ -5,7 +5,7 @@ from sfa.util.faults import *
 from sfa.util.misc import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.util.auth import Auth
+from sfa.trust.auth import Auth
 from sfa.util.slices import Slices
 
 class stop_slice(Method):
diff --git a/sfa/methods/update.py b/sfa/methods/update.py
index 3c8edf1f..81a0e7a7 100644
--- a/sfa/methods/update.py
+++ b/sfa/methods/update.py
@@ -4,7 +4,7 @@
 from sfa.util.faults import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.util.auth import Auth
+from sfa.trust.auth import Auth
 from sfa.util.record import GeniRecord
 from sfa.util.debug import log
 
diff --git a/sfa/plc/sfa-import-plc.py b/sfa/plc/sfa-import-plc.py
index e06eb3ac..97eecc12 100755
--- a/sfa/plc/sfa-import-plc.py
+++ b/sfa/plc/sfa-import-plc.py
@@ -24,7 +24,7 @@ import tempfile
 from sfa.trust.certificate import convert_public_key, Keypair
 from sfa.trust.trustedroot import *
 
-from sfa.util.hierarchy import *
+from sfa.trust.hierarchy import *
 from sfa.util.record import *
 from sfa.util.genitable import *
 from sfa.util.misc import *
diff --git a/sfa/server/sfa-server.py b/sfa/server/sfa-server.py
index 3cd0370b..066ed65c 100644
--- a/sfa/server/sfa-server.py
+++ b/sfa/server/sfa-server.py
@@ -45,7 +45,7 @@ from sfa.server.aggregate import Aggregate
 from sfa.server.slicemgr import SliceMgr
 
 from sfa.util.config import Config
-from sfa.util.hierarchy import Hierarchy
+from sfa.trust.hierarchy import Hierarchy
 
 # after http://www.erlenstar.demon.co.uk/unix/faq_2.html
 def daemon():
diff --git a/sfa/util/auth.py b/sfa/trust/auth.py
similarity index 99%
rename from sfa/util/auth.py
rename to sfa/trust/auth.py
index 21ac1049..67d6d71b 100644
--- a/sfa/util/auth.py
+++ b/sfa/trust/auth.py
@@ -11,7 +11,7 @@ from sfa.trust.credential import Credential
 from sfa.trust.trustedroot import TrustedRootList
 from sfa.trust.rights import RightList
 from sfa.util.faults import *
-from sfa.util.hierarchy import Hierarchy
+from sfa.trust.hierarchy import Hierarchy
 from sfa.util.genitable import *
 from sfa.util.config import *
 from sfa.util.misc import *
diff --git a/sfa/util/hierarchy.py b/sfa/trust/hierarchy.py
similarity index 100%
rename from sfa/util/hierarchy.py
rename to sfa/trust/hierarchy.py
diff --git a/sfa/util/api.py b/sfa/util/api.py
index b254ee80..03ea9a1b 100644
--- a/sfa/util/api.py
+++ b/sfa/util/api.py
@@ -11,7 +11,7 @@ import traceback
 import string
 import xmlrpclib
 
-from sfa.util.auth import Auth
+from sfa.trust.auth import Auth
 from sfa.util.config import *
 from sfa.util.faults import *
 from sfa.util.debug import *
diff --git a/sfa/util/method.py b/sfa/util/method.py
index e7a12d86..d3820425 100644
--- a/sfa/util/method.py
+++ b/sfa/util/method.py
@@ -17,7 +17,7 @@ from types import StringTypes
 
 from sfa.util.faults import * 
 from sfa.util.parameter import Parameter, Mixed, python_type, xmlrpc_type
-from sfa.util.auth import Auth
+from sfa.trust.auth import Auth
 from sfa.util.debug import profile, log
 
 # we inherit object because we use new-style classes for legacy methods
diff --git a/tests/testHierarchy.py b/tests/testHierarchy.py
index a8494bbc..723c6db5 100755
--- a/tests/testHierarchy.py
+++ b/tests/testHierarchy.py
@@ -1,7 +1,7 @@
 import unittest
 import os
 from sfa.util.faults import *
-from sfa.util.hierarchy import *
+from sfa.trust.hierarchy import *
 from sfa.util.config import *
 
 BASEDIR = "test_hierarchy"
diff --git a/wsdl/gw2wsdl.py b/wsdl/gw2wsdl.py
index e87babef..f08891df 100755
--- a/wsdl/gw2wsdl.py
+++ b/wsdl/gw2wsdl.py
@@ -14,7 +14,7 @@ import globals
 import apistub
 from types import *
 
-from sfa.util.auth import Auth
+from sfa.trust.auth import Auth
 from sfa.util.parameter import Parameter,Mixed
 
 complex_types = {}
-- 
2.47.0