########## 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
@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
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
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",
'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
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
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',
else:
# avoid repeating what's in the specfile already
- setup(name='geni',
+ setup(name='sfa',
packages = package_dirs,
data_files = data_files,
ext_modules = [],
# 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]
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)
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]
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():
from optparse import OptionParser
from pprint import pprint
-from geni.util.rspec import RecordSpec
+from sfa.util.rspec import RecordSpec
def create_parser():
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
### $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):
"""
### $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):
"""
### $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):
"""
### $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):
"""
### $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):
"""
### $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):
"""
### $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):
"""
### $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):
"""
### $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):
"""
### $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):
"""
### $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):
"""
### $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):
"""
### $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):
"""
### $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):
"""
### $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):
"""
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()
# 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
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:
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:
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():
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):
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
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:
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.
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):
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:
#
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):
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)
# 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:
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:
"""
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 ?
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
##
-# 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.
#
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
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$"
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)
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
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):
### $Id$
### $URL$
-from geni.util.faults import *
+from sfa.util.faults import *
def get_leaf(hrn):
parts = hrn.split(".")
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):
### $URL$
from types import *
-from geni.util.faults import *
+from sfa.util.faults import *
class Parameter:
"""
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):
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):
"""
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):
import os
-from geni.util.rspec import RecordSpec
+from sfa.util.rspec import RecordSpec
class SimpleStorage(dict):
"""
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'
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):
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):
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):
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"
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):
import unittest
-from geni.util.misc import *
+from sfa.util.misc import *
class TestMisc(unittest.TestCase):
def setUp(self):
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):
import unittest
-from geni.trust.rights import *
+from sfa.trust.rights import *
class TestRight(unittest.TestCase):
def setUp(self):
-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)
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 = {}
git://git.onelab.eu / sfa.git / commitdiff