git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
095e10f
)
renaming the toplevel geni/ package into sfa/
author
Thierry Parmentelat
<thierry.parmentelat@sophia.inria.fr>
Fri, 3 Jul 2009 14:40:59 +0000
(14:40 +0000)
committer
Thierry Parmentelat
<thierry.parmentelat@sophia.inria.fr>
Fri, 3 Jul 2009 14:40:59 +0000
(14:40 +0000)
73 files changed:
Makefile
patch
|
blob
|
history
component/component.py
patch
|
blob
|
history
config/sfa-config-tty
patch
|
blob
|
history
geniwrapper.spec
patch
|
blob
|
history
setup.py
patch
|
blob
|
history
sfa/Makefile
[moved from
geni/Makefile
with 100% similarity]
patch
|
blob
|
history
sfa/client/genidump.py
[moved from
geni/client/genidump.py
with 89% similarity]
patch
|
blob
|
history
sfa/client/getNodes.py
[moved from
geni/client/getNodes.py
with 98% similarity]
patch
|
blob
|
history
sfa/client/getRecord.py
[moved from
geni/client/getRecord.py
with 98% similarity]
patch
|
blob
|
history
sfa/client/setRecord.py
[moved from
geni/client/setRecord.py
with 98% similarity]
patch
|
blob
|
history
sfa/client/sfi.py
[moved from
geni/client/sfi.py
with 98% similarity]
patch
|
blob
|
history
sfa/init.d/sfa
[moved from
geni/init.d/sfa
with 100% similarity]
patch
|
blob
|
history
sfa/methods/__init__.py
[moved from
geni/methods/__init__.py
with 100% similarity]
patch
|
blob
|
history
sfa/methods/create_gid.py
[moved from
geni/methods/create_gid.py
with 88% similarity]
patch
|
blob
|
history
sfa/methods/create_slice.py
[moved from
geni/methods/create_slice.py
with 80% similarity]
patch
|
blob
|
history
sfa/methods/delete_slice.py
[moved from
geni/methods/delete_slice.py
with 76% similarity]
patch
|
blob
|
history
sfa/methods/get_credential.py
[moved from
geni/methods/get_credential.py
with 94% similarity]
patch
|
blob
|
history
sfa/methods/get_resources.py
[moved from
geni/methods/get_resources.py
with 84% similarity]
patch
|
blob
|
history
sfa/methods/get_slices.py
[moved from
geni/methods/get_slices.py
with 74% similarity]
patch
|
blob
|
history
sfa/methods/get_ticket.py
[moved from
geni/methods/get_ticket.py
with 92% similarity]
patch
|
blob
|
history
sfa/methods/list.py
[moved from
geni/methods/list.py
with 85% similarity]
patch
|
blob
|
history
sfa/methods/register.py
[moved from
geni/methods/register.py
with 93% similarity]
patch
|
blob
|
history
sfa/methods/remove.py
[moved from
geni/methods/remove.py
with 90% similarity]
patch
|
blob
|
history
sfa/methods/reset_slice.py
[moved from
geni/methods/reset_slice.py
with 75% similarity]
patch
|
blob
|
history
sfa/methods/resolve.py
[moved from
geni/methods/resolve.py
with 87% similarity]
patch
|
blob
|
history
sfa/methods/start_slice.py
[moved from
geni/methods/start_slice.py
with 76% similarity]
patch
|
blob
|
history
sfa/methods/stop_slice.py
[moved from
geni/methods/stop_slice.py
with 76% similarity]
patch
|
blob
|
history
sfa/methods/update.py
[moved from
geni/methods/update.py
with 93% similarity]
patch
|
blob
|
history
sfa/plc/sfa-import-plc.py
[moved from
geni/plc/sfa-import-plc.py
with 97% similarity]
patch
|
blob
|
history
sfa/server/aggregate.py
[moved from
geni/server/aggregate.py
with 96% similarity]
patch
|
blob
|
history
sfa/server/registry.py
[moved from
geni/server/registry.py
with 95% similarity]
patch
|
blob
|
history
sfa/server/sfa-server.py
[moved from
geni/server/sfa-server.py
with 93% similarity]
patch
|
blob
|
history
sfa/server/slicemgr.py
[moved from
geni/server/slicemgr.py
with 81% similarity]
patch
|
blob
|
history
sfa/trust/certificate.py
[moved from
geni/trust/certificate.py
with 99% similarity]
patch
|
blob
|
history
sfa/trust/credential.py
[moved from
geni/trust/credential.py
with 98% similarity]
patch
|
blob
|
history
sfa/trust/gid.py
[moved from
geni/trust/gid.py
with 98% similarity]
patch
|
blob
|
history
sfa/trust/rights.py
[moved from
geni/trust/rights.py
with 100% similarity]
patch
|
blob
|
history
sfa/trust/trusted_certs/plc_ca.crt
[moved from
geni/trust/trusted_certs/plc_ca.crt
with 100% similarity]
patch
|
blob
|
history
sfa/trust/trusted_certs/ple_ca.crt
[moved from
geni/trust/trusted_certs/ple_ca.crt
with 100% similarity]
patch
|
blob
|
history
sfa/trust/trustedroot.py
[moved from
geni/trust/trustedroot.py
with 93% similarity]
patch
|
blob
|
history
sfa/util/api.py
[moved from
geni/util/api.py
with 97% similarity]
patch
|
blob
|
history
sfa/util/auth.py
[moved from
geni/util/auth.py
with 96% similarity]
patch
|
blob
|
history
sfa/util/config.py
[moved from
geni/util/config.py
with 99% similarity]
patch
|
blob
|
history
sfa/util/debug.py
[moved from
geni/util/debug.py
with 100% similarity]
patch
|
blob
|
history
sfa/util/faults.py
[moved from
geni/util/faults.py
with 100% similarity]
patch
|
blob
|
history
sfa/util/geniclient.py
[moved from
geni/util/geniclient.py
with 98% similarity]
patch
|
blob
|
history
sfa/util/geniserver.py
[moved from
geni/util/geniserver.py
with 96% similarity]
patch
|
blob
|
history
sfa/util/genitable.py
[moved from
geni/util/genitable.py
with 98% similarity]
patch
|
blob
|
history
sfa/util/geniticket.py
[moved from
geni/util/geniticket.py
with 96% similarity]
patch
|
blob
|
history
sfa/util/hierarchy.py
[moved from
geni/util/hierarchy.py
with 98% similarity]
patch
|
blob
|
history
sfa/util/method.py
[moved from
geni/util/method.py
with 98% similarity]
patch
|
blob
|
history
sfa/util/misc.py
[moved from
geni/util/misc.py
with 97% similarity]
patch
|
blob
|
history
sfa/util/nodes.py
[moved from
geni/util/nodes.py
with 96% similarity]
patch
|
blob
|
history
sfa/util/parameter.py
[moved from
geni/util/parameter.py
with 98% similarity]
patch
|
blob
|
history
sfa/util/policy.py
[moved from
geni/util/policy.py
with 90% similarity]
patch
|
blob
|
history
sfa/util/record.py
[moved from
geni/util/record.py
with 99% similarity]
patch
|
blob
|
history
sfa/util/remoteshell.py
[moved from
geni/util/remoteshell.py
with 100% similarity]
patch
|
blob
|
history
sfa/util/report.py
[moved from
geni/util/report.py
with 100% similarity]
patch
|
blob
|
history
sfa/util/rspec.py
[moved from
geni/util/rspec.py
with 100% similarity]
patch
|
blob
|
history
sfa/util/slices.py
[moved from
geni/util/slices.py
with 97% similarity]
patch
|
blob
|
history
sfa/util/specdict.py
[moved from
geni/util/specdict.py
with 100% similarity]
patch
|
blob
|
history
sfa/util/storage.py
[moved from
geni/util/storage.py
with 98% similarity]
patch
|
blob
|
history
tests/client/testAggregate.py
patch
|
blob
|
history
tests/testCert.py
patch
|
blob
|
history
tests/testCred.py
patch
|
blob
|
history
tests/testGid.py
patch
|
blob
|
history
tests/testHierarchy.py
patch
|
blob
|
history
tests/testKeypair.py
patch
|
blob
|
history
tests/testMisc.py
patch
|
blob
|
history
tests/testRecord.py
patch
|
blob
|
history
tests/testRights.py
patch
|
blob
|
history
wsdl/apistub.py
patch
|
blob
|
history
wsdl/gw2wsdl.py
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
db8c480
..
57c74ce
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-46,7
+46,7
@@
tags:
########## indexes
subdirs = client methods plc server trust util
########## 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
force:
.PHONY: force
@@
-87,9
+87,9
@@
ifeq (,$(SSHURL))
@echo " or make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr"
@exit 1
else
@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
+$(RSYNC) ./config/sfa-config-tty $(SSHURL)/usr/bin
- $(SSHCOMMAND) exec service
geni
restart
+ $(SSHCOMMAND) exec service
sfa
restart
endif
.PHONY: sync
endif
.PHONY: sync
diff --git
a/component/component.py
b/component/component.py
index
bb80d02
..
fc8283e
100644
(file)
--- a/
component/component.py
+++ b/
component/component.py
@@
-10,15
+10,15
@@
import os
import sys
from xmlrpclib import ServerProxy
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
##
# ComponentManager is a GeniServer that serves slice and
diff --git
a/config/sfa-config-tty
b/config/sfa-config-tty
index
208eca5
..
2031acd
100755
(executable)
--- a/
config/sfa-config-tty
+++ b/
config/sfa-config-tty
@@
-19,9
+19,9
@@
import traceback
import distutils.file_util
from optparse import OptionParser
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",
all_variables = ["GENI_REGISTRY_ROOT_AUTH",
@@
-133,7
+133,7
@@
def get_defaults():
'PLC_API_MAINTENANCE_USER': 'GENI_PLC_USER'
}
try:
'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
plc_config = plcConfig
except:
plc_config = None
diff --git
a/geniwrapper.spec
b/geniwrapper.spec
index
2fb5970
..
f7f352b
100644
(file)
--- a/
geniwrapper.spec
+++ b/
geniwrapper.spec
@@
-26,28
+26,28
@@
Requires: python
Requires: pyOpenSSL >= 0.7
Requires: m2crypto
Requires: pyOpenSSL >= 0.7
Requires: m2crypto
-Summary: the
GENI
python libraries
+Summary: the
SFA
python libraries
Group: Applications/System
%package plc
Group: Applications/System
%package plc
-Summary: the
GENI
wrapper arounf MyPLC
+Summary: the
SFA
wrapper arounf MyPLC
Group: Applications/System
Requires: sfa
%package client
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
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
%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
%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
sfi.py, together with other utilities.
%prep
diff --git
a/setup.py
b/setup.py
index
2d35896
..
3f4e729
100755
(executable)
--- a/
setup.py
+++ b/
setup.py
@@
-9,36
+9,36
@@
import shutil
from distutils.core import setup
scripts = [ 'config/sfa-config-tty',
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',
]),
]
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' ] ),
]
('/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
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',
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
else:
# avoid repeating what's in the specfile already
- setup(name='
geni
',
+ setup(name='
sfa
',
packages = package_dirs,
data_files = data_files,
ext_modules = [],
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
# 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]
# 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
8c3be7d
..
e2bcd92
100644
(file)
--- 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 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)
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
6e321f8
..
4d34a43
100644
(file)
--- 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 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]
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
fc6b3db
..
546e90a
100755
(executable)
--- 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 pprint import pprint
from xml.parsers.expat import ExpatError
-from
geni
.util.rspec import RecordSpec
+from
sfa
.util.rspec import RecordSpec
def create_parser():
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
508bb3e
..
0d7dd16
100755
(executable)
--- 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 optparse import OptionParser
from pprint import pprint
-from
geni
.util.rspec import RecordSpec
+from
sfa
.util.rspec import RecordSpec
def create_parser():
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
43bbb98
..
d3c320f
100755
(executable)
--- 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 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
# 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
e4560b4
..
1b6a94b
100644
(file)
--- a/
geni/methods/create_gid.py
+++ b/
sfa/methods/create_gid.py
@@
-1,12
+1,12
@@
### $Id$
### $URL$
### $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):
"""
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
8b8cffe
..
8710c6f
100644
(file)
--- a/
geni/methods/create_slice.py
+++ b/
sfa/methods/create_slice.py
@@
-1,12
+1,12
@@
### $Id$
### $URL$
### $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):
"""
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
187939e
..
3f065b7
100644
(file)
--- a/
geni/methods/delete_slice.py
+++ b/
sfa/methods/delete_slice.py
@@
-1,13
+1,13
@@
### $Id$
### $URL$
### $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):
"""
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
aa9b25f
..
c67831b
100644
(file)
--- a/
geni/methods/get_credential.py
+++ b/
sfa/methods/get_credential.py
@@
-1,14
+1,14
@@
### $Id$
### $URL$
### $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):
"""
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
53873a7
..
c56d2b2
100644
(file)
--- a/
geni/methods/get_resources.py
+++ b/
sfa/methods/get_resources.py
@@
-1,11
+1,11
@@
### $Id$
### $URL$
### $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):
"""
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
1777c01
..
a21f093
100644
(file)
--- a/
geni/methods/get_slices.py
+++ b/
sfa/methods/get_slices.py
@@
-1,12
+1,12
@@
### $Id$
### $URL$
### $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):
"""
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
600bfeb
..
fa7f6b6
100644
(file)
--- a/
geni/methods/get_ticket.py
+++ b/
sfa/methods/get_ticket.py
@@
-1,11
+1,11
@@
### $Id$
### $URL$
### $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):
"""
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
5307b8d
..
b5e9b34
100644
(file)
--- a/
geni/methods/list.py
+++ b/
sfa/methods/list.py
@@
-1,13
+1,13
@@
### $Id$
### $URL$
### $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):
"""
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
11a4229
..
3fcc20a
100644
(file)
--- a/
geni/methods/register.py
+++ b/
sfa/methods/register.py
@@
-1,16
+1,16
@@
### $Id$
### $URL$
### $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):
"""
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
c824da9
..
59cc0af
100644
(file)
--- a/
geni/methods/remove.py
+++ b/
sfa/methods/remove.py
@@
-1,12
+1,12
@@
### $Id$
### $URL$
### $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):
"""
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
813eb5c
..
d4ae10e
100644
(file)
--- a/
geni/methods/reset_slice.py
+++ b/
sfa/methods/reset_slice.py
@@
-1,12
+1,12
@@
### $Id$
### $URL$
### $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):
"""
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
1772c95
..
f9d3223
100644
(file)
--- a/
geni/methods/resolve.py
+++ b/
sfa/methods/resolve.py
@@
-1,14
+1,14
@@
### $Id$
### $URL$
### $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):
"""
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
cb9be96
..
074e7de
100644
(file)
--- a/
geni/methods/start_slice.py
+++ b/
sfa/methods/start_slice.py
@@
-1,12
+1,12
@@
### $Id$
### $URL$
### $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):
"""
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
ffe1dea
..
42ad662
100644
(file)
--- a/
geni/methods/stop_slice.py
+++ b/
sfa/methods/stop_slice.py
@@
-1,12
+1,12
@@
### $Id$
### $URL$
### $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):
"""
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
75cb100
..
3c8edf1
100644
(file)
--- a/
geni/methods/update.py
+++ b/
sfa/methods/update.py
@@
-1,12
+1,12
@@
### $Id$
### $URL$
### $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):
"""
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
0163e8a
..
e06eb3a
100755
(executable)
--- a/
geni/plc/sfa-import-plc.py
+++ b/
sfa/plc/sfa-import-plc.py
@@
-21,14
+21,14
@@
import getopt
import sys
import tempfile
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()
# 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:
# 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
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
f90332d
..
696c996
100644
(file)
--- a/
geni/server/aggregate.py
+++ b/
sfa/server/aggregate.py
@@
-8,10
+8,10
@@
import time
import xmlrpclib
from types import StringTypes, ListType
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:
# 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
7ab6346
..
3b209ea
100644
(file)
--- a/
geni/server/registry.py
+++ b/
sfa/server/registry.py
@@
-10,11
+10,11
@@
import os
import time
import sys
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:
# 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
aff696a
..
3cd0370
100644
(file)
--- 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
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():
# 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
6407902
..
d0782b5
100644
(file)
--- a/
geni/server/slicemgr.py
+++ b/
sfa/server/slicemgr.py
@@
-6,10
+6,10
@@
import sys
import datetime
import time
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):
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
77797a9
..
e9b7561
100644
(file)
--- 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 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
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
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
04c1605
..
8515e31
100644
(file)
--- a/
geni/trust/credential.py
+++ b/
sfa/trust/credential.py
@@
-10,9
+10,9
@@
import xmlrpclib
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:
##
# 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
d744cf9
..
6c0436c
100644
(file)
--- a/
geni/trust/gid.py
+++ b/
sfa/trust/gid.py
@@
-9,7
+9,7
@@
import xmlrpclib
import uuid
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.
##
# 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
6b131b0
..
9940d58
100644
(file)
--- a/
geni/trust/trustedroot.py
+++ b/
sfa/trust/trustedroot.py
@@
-3,8
+3,8
@@
import os
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):
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
3acfbf9
..
b254ee8
100644
(file)
--- a/
geni/util/api.py
+++ b/
sfa/util/api.py
@@
-11,13
+11,13
@@
import traceback
import string
import xmlrpclib
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:
#
# See "2.2 Characters" in the XML specification:
#
@@
-97,8
+97,8
@@
def import_deep(name):
class GeniAPI:
# flat list of method names
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):
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:
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)
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]
# 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:
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
3ea8565
..
21ac104
100644
(file)
--- a/
geni/util/auth.py
+++ b/
sfa/util/auth.py
@@
-7,14
+7,14
@@
import time
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:
"""
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
32de350
..
cef2fdd
100644
(file)
--- a/
geni/util/config.py
+++ b/
sfa/util/config.py
@@
-20,7
+20,7
@@
import os.path
import traceback
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 ?
# 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
6fbd206
..
00553ff
100644
(file)
--- a/
geni/util/geniclient.py
+++ b/
sfa/util/geniclient.py
@@
-11,10
+11,10
@@
import xmlrpclib
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
##
# 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
b1dd436
..
1a7307d
100644
(file)
--- 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.
#
# 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 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
##
# 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
7a861fd
..
d814c0f
100644
(file)
--- a/
geni/util/genitable.py
+++ b/
sfa/util/genitable.py
@@
-11,9
+11,9
@@
import report
from pg import DB, ProgrammingError
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$"
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
0c9d2c6
..
42435c8
100644
(file)
--- a/
geni/util/geniticket.py
+++ b/
sfa/util/geniticket.py
@@
-8,9
+8,9
@@
import xmlrpclib
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)
# 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
e33874a
..
f3a5a08
100644
(file)
--- a/
geni/util/hierarchy.py
+++ b/
sfa/util/hierarchy.py
@@
-18,13
+18,13
@@
import os
import report
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
##
# 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
c736386
..
e7a12d8
100644
(file)
--- a/
geni/util/method.py
+++ b/
sfa/util/method.py
@@
-15,10
+15,10
@@
import pprint
from types import StringTypes
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):
# 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
445e0a3
..
e1320df
100644
(file)
--- a/
geni/util/misc.py
+++ b/
sfa/util/misc.py
@@
-1,7
+1,7
@@
### $Id$
### $URL$
### $Id$
### $URL$
-from
geni
.util.faults import *
+from
sfa
.util.faults import *
def get_leaf(hrn):
parts = hrn.split(".")
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
6f4a9b1
..
884bf8f
100644
(file)
--- a/
geni/util/nodes.py
+++ b/
sfa/util/nodes.py
@@
-7,16
+7,16
@@
import datetime
import sys
import traceback
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):
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
37b25fc
..
fb45bd1
100644
(file)
--- a/
geni/util/parameter.py
+++ b/
sfa/util/parameter.py
@@
-11,7
+11,7
@@
### $URL$
from types import *
### $URL$
from types import *
-from
geni
.util.faults import *
+from
sfa
.util.faults import *
class Parameter:
"""
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
62ce145
..
b673132
100644
(file)
--- a/
geni/util/policy.py
+++ b/
sfa/util/policy.py
@@
-3,8
+3,8
@@
import os
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):
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
27b6c83
..
8575f01
100644
(file)
--- a/
geni/util/record.py
+++ b/
sfa/util/record.py
@@
-9,11
+9,11
@@
from types import StringTypes
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):
"""
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
97171d7
..
12d4084
100644
(file)
--- a/
geni/util/slices.py
+++ b/
sfa/util/slices.py
@@
-4,15
+4,15
@@
import datetime
import time
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):
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
9eef1e9
..
95ed8f5
100644
(file)
--- a/
geni/util/storage.py
+++ b/
sfa/util/storage.py
@@
-3,7
+3,7
@@
import os
import os
-from
geni
.util.rspec import RecordSpec
+from
sfa
.util.rspec import RecordSpec
class SimpleStorage(dict):
"""
class SimpleStorage(dict):
"""
diff --git
a/tests/client/testAggregate.py
b/tests/client/testAggregate.py
index
1c0d437
..
e2bf7ef
100644
(file)
--- a/
tests/client/testAggregate.py
+++ b/
tests/client/testAggregate.py
@@
-1,7
+1,7
@@
from pprint import pprint
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'
cred = Credential(filename = 'tmack.pl.sa.cred')
slicehrn = 'planetlab.us.pl.tmack'
diff --git
a/tests/testCert.py
b/tests/testCert.py
index
0b83525
..
0a6a90c
100755
(executable)
--- a/
tests/testCert.py
+++ b/
tests/testCert.py
@@
-1,6
+1,6
@@
import unittest
import xmlrpclib
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):
class TestCert(unittest.TestCase):
def setUp(self):
diff --git
a/tests/testCred.py
b/tests/testCred.py
index
1de9838
..
68c9b74
100755
(executable)
--- a/
tests/testCred.py
+++ b/
tests/testCred.py
@@
-1,7
+1,7
@@
import unittest
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):
class TestCred(unittest.TestCase):
def setUp(self):
diff --git
a/tests/testGid.py
b/tests/testGid.py
index
67c113b
..
33406f5
100755
(executable)
--- a/
tests/testGid.py
+++ b/
tests/testGid.py
@@
-1,7
+1,7
@@
import unittest
import xmlrpclib
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):
class TestGid(unittest.TestCase):
def setUp(self):
diff --git
a/tests/testHierarchy.py
b/tests/testHierarchy.py
index
78e53c1
..
a8494bb
100755
(executable)
--- a/
tests/testHierarchy.py
+++ b/
tests/testHierarchy.py
@@
-1,8
+1,8
@@
import unittest
import os
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"
BASEDIR = "test_hierarchy"
PURGE_BASEDIR = "rm -rf test_hierarchy"
diff --git
a/tests/testKeypair.py
b/tests/testKeypair.py
index
f4c5c4e
..
ebe1ede
100755
(executable)
--- a/
tests/testKeypair.py
+++ b/
tests/testKeypair.py
@@
-5,7
+5,7
@@
sys.path.append('..')
import unittest
import xmlrpclib
import base64
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):
class TestKeypair(unittest.TestCase):
def setUp(self):
diff --git
a/tests/testMisc.py
b/tests/testMisc.py
index
20bf1fd
..
831d949
100755
(executable)
--- a/
tests/testMisc.py
+++ b/
tests/testMisc.py
@@
-1,5
+1,5
@@
import unittest
import unittest
-from
geni
.util.misc import *
+from
sfa
.util.misc import *
class TestMisc(unittest.TestCase):
def setUp(self):
class TestMisc(unittest.TestCase):
def setUp(self):
diff --git
a/tests/testRecord.py
b/tests/testRecord.py
index
6156154
..
8370f08
100755
(executable)
--- a/
tests/testRecord.py
+++ b/
tests/testRecord.py
@@
-1,8
+1,8
@@
import unittest
import xmlrpclib
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):
class TestRecord(unittest.TestCase):
def setUp(self):
diff --git
a/tests/testRights.py
b/tests/testRights.py
index
2479d4a
..
a67a25f
100755
(executable)
--- a/
tests/testRights.py
+++ b/
tests/testRights.py
@@
-1,5
+1,5
@@
import unittest
import unittest
-from
geni
.trust.rights import *
+from
sfa
.trust.rights import *
class TestRight(unittest.TestCase):
def setUp(self):
class TestRight(unittest.TestCase):
def setUp(self):
diff --git
a/wsdl/apistub.py
b/wsdl/apistub.py
index
fdd96bc
..
198883f
100644
(file)
--- 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]
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)
callablemethod = getattr(module, classname)(None)
return getattr(module, classname)(None)
diff --git
a/wsdl/gw2wsdl.py
b/wsdl/gw2wsdl.py
index
257cd69
..
15aa673
100755
(executable)
--- a/
wsdl/gw2wsdl.py
+++ b/
wsdl/gw2wsdl.py
@@
-16,8
+16,8
@@
import globals
import apistub
from types import *
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 = {}
complex_types = {}
services = {}