From f13173726f8382eef380f1e754f24dd2b126a77b Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 3 Jul 2009 14:40:59 +0000 Subject: [PATCH] renaming the toplevel geni/ package into sfa/ --- Makefile | 6 +-- component/component.py | 18 ++++----- config/sfa-config-tty | 8 ++-- geniwrapper.spec | 14 +++---- setup.py | 40 ++++++++++---------- {geni => sfa}/Makefile | 0 {geni => sfa}/client/genidump.py | 12 +++--- {geni => sfa}/client/getNodes.py | 2 +- {geni => sfa}/client/getRecord.py | 2 +- {geni => sfa}/client/setRecord.py | 2 +- {geni => sfa}/client/sfi.py | 12 +++--- {geni => sfa}/init.d/sfa | 0 {geni => sfa}/methods/__init__.py | 0 {geni => sfa}/methods/create_gid.py | 10 ++--- {geni => sfa}/methods/create_slice.py | 12 +++--- {geni => sfa}/methods/delete_slice.py | 12 +++--- {geni => sfa}/methods/get_credential.py | 16 ++++---- {geni => sfa}/methods/get_resources.py | 10 ++--- {geni => sfa}/methods/get_slices.py | 12 +++--- {geni => sfa}/methods/get_ticket.py | 10 ++--- {geni => sfa}/methods/list.py | 12 +++--- {geni => sfa}/methods/register.py | 20 +++++----- {geni => sfa}/methods/remove.py | 12 +++--- {geni => sfa}/methods/reset_slice.py | 12 +++--- {geni => sfa}/methods/resolve.py | 14 +++---- {geni => sfa}/methods/start_slice.py | 12 +++--- {geni => sfa}/methods/stop_slice.py | 12 +++--- {geni => sfa}/methods/update.py | 12 +++--- {geni => sfa}/plc/sfa-import-plc.py | 16 ++++---- {geni => sfa}/server/aggregate.py | 8 ++-- {geni => sfa}/server/registry.py | 10 ++--- {geni => sfa}/server/sfa-server.py | 14 +++---- {geni => sfa}/server/slicemgr.py | 8 ++-- {geni => sfa}/trust/certificate.py | 4 +- {geni => sfa}/trust/credential.py | 6 +-- {geni => sfa}/trust/gid.py | 2 +- {geni => sfa}/trust/rights.py | 0 {geni => sfa}/trust/trusted_certs/plc_ca.crt | 0 {geni => sfa}/trust/trusted_certs/ple_ca.crt | 0 {geni => sfa}/trust/trustedroot.py | 4 +- {geni => sfa}/util/api.py | 22 +++++------ {geni => sfa}/util/auth.py | 16 ++++---- {geni => sfa}/util/config.py | 2 +- {geni => sfa}/util/debug.py | 0 {geni => sfa}/util/faults.py | 0 {geni => sfa}/util/geniclient.py | 8 ++-- {geni => sfa}/util/geniserver.py | 12 +++--- {geni => sfa}/util/genitable.py | 6 +-- {geni => sfa}/util/geniticket.py | 6 +-- {geni => sfa}/util/hierarchy.py | 12 +++--- {geni => sfa}/util/method.py | 8 ++-- {geni => sfa}/util/misc.py | 2 +- {geni => sfa}/util/nodes.py | 20 +++++----- {geni => sfa}/util/parameter.py | 2 +- {geni => sfa}/util/policy.py | 4 +- {geni => sfa}/util/record.py | 8 ++-- {geni => sfa}/util/remoteshell.py | 0 {geni => sfa}/util/report.py | 0 {geni => sfa}/util/rspec.py | 0 {geni => sfa}/util/slices.py | 18 ++++----- {geni => sfa}/util/specdict.py | 0 {geni => sfa}/util/storage.py | 2 +- tests/client/testAggregate.py | 4 +- tests/testCert.py | 2 +- tests/testCred.py | 6 +-- tests/testGid.py | 4 +- tests/testHierarchy.py | 6 +-- tests/testKeypair.py | 2 +- tests/testMisc.py | 2 +- tests/testRecord.py | 6 +-- tests/testRights.py | 2 +- wsdl/apistub.py | 6 +-- wsdl/gw2wsdl.py | 4 +- 73 files changed, 284 insertions(+), 284 deletions(-) rename {geni => sfa}/Makefile (100%) rename {geni => sfa}/client/genidump.py (89%) rename {geni => sfa}/client/getNodes.py (98%) rename {geni => sfa}/client/getRecord.py (98%) rename {geni => sfa}/client/setRecord.py (98%) rename {geni => sfa}/client/sfi.py (98%) rename {geni => sfa}/init.d/sfa (100%) rename {geni => sfa}/methods/__init__.py (100%) rename {geni => sfa}/methods/create_gid.py (88%) rename {geni => sfa}/methods/create_slice.py (80%) rename {geni => sfa}/methods/delete_slice.py (76%) rename {geni => sfa}/methods/get_credential.py (94%) rename {geni => sfa}/methods/get_resources.py (84%) rename {geni => sfa}/methods/get_slices.py (74%) rename {geni => sfa}/methods/get_ticket.py (92%) rename {geni => sfa}/methods/list.py (85%) rename {geni => sfa}/methods/register.py (93%) rename {geni => sfa}/methods/remove.py (90%) rename {geni => sfa}/methods/reset_slice.py (75%) rename {geni => sfa}/methods/resolve.py (87%) rename {geni => sfa}/methods/start_slice.py (76%) rename {geni => sfa}/methods/stop_slice.py (76%) rename {geni => sfa}/methods/update.py (93%) rename {geni => sfa}/plc/sfa-import-plc.py (97%) rename {geni => sfa}/server/aggregate.py (96%) rename {geni => sfa}/server/registry.py (95%) rename {geni => sfa}/server/sfa-server.py (93%) rename {geni => sfa}/server/slicemgr.py (81%) rename {geni => sfa}/trust/certificate.py (99%) rename {geni => sfa}/trust/credential.py (98%) rename {geni => sfa}/trust/gid.py (98%) rename {geni => sfa}/trust/rights.py (100%) rename {geni => sfa}/trust/trusted_certs/plc_ca.crt (100%) rename {geni => sfa}/trust/trusted_certs/ple_ca.crt (100%) rename {geni => sfa}/trust/trustedroot.py (93%) rename {geni => sfa}/util/api.py (97%) rename {geni => sfa}/util/auth.py (96%) rename {geni => sfa}/util/config.py (99%) rename {geni => sfa}/util/debug.py (100%) rename {geni => sfa}/util/faults.py (100%) rename {geni => sfa}/util/geniclient.py (98%) rename {geni => sfa}/util/geniserver.py (96%) rename {geni => sfa}/util/genitable.py (98%) rename {geni => sfa}/util/geniticket.py (96%) rename {geni => sfa}/util/hierarchy.py (98%) rename {geni => sfa}/util/method.py (98%) rename {geni => sfa}/util/misc.py (97%) rename {geni => sfa}/util/nodes.py (96%) rename {geni => sfa}/util/parameter.py (98%) rename {geni => sfa}/util/policy.py (90%) rename {geni => sfa}/util/record.py (99%) rename {geni => sfa}/util/remoteshell.py (100%) rename {geni => sfa}/util/report.py (100%) rename {geni => sfa}/util/rspec.py (100%) rename {geni => sfa}/util/slices.py (97%) rename {geni => sfa}/util/specdict.py (100%) rename {geni => sfa}/util/storage.py (98%) diff --git a/Makefile b/Makefile index db8c4805..57c74ce5 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ tags: ########## indexes subdirs = client methods plc server trust util -init := geni/__init__.py $(foreach subdir, $(subdirs), geni/$(subdir)/__init__.py) +init := sfa/__init__.py $(foreach subdir, $(subdirs), sfa/$(subdir)/__init__.py) force: .PHONY: force @@ -87,9 +87,9 @@ ifeq (,$(SSHURL)) @echo " or make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr" @exit 1 else - +$(RSYNC) ./geni/ $(SSHURL)/usr/lib/python2.5/site-packages/geni/ + +$(RSYNC) ./sfa/ $(SSHURL)/usr/lib/python2.5/site-packages/sfa/ +$(RSYNC) ./config/sfa-config-tty $(SSHURL)/usr/bin - $(SSHCOMMAND) exec service geni restart + $(SSHCOMMAND) exec service sfa restart endif .PHONY: sync diff --git a/component/component.py b/component/component.py index bb80d025..fc8283e3 100644 --- a/component/component.py +++ b/component/component.py @@ -10,15 +10,15 @@ import os import sys from xmlrpclib import ServerProxy -from geni.trust.certificate import Certificate, Keypair -from geni.trust.gid import * -from geni.trust.trustedroot import * - -from geni.util.geniserver import * -from geni.util.faults import * -from geni.util.misc import * -from geni.util.record import * -from geni.util.geniticket import * +from sfa.trust.certificate import Certificate, Keypair +from sfa.trust.gid import * +from sfa.trust.trustedroot import * + +from sfa.util.faults import * +from sfa.util.misc import * +from sfa.util.record import * +from sfa.util.geniticket import * +from sfa.util.geniserver import * ## # ComponentManager is a GeniServer that serves slice and diff --git a/config/sfa-config-tty b/config/sfa-config-tty index 208eca57..2031acd4 100755 --- a/config/sfa-config-tty +++ b/config/sfa-config-tty @@ -19,9 +19,9 @@ import traceback import distutils.file_util from optparse import OptionParser -from geni.util.config import Config -from geni.util.hierarchy import * -from geni.util.misc import * +from sfa.util.config import Config +from sfa.util.hierarchy import * +from sfa.util.misc import * all_variables = ["GENI_REGISTRY_ROOT_AUTH", @@ -133,7 +133,7 @@ def get_defaults(): 'PLC_API_MAINTENANCE_USER': 'GENI_PLC_USER' } try: - from geni.util.config import plcConfig + from sfa.util.config import plcConfig plc_config = plcConfig except: plc_config = None diff --git a/geniwrapper.spec b/geniwrapper.spec index 2fb59702..f7f352bf 100644 --- a/geniwrapper.spec +++ b/geniwrapper.spec @@ -26,28 +26,28 @@ Requires: python Requires: pyOpenSSL >= 0.7 Requires: m2crypto -Summary: the GENI python libraries +Summary: the SFA python libraries Group: Applications/System %package plc -Summary: the GENI wrapper arounf MyPLC +Summary: the SFA wrapper arounf MyPLC Group: Applications/System Requires: sfa %package client -Summary: the GENI experimenter-side CLI +Summary: the SFA experimenter-side CLI Group: Applications/System Requires: sfa %description -This package provides the python libraries that the Geni implementation requires +This package provides the python libraries that the SFA implementation requires %description plc -Geniwrapper implements the Geni interface which serves as a layer -between the existing PlanetLab interfaces and the Geni API. +Geniwrapper implements the SFA interface which serves as a layer +between the existing PlanetLab interfaces and the SFA API. %description client -This package provides the client side of the Geni API, in particular +This package provides the client side of the SFA API, in particular sfi.py, together with other utilities. %prep diff --git a/setup.py b/setup.py index 2d358960..3f4e729b 100755 --- a/setup.py +++ b/setup.py @@ -9,36 +9,36 @@ import shutil from distutils.core import setup scripts = [ 'config/sfa-config-tty', - 'geni/plc/sfa-import-plc.py', - 'geni/server/sfa-server.py', - 'geni/client/sfi.py', - 'geni/client/getNodes.py', - 'geni/client/getRecord.py', - 'geni/client/setRecord.py', - 'geni/client/genidump.py', + 'sfa/plc/sfa-import-plc.py', + 'sfa/server/sfa-server.py', + 'sfa/client/sfi.py', + 'sfa/client/getNodes.py', + 'sfa/client/getRecord.py', + 'sfa/client/setRecord.py', + 'sfa/client/genidump.py', ] -package_dirs = [ 'geni', - 'geni/client', - 'geni/methods', - 'geni/plc', - 'geni/server', - 'geni/trust', - 'geni/util', +package_dirs = [ 'sfa', + 'sfa/client', + 'sfa/methods', + 'sfa/plc', + 'sfa/server', + 'sfa/trust', + 'sfa/util', ] data_files = [ ('/etc/sfa/', [ 'config/aggregates.xml', 'config/registries.xml', 'config/sfa_config', 'config/sfi_config', ]), - ('/etc/init.d/', ['geni/init.d/sfa']), + ('/etc/init.d/', ['sfa/init.d/sfa']), ('/var/www/html/wsdl', [ 'wsdl/sfa.wsdl' ] ), ] -symlinks = [ '/usr/share/geniwrapper' ] -initscripts = [ '/etc/init.d/geni' ] +symlinks = [ '/usr/share/sfa' ] +initscripts = [ '/etc/init.d/sfa' ] if sys.argv[1] in ['uninstall', 'remove', 'delete', 'clean']: python_path = sys.path - site_packages_path = [ path + os.sep + 'geni' for path in python_path if path.endswith('site-packages')] + site_packages_path = [ path + os.sep + 'sfa' for path in python_path if path.endswith('site-packages')] remove_dirs = ['/etc/sfa/'] + site_packages_path remove_files = [ '/usr/bin/sfa-config-tty', '/usr/bin/sfa-import-plc.py', @@ -68,7 +68,7 @@ if sys.argv[1] in ['uninstall', 'remove', 'delete', 'clean']: else: # avoid repeating what's in the specfile already - setup(name='geni', + setup(name='sfa', packages = package_dirs, data_files = data_files, ext_modules = [], @@ -78,7 +78,7 @@ else: # create symlink to geniwrapper source in /usr/share python_path = sys.path - site_packages_path = [ path + os.sep + 'geni' for path in python_path if path.endswith('site-packages')] + site_packages_path = [ path + os.sep + 'sfa' for path in python_path if path.endswith('site-packages')] # python path usualy has /usr/local/lib/ path , filter this out site_packages_path = [x for x in site_packages_path if 'local' not in x] diff --git a/geni/Makefile b/sfa/Makefile similarity index 100% rename from geni/Makefile rename to sfa/Makefile diff --git a/geni/client/genidump.py b/sfa/client/genidump.py similarity index 89% rename from geni/client/genidump.py rename to sfa/client/genidump.py index 8c3be7d1..e2bcd924 100644 --- a/geni/client/genidump.py +++ b/sfa/client/genidump.py @@ -8,13 +8,13 @@ import xmlrpclib from types import StringTypes, ListType from optparse import OptionParser -from geni.trust.certificate import Certificate -from geni.trust.credential import Credential -from geni.trust.gid import create_uuid +from sfa.trust.certificate import Certificate +from sfa.trust.credential import Credential +from sfa.trust.gid import create_uuid -from geni.util.geniclient import GeniClient, ServerException -from geni.util.record import GeniRecord -from geni.util.rspec import Rspec +from sfa.util.geniclient import GeniClient, ServerException +from sfa.util.record import GeniRecord +from sfa.util.rspec import Rspec def determine_geni_filekind(fn): cert = Certificate(filename = fn) diff --git a/geni/client/getNodes.py b/sfa/client/getNodes.py similarity index 98% rename from geni/client/getNodes.py rename to sfa/client/getNodes.py index 6e321f84..4d34a43e 100644 --- a/geni/client/getNodes.py +++ b/sfa/client/getNodes.py @@ -6,7 +6,7 @@ from optparse import OptionParser from pprint import pprint from types import StringTypes -from geni.util.rspec import Rspec +from sfa.util.rspec import Rspec def create_parser(): command = sys.argv[0] diff --git a/geni/client/getRecord.py b/sfa/client/getRecord.py similarity index 98% rename from geni/client/getRecord.py rename to sfa/client/getRecord.py index fc6b3dbd..546e90a2 100755 --- a/geni/client/getRecord.py +++ b/sfa/client/getRecord.py @@ -17,7 +17,7 @@ from optparse import OptionParser from pprint import pprint from xml.parsers.expat import ExpatError -from geni.util.rspec import RecordSpec +from sfa.util.rspec import RecordSpec def create_parser(): diff --git a/geni/client/setRecord.py b/sfa/client/setRecord.py similarity index 98% rename from geni/client/setRecord.py rename to sfa/client/setRecord.py index 508bb3ea..0d7dd16d 100755 --- a/geni/client/setRecord.py +++ b/sfa/client/setRecord.py @@ -16,7 +16,7 @@ import os from optparse import OptionParser from pprint import pprint -from geni.util.rspec import RecordSpec +from sfa.util.rspec import RecordSpec def create_parser(): diff --git a/geni/client/sfi.py b/sfa/client/sfi.py similarity index 98% rename from geni/client/sfi.py rename to sfa/client/sfi.py index 43bbb982..d3c320f9 100755 --- a/geni/client/sfi.py +++ b/sfa/client/sfi.py @@ -9,13 +9,13 @@ import tempfile from types import StringTypes, ListType from optparse import OptionParser -from geni.trust.certificate import Keypair, Certificate -from geni.trust.credential import Credential -from geni.trust.gid import create_uuid +from sfa.trust.certificate import Keypair, Certificate +from sfa.trust.credential import Credential +from sfa.trust.gid import create_uuid -from geni.util.geniclient import GeniClient, ServerException -from geni.util.record import * -from geni.util.rspec import Rspec +from sfa.util.geniclient import GeniClient, ServerException +from sfa.util.record import * +from sfa.util.rspec import Rspec # xxx todo xxx auto-load ~/.sfi/sfi_config diff --git a/geni/init.d/sfa b/sfa/init.d/sfa similarity index 100% rename from geni/init.d/sfa rename to sfa/init.d/sfa diff --git a/geni/methods/__init__.py b/sfa/methods/__init__.py similarity index 100% rename from geni/methods/__init__.py rename to sfa/methods/__init__.py diff --git a/geni/methods/create_gid.py b/sfa/methods/create_gid.py similarity index 88% rename from geni/methods/create_gid.py rename to sfa/methods/create_gid.py index e4560b49..1b6a94b1 100644 --- a/geni/methods/create_gid.py +++ b/sfa/methods/create_gid.py @@ -1,12 +1,12 @@ ### $Id$ ### $URL$ -from geni.trust.certificate import Keypair +from sfa.trust.certificate import Keypair -from geni.util.faults import * -from geni.util.method import Method -from geni.util.parameter import Parameter, Mixed -from geni.util.auth import Auth +from sfa.util.faults import * +from sfa.util.method import Method +from sfa.util.parameter import Parameter, Mixed +from sfa.util.auth import Auth class create_gid(Method): """ diff --git a/geni/methods/create_slice.py b/sfa/methods/create_slice.py similarity index 80% rename from geni/methods/create_slice.py rename to sfa/methods/create_slice.py index 8b8cffee..8710c6f5 100644 --- a/geni/methods/create_slice.py +++ b/sfa/methods/create_slice.py @@ -1,12 +1,12 @@ ### $Id$ ### $URL$ -from geni.util.faults import * -from geni.util.misc import * -from geni.util.method import Method -from geni.util.parameter import Parameter, Mixed -from geni.util.auth import Auth -from geni.util.slices import Slices +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.util.slices import Slices class create_slice(Method): """ diff --git a/geni/methods/delete_slice.py b/sfa/methods/delete_slice.py similarity index 76% rename from geni/methods/delete_slice.py rename to sfa/methods/delete_slice.py index 187939e1..3f065b79 100644 --- a/geni/methods/delete_slice.py +++ b/sfa/methods/delete_slice.py @@ -1,13 +1,13 @@ ### $Id$ ### $URL$ -from geni.util.faults import * -from geni.util.misc import * -from geni.util.method import Method -from geni.util.parameter import Parameter, Mixed -from geni.util.auth import Auth +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 geni.util.slices import Slices +from sfa.util.slices import Slices class delete_slice(Method): """ diff --git a/geni/methods/get_credential.py b/sfa/methods/get_credential.py similarity index 94% rename from geni/methods/get_credential.py rename to sfa/methods/get_credential.py index aa9b25fd..c67831b4 100644 --- a/geni/methods/get_credential.py +++ b/sfa/methods/get_credential.py @@ -1,14 +1,14 @@ ### $Id$ ### $URL$ -from geni.trust.credential import * -from geni.trust.rights import * -from geni.util.faults import * -from geni.util.method import Method -from geni.util.parameter import Parameter, Mixed -from geni.util.auth import Auth -from geni.util.record import GeniRecord -from geni.util.debug import log +from sfa.trust.credential import * +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.util.record import GeniRecord +from sfa.util.debug import log class get_credential(Method): """ diff --git a/geni/methods/get_resources.py b/sfa/methods/get_resources.py similarity index 84% rename from geni/methods/get_resources.py rename to sfa/methods/get_resources.py index 53873a7f..c56d2b29 100644 --- a/geni/methods/get_resources.py +++ b/sfa/methods/get_resources.py @@ -1,11 +1,11 @@ ### $Id$ ### $URL$ -from geni.util.faults import * -from geni.util.method import Method -from geni.util.parameter import Parameter, Mixed -from geni.util.auth import Auth -from geni.util.nodes import Nodes +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.util.nodes import Nodes class get_resources(Method): """ diff --git a/geni/methods/get_slices.py b/sfa/methods/get_slices.py similarity index 74% rename from geni/methods/get_slices.py rename to sfa/methods/get_slices.py index 1777c01b..a21f093a 100644 --- a/geni/methods/get_slices.py +++ b/sfa/methods/get_slices.py @@ -1,12 +1,12 @@ ### $Id$ ### $URL$ -from geni.util.faults import * -from geni.util.misc import * -from geni.util.method import Method -from geni.util.parameter import Parameter, Mixed -from geni.util.auth import Auth -from geni.util.slices import Slices +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.util.slices import Slices class get_slices(Method): """ diff --git a/geni/methods/get_ticket.py b/sfa/methods/get_ticket.py similarity index 92% rename from geni/methods/get_ticket.py rename to sfa/methods/get_ticket.py index 600bfeb8..fa7f6b69 100644 --- a/geni/methods/get_ticket.py +++ b/sfa/methods/get_ticket.py @@ -1,11 +1,11 @@ ### $Id$ ### $URL$ -from geni.util.faults import * -from geni.util.method import Method -from geni.util.parameter import Parameter, Mixed -from geni.util.auth import Auth -from geni.util.geniticket 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.util.geniticket import * class get_ticket(Method): """ diff --git a/geni/methods/list.py b/sfa/methods/list.py similarity index 85% rename from geni/methods/list.py rename to sfa/methods/list.py index 5307b8d4..b5e9b34c 100644 --- a/geni/methods/list.py +++ b/sfa/methods/list.py @@ -1,13 +1,13 @@ ### $Id$ ### $URL$ -from geni.util.faults import * -from geni.util.method import Method -from geni.util.parameter import Parameter, Mixed -from geni.util.auth import Auth -from geni.util.record import GeniRecord +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.util.record import GeniRecord -from geni.server.registry import Registries +from sfa.server.registry import Registries class list(Method): """ diff --git a/geni/methods/register.py b/sfa/methods/register.py similarity index 93% rename from geni/methods/register.py rename to sfa/methods/register.py index 11a42297..3fcc20a6 100644 --- a/geni/methods/register.py +++ b/sfa/methods/register.py @@ -1,16 +1,16 @@ ### $Id$ ### $URL$ -from geni.trust.certificate import Keypair, convert_public_key -from geni.trust.gid import * - -from geni.util.faults import * -from geni.util.misc import * -from geni.util.method import Method -from geni.util.parameter import Parameter, Mixed -from geni.util.auth import Auth -from geni.util.record import GeniRecord -from geni.util.debug import log +from sfa.trust.certificate import Keypair, convert_public_key +from sfa.trust.gid import * + +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.util.record import GeniRecord +from sfa.util.debug import log class register(Method): """ diff --git a/geni/methods/remove.py b/sfa/methods/remove.py similarity index 90% rename from geni/methods/remove.py rename to sfa/methods/remove.py index c824da91..59cc0af9 100644 --- a/geni/methods/remove.py +++ b/sfa/methods/remove.py @@ -1,12 +1,12 @@ ### $Id$ ### $URL$ -from geni.util.faults import * -from geni.util.method import Method -from geni.util.parameter import Parameter, Mixed -from geni.util.auth import Auth -from geni.util.record import GeniRecord -from geni.util.debug import log +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.util.record import GeniRecord +from sfa.util.debug import log class remove(Method): """ diff --git a/geni/methods/reset_slice.py b/sfa/methods/reset_slice.py similarity index 75% rename from geni/methods/reset_slice.py rename to sfa/methods/reset_slice.py index 813eb5ca..d4ae10e4 100644 --- a/geni/methods/reset_slice.py +++ b/sfa/methods/reset_slice.py @@ -1,12 +1,12 @@ ### $Id$ ### $URL$ -from geni.util.faults import * -from geni.util.misc import * -from geni.util.method import Method -from geni.util.parameter import Parameter, Mixed -from geni.util.auth import Auth -from geni.util.slices import Slices +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.util.slices import Slices class reset_slices(Method): """ diff --git a/geni/methods/resolve.py b/sfa/methods/resolve.py similarity index 87% rename from geni/methods/resolve.py rename to sfa/methods/resolve.py index 1772c956..f9d3223f 100644 --- a/geni/methods/resolve.py +++ b/sfa/methods/resolve.py @@ -1,14 +1,14 @@ ### $Id$ ### $URL$ -from geni.util.faults import * -from geni.util.method import Method -from geni.util.parameter import Parameter, Mixed -from geni.util.auth import Auth -from geni.util.record import GeniRecord -from geni.util.debug import log +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.util.record import GeniRecord +from sfa.util.debug import log -from geni.server.registry import Registries +from sfa.server.registry import Registries class resolve(Method): """ diff --git a/geni/methods/start_slice.py b/sfa/methods/start_slice.py similarity index 76% rename from geni/methods/start_slice.py rename to sfa/methods/start_slice.py index cb9be967..074e7de8 100644 --- a/geni/methods/start_slice.py +++ b/sfa/methods/start_slice.py @@ -1,12 +1,12 @@ ### $Id$ ### $URL$ -from geni.util.faults import * -from geni.util.misc import * -from geni.util.method import Method -from geni.util.parameter import Parameter, Mixed -from geni.util.auth import Auth -from geni.util.slices import Slices +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.util.slices import Slices class start_slice(Method): """ diff --git a/geni/methods/stop_slice.py b/sfa/methods/stop_slice.py similarity index 76% rename from geni/methods/stop_slice.py rename to sfa/methods/stop_slice.py index ffe1dea6..42ad6628 100644 --- a/geni/methods/stop_slice.py +++ b/sfa/methods/stop_slice.py @@ -1,12 +1,12 @@ ### $Id$ ### $URL$ -from geni.util.faults import * -from geni.util.misc import * -from geni.util.method import Method -from geni.util.parameter import Parameter, Mixed -from geni.util.auth import Auth -from geni.util.slices import Slices +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.util.slices import Slices class stop_slice(Method): """ diff --git a/geni/methods/update.py b/sfa/methods/update.py similarity index 93% rename from geni/methods/update.py rename to sfa/methods/update.py index 75cb1006..3c8edf1f 100644 --- a/geni/methods/update.py +++ b/sfa/methods/update.py @@ -1,12 +1,12 @@ ### $Id$ ### $URL$ -from geni.util.faults import * -from geni.util.method import Method -from geni.util.parameter import Parameter, Mixed -from geni.util.auth import Auth -from geni.util.record import GeniRecord -from geni.util.debug import log +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.util.record import GeniRecord +from sfa.util.debug import log class update(Method): """ diff --git a/geni/plc/sfa-import-plc.py b/sfa/plc/sfa-import-plc.py similarity index 97% rename from geni/plc/sfa-import-plc.py rename to sfa/plc/sfa-import-plc.py index 0163e8aa..e06eb3ac 100755 --- a/geni/plc/sfa-import-plc.py +++ b/sfa/plc/sfa-import-plc.py @@ -21,14 +21,14 @@ import getopt import sys import tempfile -from geni.trust.certificate import convert_public_key, Keypair -from geni.trust.trustedroot import * +from sfa.trust.certificate import convert_public_key, Keypair +from sfa.trust.trustedroot import * -from geni.util.hierarchy import * -from geni.util.record import * -from geni.util.genitable import * -from geni.util.misc import * -from geni.util.config import * +from sfa.util.hierarchy import * +from sfa.util.record import * +from sfa.util.genitable import * +from sfa.util.misc import * +from sfa.util.config import * # get PL account settings from config module pl_auth = get_pl_auth() @@ -41,7 +41,7 @@ def connect_shell(): # connect to planetlab if "Url" in pl_auth: - from geni.util import remoteshell + from sfa.util import remoteshell shell = remoteshell.RemoteShell() else: import PLC.Shell diff --git a/geni/server/aggregate.py b/sfa/server/aggregate.py similarity index 96% rename from geni/server/aggregate.py rename to sfa/server/aggregate.py index f90332db..696c9967 100644 --- a/geni/server/aggregate.py +++ b/sfa/server/aggregate.py @@ -8,10 +8,10 @@ import time import xmlrpclib from types import StringTypes, ListType -from geni.util.geniserver import GeniServer -from geni.util.geniclient import GeniClient -from geni.util.storage import * -from geni.util.faults import * +from sfa.util.geniserver import GeniServer +from sfa.util.geniclient import GeniClient +from sfa.util.storage import * +from sfa.util.faults import * # GeniLight client support is optional try: diff --git a/geni/server/registry.py b/sfa/server/registry.py similarity index 95% rename from geni/server/registry.py rename to sfa/server/registry.py index 7ab6346a..3b209ea8 100644 --- a/geni/server/registry.py +++ b/sfa/server/registry.py @@ -10,11 +10,11 @@ import os import time import sys -from geni.util.geniserver import GeniServer -from geni.util.geniclient import GeniClient -from geni.util.genitable import GeniTable -from geni.util.faults import * -from geni.util.storage import * +from sfa.util.geniserver import GeniServer +from sfa.util.geniclient import GeniClient +from sfa.util.genitable import GeniTable +from sfa.util.faults import * +from sfa.util.storage import * # GeniLight client support is optional try: diff --git a/geni/server/sfa-server.py b/sfa/server/sfa-server.py similarity index 93% rename from geni/server/sfa-server.py rename to sfa/server/sfa-server.py index aff696a8..3cd0370b 100644 --- a/geni/server/sfa-server.py +++ b/sfa/server/sfa-server.py @@ -37,15 +37,15 @@ slicemgr_port=12347 import os, os.path from optparse import OptionParser -from geni.trust.trustedroot import TrustedRootList -from geni.trust.certificate import Keypair, Certificate +from sfa.trust.trustedroot import TrustedRootList +from sfa.trust.certificate import Keypair, Certificate -from geni.server.registry import Registry -from geni.server.aggregate import Aggregate -from geni.server.slicemgr import SliceMgr +from sfa.server.registry import Registry +from sfa.server.aggregate import Aggregate +from sfa.server.slicemgr import SliceMgr -from geni.util.config import Config -from geni.util.hierarchy import Hierarchy +from sfa.util.config import Config +from sfa.util.hierarchy import Hierarchy # after http://www.erlenstar.demon.co.uk/unix/faq_2.html def daemon(): diff --git a/geni/server/slicemgr.py b/sfa/server/slicemgr.py similarity index 81% rename from geni/server/slicemgr.py rename to sfa/server/slicemgr.py index 64079020..d0782b58 100644 --- a/geni/server/slicemgr.py +++ b/sfa/server/slicemgr.py @@ -6,10 +6,10 @@ import sys import datetime import time -from geni.util.geniserver import * -from geni.util.geniclient import * -from geni.util.faults import * -from geni.util.misc import * +from sfa.util.geniserver import * +from sfa.util.geniclient import * +from sfa.util.faults import * +from sfa.util.misc import * class SliceMgr(GeniServer): diff --git a/geni/trust/certificate.py b/sfa/trust/certificate.py similarity index 99% rename from geni/trust/certificate.py rename to sfa/trust/certificate.py index 77797a9b..e9b7561f 100644 --- a/geni/trust/certificate.py +++ b/sfa/trust/certificate.py @@ -23,11 +23,11 @@ import M2Crypto from M2Crypto import X509 from M2Crypto import EVP -from geni.util.faults import * +from sfa.util.faults import * def convert_public_key(key): # find the keyconvert program - from geni.util.config import Config + from sfa.util.config import Config config = Config() keyconvert = 'keyconvert' loaded = False diff --git a/geni/trust/credential.py b/sfa/trust/credential.py similarity index 98% rename from geni/trust/credential.py rename to sfa/trust/credential.py index 04c16052..8515e314 100644 --- a/geni/trust/credential.py +++ b/sfa/trust/credential.py @@ -10,9 +10,9 @@ import xmlrpclib -from geni.trust.certificate import Certificate -from geni.trust.rights import * -from geni.trust.gid import * +from sfa.trust.certificate import Certificate +from sfa.trust.rights import * +from sfa.trust.gid import * ## # Credential is a tuple: diff --git a/geni/trust/gid.py b/sfa/trust/gid.py similarity index 98% rename from geni/trust/gid.py rename to sfa/trust/gid.py index d744cf9c..6c0436c4 100644 --- a/geni/trust/gid.py +++ b/sfa/trust/gid.py @@ -9,7 +9,7 @@ import xmlrpclib import uuid -from geni.trust.certificate import Certificate +from sfa.trust.certificate import Certificate ## # Create a new uuid. Returns the UUID as a string. diff --git a/geni/trust/rights.py b/sfa/trust/rights.py similarity index 100% rename from geni/trust/rights.py rename to sfa/trust/rights.py diff --git a/geni/trust/trusted_certs/plc_ca.crt b/sfa/trust/trusted_certs/plc_ca.crt similarity index 100% rename from geni/trust/trusted_certs/plc_ca.crt rename to sfa/trust/trusted_certs/plc_ca.crt diff --git a/geni/trust/trusted_certs/ple_ca.crt b/sfa/trust/trusted_certs/ple_ca.crt similarity index 100% rename from geni/trust/trusted_certs/ple_ca.crt rename to sfa/trust/trusted_certs/ple_ca.crt diff --git a/geni/trust/trustedroot.py b/sfa/trust/trustedroot.py similarity index 93% rename from geni/trust/trustedroot.py rename to sfa/trust/trustedroot.py index 6b131b02..9940d58b 100644 --- a/geni/trust/trustedroot.py +++ b/sfa/trust/trustedroot.py @@ -3,8 +3,8 @@ import os -from geni.trust.gid import * -from geni.util.config import Config +from sfa.trust.gid import * +from sfa.util.config import Config class TrustedRootList(): def __init__(self, dir=None): diff --git a/geni/util/api.py b/sfa/util/api.py similarity index 97% rename from geni/util/api.py rename to sfa/util/api.py index 3acfbf99..b254ee80 100644 --- a/geni/util/api.py +++ b/sfa/util/api.py @@ -11,13 +11,13 @@ import traceback import string import xmlrpclib -from geni.util.auth import Auth -from geni.util.config import * -from geni.util.faults import * -from geni.util.debug import * -from geni.trust.rights import * -from geni.trust.credential import * -from geni.util.misc import * +from sfa.util.auth import Auth +from sfa.util.config import * +from sfa.util.faults import * +from sfa.util.debug import * +from sfa.trust.rights import * +from sfa.trust.credential import * +from sfa.util.misc import * # See "2.2 Characters" in the XML specification: # @@ -97,8 +97,8 @@ def import_deep(name): class GeniAPI: # flat list of method names - import geni.methods - methods = geni.methods.all + import sfa.methods + methods = sfa.methods.all def __init__(self, config = "/etc/sfa/sfa_config", encoding = "utf-8", peer_cert = None, interface = None, key_file = None, cert_file = None): @@ -174,7 +174,7 @@ class GeniAPI: credential = Credential(filename = cred_filename) return credential except IOError: - from geni.server.registry import Registries + from sfa.server.registry import Registries registries = Registries(self) registry = registries[self.hrn] self_cred = registry.get_credential(None, type, self.hrn) @@ -475,7 +475,7 @@ class GeniAPI: # Get new instance of method try: classname = method.split(".")[-1] - module = __import__("geni.methods." + method, globals(), locals(), [classname]) + module = __import__("sfa.methods." + method, globals(), locals(), [classname]) callablemethod = getattr(module, classname)(self) return getattr(module, classname)(self) except ImportError, AttributeError: diff --git a/geni/util/auth.py b/sfa/util/auth.py similarity index 96% rename from geni/util/auth.py rename to sfa/util/auth.py index 3ea85651..21ac1049 100644 --- a/geni/util/auth.py +++ b/sfa/util/auth.py @@ -7,14 +7,14 @@ import time -from geni.trust.credential import Credential -from geni.trust.trustedroot import TrustedRootList -from geni.trust.rights import RightList -from geni.util.faults import * -from geni.util.hierarchy import Hierarchy -from geni.util.genitable import * -from geni.util.config import * -from geni.util.misc import * +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.util.genitable import * +from sfa.util.config import * +from sfa.util.misc import * class Auth: """ diff --git a/geni/util/config.py b/sfa/util/config.py similarity index 99% rename from geni/util/config.py rename to sfa/util/config.py index 32de3503..cef2fdd8 100644 --- a/geni/util/config.py +++ b/sfa/util/config.py @@ -20,7 +20,7 @@ import os.path import traceback -from geni.util.debug import log +from sfa.util.debug import log # xxx the path-search part could use a cleanup; # why would anyone want to store the config in /usr/share/geniwrapper at all ? diff --git a/geni/util/debug.py b/sfa/util/debug.py similarity index 100% rename from geni/util/debug.py rename to sfa/util/debug.py diff --git a/geni/util/faults.py b/sfa/util/faults.py similarity index 100% rename from geni/util/faults.py rename to sfa/util/faults.py diff --git a/geni/util/geniclient.py b/sfa/util/geniclient.py similarity index 98% rename from geni/util/geniclient.py rename to sfa/util/geniclient.py index 6fbd2068..00553ffa 100644 --- a/geni/util/geniclient.py +++ b/sfa/util/geniclient.py @@ -11,10 +11,10 @@ import xmlrpclib -from geni.trust.gid import * -from geni.trust.credential import * -from geni.util.record import * -from geni.util.geniticket import * +from sfa.trust.gid import * +from sfa.trust.credential import * +from sfa.util.record import * +from sfa.util.geniticket import * ## # ServerException, ExceptionUnmarshaller diff --git a/geni/util/geniserver.py b/sfa/util/geniserver.py similarity index 96% rename from geni/util/geniserver.py rename to sfa/util/geniserver.py index b1dd436e..1a7307dd 100644 --- a/geni/util/geniserver.py +++ b/sfa/util/geniserver.py @@ -1,5 +1,5 @@ ## -# This module implements a general-purpose server layer for geni. +# This module implements a general-purpose server layer for sfa. # The same basic server should be usable on the registry, component, or # other interfaces. # @@ -21,12 +21,12 @@ import SimpleXMLRPCServer from OpenSSL import SSL -from geni.trust.certificate import Keypair, Certificate -from geni.trust.credential import * +from sfa.trust.certificate import Keypair, Certificate +from sfa.trust.credential import * -from geni.util.faults import * -from geni.util.api import GeniAPI -from geni.util.debug import log +from sfa.util.faults import * +from sfa.util.api import GeniAPI +from sfa.util.debug import log ## # Verification callback for pyOpenSSL. We do our own checking of keys because diff --git a/geni/util/genitable.py b/sfa/util/genitable.py similarity index 98% rename from geni/util/genitable.py rename to sfa/util/genitable.py index 7a861fd4..d814c0f3 100644 --- a/geni/util/genitable.py +++ b/sfa/util/genitable.py @@ -11,9 +11,9 @@ import report from pg import DB, ProgrammingError -from geni.trust.gid import * -from geni.util.record import * -from geni.util.debug import * +from sfa.trust.gid import * +from sfa.util.record import * +from sfa.util.debug import * GENI_TABLE_PREFIX = "geni$" diff --git a/geni/util/geniticket.py b/sfa/util/geniticket.py similarity index 96% rename from geni/util/geniticket.py rename to sfa/util/geniticket.py index 0c9d2c62..42435c8d 100644 --- a/geni/util/geniticket.py +++ b/sfa/util/geniticket.py @@ -8,9 +8,9 @@ import xmlrpclib -from geni.trust.certificate import Certificate -from geni.trust.rights import * -from geni.trust.gid import * +from sfa.trust.certificate import Certificate +from sfa.trust.rights import * +from sfa.trust.gid import * # Ticket is tuple: # (gidCaller, gidObject, attributes, rspec, delegate) diff --git a/geni/util/hierarchy.py b/sfa/util/hierarchy.py similarity index 98% rename from geni/util/hierarchy.py rename to sfa/util/hierarchy.py index e33874a4..f3a5a085 100644 --- a/geni/util/hierarchy.py +++ b/sfa/util/hierarchy.py @@ -18,13 +18,13 @@ import os import report -from geni.trust.certificate import Keypair -from geni.trust.credential import * -from geni.trust.gid import * +from sfa.trust.certificate import Keypair +from sfa.trust.credential import * +from sfa.trust.gid import * -from geni.util.misc import * -from geni.util.config import * -from geni.util.geniticket import * +from sfa.util.misc import * +from sfa.util.config import * +from sfa.util.geniticket import * ## # The AuthInfo class contains the information for an authority. This information diff --git a/geni/util/method.py b/sfa/util/method.py similarity index 98% rename from geni/util/method.py rename to sfa/util/method.py index c7363860..e7a12d86 100644 --- a/geni/util/method.py +++ b/sfa/util/method.py @@ -15,10 +15,10 @@ import pprint from types import StringTypes -from geni.util.faults import * -from geni.util.parameter import Parameter, Mixed, python_type, xmlrpc_type -from geni.util.auth import Auth -from geni.util.debug import profile, log +from sfa.util.faults import * +from sfa.util.parameter import Parameter, Mixed, python_type, xmlrpc_type +from sfa.util.auth import Auth +from sfa.util.debug import profile, log # we inherit object because we use new-style classes for legacy methods class Method (object): diff --git a/geni/util/misc.py b/sfa/util/misc.py similarity index 97% rename from geni/util/misc.py rename to sfa/util/misc.py index 445e0a3d..e1320df8 100644 --- a/geni/util/misc.py +++ b/sfa/util/misc.py @@ -1,7 +1,7 @@ ### $Id$ ### $URL$ -from geni.util.faults import * +from sfa.util.faults import * def get_leaf(hrn): parts = hrn.split(".") diff --git a/geni/util/nodes.py b/sfa/util/nodes.py similarity index 96% rename from geni/util/nodes.py rename to sfa/util/nodes.py index 6f4a9b1c..884bf8f7 100644 --- a/geni/util/nodes.py +++ b/sfa/util/nodes.py @@ -7,16 +7,16 @@ import datetime import sys import traceback -from geni.util.misc import * -from geni.util.rspec import * -from geni.util.specdict import * -from geni.util.faults import * -from geni.util.storage import * -from geni.util.debug import log -from geni.util.rspec import * -from geni.util.specdict import * -from geni.util.policy import Policy -from geni.server.aggregate import Aggregates +from sfa.util.misc import * +from sfa.util.rspec import * +from sfa.util.specdict import * +from sfa.util.faults import * +from sfa.util.storage import * +from sfa.util.debug import log +from sfa.util.rspec import * +from sfa.util.specdict import * +from sfa.util.policy import Policy +from sfa.server.aggregate import Aggregates class Nodes(SimpleStorage): diff --git a/geni/util/parameter.py b/sfa/util/parameter.py similarity index 98% rename from geni/util/parameter.py rename to sfa/util/parameter.py index 37b25fca..fb45bd1b 100644 --- a/geni/util/parameter.py +++ b/sfa/util/parameter.py @@ -11,7 +11,7 @@ ### $URL$ from types import * -from geni.util.faults import * +from sfa.util.faults import * class Parameter: """ diff --git a/geni/util/policy.py b/sfa/util/policy.py similarity index 90% rename from geni/util/policy.py rename to sfa/util/policy.py index 62ce145e..b673132e 100644 --- a/geni/util/policy.py +++ b/sfa/util/policy.py @@ -3,8 +3,8 @@ import os -from geni.util.storage import * -from geni.util.debug import log +from sfa.util.storage import * +from sfa.util.debug import log class Policy(SimpleStorage): diff --git a/geni/util/record.py b/sfa/util/record.py similarity index 99% rename from geni/util/record.py rename to sfa/util/record.py index 27b6c83d..8575f018 100644 --- a/geni/util/record.py +++ b/sfa/util/record.py @@ -9,11 +9,11 @@ from types import StringTypes -import geni.util.report +from sfa.trust.gid import * -from geni.trust.gid import * -from geni.util.rspec import * -from geni.util.parameter import * +import sfa.util.report +from sfa.util.rspec import * +from sfa.util.parameter import * class GeniRecord(dict): """ diff --git a/geni/util/remoteshell.py b/sfa/util/remoteshell.py similarity index 100% rename from geni/util/remoteshell.py rename to sfa/util/remoteshell.py diff --git a/geni/util/report.py b/sfa/util/report.py similarity index 100% rename from geni/util/report.py rename to sfa/util/report.py diff --git a/geni/util/rspec.py b/sfa/util/rspec.py similarity index 100% rename from geni/util/rspec.py rename to sfa/util/rspec.py diff --git a/geni/util/slices.py b/sfa/util/slices.py similarity index 97% rename from geni/util/slices.py rename to sfa/util/slices.py index 97171d70..12d4084f 100644 --- a/geni/util/slices.py +++ b/sfa/util/slices.py @@ -4,15 +4,15 @@ import datetime import time -from geni.util.misc import * -from geni.util.rspec import * -from geni.util.specdict import * -from geni.util.faults import * -from geni.util.storage import * -from geni.util.policy import Policy -from geni.util.debug import log -from geni.server.aggregate import Aggregates -from geni.server.registry import Registries +from sfa.util.misc import * +from sfa.util.rspec import * +from sfa.util.specdict import * +from sfa.util.faults import * +from sfa.util.storage import * +from sfa.util.policy import Policy +from sfa.util.debug import log +from sfa.server.aggregate import Aggregates +from sfa.server.registry import Registries class Slices(SimpleStorage): diff --git a/geni/util/specdict.py b/sfa/util/specdict.py similarity index 100% rename from geni/util/specdict.py rename to sfa/util/specdict.py diff --git a/geni/util/storage.py b/sfa/util/storage.py similarity index 98% rename from geni/util/storage.py rename to sfa/util/storage.py index 9eef1e99..95ed8f58 100644 --- a/geni/util/storage.py +++ b/sfa/util/storage.py @@ -3,7 +3,7 @@ import os -from geni.util.rspec import RecordSpec +from sfa.util.rspec import RecordSpec class SimpleStorage(dict): """ diff --git a/tests/client/testAggregate.py b/tests/client/testAggregate.py index 1c0d437e..e2bf7efd 100644 --- a/tests/client/testAggregate.py +++ b/tests/client/testAggregate.py @@ -1,7 +1,7 @@ from pprint import pprint -from geni.util.geniclient import * -from geni.trust.credential import * +from sfa.util.geniclient import * +from sfa.trust.credential import * cred = Credential(filename = 'tmack.pl.sa.cred') slicehrn = 'planetlab.us.pl.tmack' diff --git a/tests/testCert.py b/tests/testCert.py index 0b835257..0a6a90c4 100755 --- a/tests/testCert.py +++ b/tests/testCert.py @@ -1,6 +1,6 @@ import unittest import xmlrpclib -from geni.trust.certificate import Certificate, Keypair +from sfa.trust.certificate import Certificate, Keypair class TestCert(unittest.TestCase): def setUp(self): diff --git a/tests/testCred.py b/tests/testCred.py index 1de98381..68c9b743 100755 --- a/tests/testCred.py +++ b/tests/testCred.py @@ -1,7 +1,7 @@ import unittest -from geni.trust.credential import * -from geni.trust.rights import * -from geni.trust.gid import * +from sfa.trust.credential import * +from sfa.trust.rights import * +from sfa.trust.gid import * class TestCred(unittest.TestCase): def setUp(self): diff --git a/tests/testGid.py b/tests/testGid.py index 67c113b7..33406f51 100755 --- a/tests/testGid.py +++ b/tests/testGid.py @@ -1,7 +1,7 @@ import unittest import xmlrpclib -from geni.trust.certificate import Keypair -from geni.trust.gid import * +from sfa.trust.certificate import Keypair +from sfa.trust.gid import * class TestGid(unittest.TestCase): def setUp(self): diff --git a/tests/testHierarchy.py b/tests/testHierarchy.py index 78e53c10..a8494bbc 100755 --- a/tests/testHierarchy.py +++ b/tests/testHierarchy.py @@ -1,8 +1,8 @@ import unittest import os -from geni.util.faults import * -from geni.util.hierarchy import * -from geni.util.config import * +from sfa.util.faults import * +from sfa.util.hierarchy import * +from sfa.util.config import * BASEDIR = "test_hierarchy" PURGE_BASEDIR = "rm -rf test_hierarchy" diff --git a/tests/testKeypair.py b/tests/testKeypair.py index f4c5c4e2..ebe1edec 100755 --- a/tests/testKeypair.py +++ b/tests/testKeypair.py @@ -5,7 +5,7 @@ sys.path.append('..') import unittest import xmlrpclib import base64 -from geni.trust.certificate import Keypair +from sfa.trust.certificate import Keypair class TestKeypair(unittest.TestCase): def setUp(self): diff --git a/tests/testMisc.py b/tests/testMisc.py index 20bf1fd8..831d9495 100755 --- a/tests/testMisc.py +++ b/tests/testMisc.py @@ -1,5 +1,5 @@ import unittest -from geni.util.misc import * +from sfa.util.misc import * class TestMisc(unittest.TestCase): def setUp(self): diff --git a/tests/testRecord.py b/tests/testRecord.py index 61561547..8370f081 100755 --- a/tests/testRecord.py +++ b/tests/testRecord.py @@ -1,8 +1,8 @@ import unittest import xmlrpclib -from geni.trust.gid import * -from geni.trust.config import * -from geni.util.record import * +from sfa.trust.gid import * +from sfa.trust.config import * +from sfa.util.record import * class TestRecord(unittest.TestCase): def setUp(self): diff --git a/tests/testRights.py b/tests/testRights.py index 2479d4a8..a67a25ff 100755 --- a/tests/testRights.py +++ b/tests/testRights.py @@ -1,5 +1,5 @@ import unittest -from geni.trust.rights import * +from sfa.trust.rights import * class TestRight(unittest.TestCase): def setUp(self): diff --git a/wsdl/apistub.py b/wsdl/apistub.py index fdd96bc4..198883f0 100644 --- a/wsdl/apistub.py +++ b/wsdl/apistub.py @@ -1,11 +1,11 @@ -import geni.methods +import sfa.methods -methods = geni.methods.all +methods = sfa.methods.all def callable(method): classname = method.split(".")[-1] - module = __import__("geni.methods." + method, globals(), locals(), [classname]) + module = __import__("sfa.methods." + method, globals(), locals(), [classname]) callablemethod = getattr(module, classname)(None) return getattr(module, classname)(None) diff --git a/wsdl/gw2wsdl.py b/wsdl/gw2wsdl.py index 257cd69d..15aa6734 100755 --- a/wsdl/gw2wsdl.py +++ b/wsdl/gw2wsdl.py @@ -16,8 +16,8 @@ import globals import apistub from types import * -from geni.util.auth import Auth -from geni.util.parameter import Parameter,Mixed +from sfa.util.auth import Auth +from sfa.util.parameter import Parameter,Mixed complex_types = {} services = {} -- 2.43.0