From 56f7d897d68be90a3531c34e3f1da0e179a47b36 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 3 Jul 2009 11:31:16 +0000 Subject: [PATCH] move server stubs in geni.server - start gathering plc-specifics in geni.plc --- CHANGES-0.2-to-0.8.txt | 2 +- INSTALL.txt | 6 ++--- geni/__init__.py | 6 ----- geni/init.d/sfa | 9 ++++--- geni/methods/list.py | 2 +- geni/methods/resolve.py | 2 +- geni/{ => plc}/sfa-import-plc.py | 0 geni/{ => server}/aggregate.py | 0 geni/{ => server}/registry.py | 0 geni/{sfa-plc.py => server/sfa-server.py} | 6 ++--- geni/{ => server}/slicemgr.py | 0 geni/util/__init__.py | 31 ----------------------- geni/util/api.py | 2 +- geni/util/nodes.py | 2 +- geni/util/slices.py | 4 +-- geniwrapper.spec | 2 +- setup.py | 6 ++--- 17 files changed, 22 insertions(+), 58 deletions(-) delete mode 100644 geni/__init__.py rename geni/{ => plc}/sfa-import-plc.py (100%) rename geni/{ => server}/aggregate.py (100%) rename geni/{ => server}/registry.py (100%) rename geni/{sfa-plc.py => server/sfa-server.py} (97%) rename geni/{ => server}/slicemgr.py (100%) delete mode 100644 geni/util/__init__.py diff --git a/CHANGES-0.2-to-0.8.txt b/CHANGES-0.2-to-0.8.txt index 177c832a..b7a43c3e 100644 --- a/CHANGES-0.2-to-0.8.txt +++ b/CHANGES-0.2-to-0.8.txt @@ -8,7 +8,7 @@ changes between 0.2 and 0.8 from a user's perspective -------------------- new names for commands gimport.py -> sfa-import-plc.py -plc.py -> sfa-plc.py +plc.py -> sfa-server.py geni-config-tty -> sfa-config-tty -------------------- new names for config files & miscell diff --git a/INSTALL.txt b/INSTALL.txt index 80ee5921..77181656 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -67,9 +67,9 @@ service sfa start or -sfa-plc.py -r -d -sfa-plc.py -a -d -sfa-plc.py -s -d +sfa-server.py -r -d +sfa-server.py -a -d +sfa-server.py -s -d Use: diff --git a/geni/__init__.py b/geni/__init__.py deleted file mode 100644 index 53dbf812..00000000 --- a/geni/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -## Please use make index to update this file -all = """ -aggregate -registry -slicemgr -""".split() diff --git a/geni/init.d/sfa b/geni/init.d/sfa index d4380932..da583a8a 100755 --- a/geni/init.d/sfa +++ b/geni/init.d/sfa @@ -7,6 +7,7 @@ # description: Wraps PLCAPI into the GENI compliant API # # $Id$ +# $URL$ # # Source config @@ -21,17 +22,17 @@ start() { if [ "$GENI_REGISTRY_ENABLED" ]; then echo "Registry" - daemon /usr/bin/sfa-plc.py -r -d $OPTIONS + daemon /usr/bin/sfa-server.py -r -d $OPTIONS fi if [ "$GENI_AGGREGATE_ENABLED" ]; then echo "Aggregate" - daemon /usr/bin/sfa-plc.py -a -d $OPTIONS + daemon /usr/bin/sfa-server.py -a -d $OPTIONS fi if [ "$GENI_SM_ENABLED" ]; then echo "SliceMgr" - daemon /usr/bin/sfa-plc.py -s -d $OPTIONS + daemon /usr/bin/sfa-server.py -s -d $OPTIONS fi RETVAL=$? @@ -42,7 +43,7 @@ start() { stop() { echo -n $"Shutting down GENIWrapper: " - killproc sfa-plc.py + killproc sfa-server.py RETVAL=$? echo diff --git a/geni/methods/list.py b/geni/methods/list.py index 86ec9282..5307b8d4 100644 --- a/geni/methods/list.py +++ b/geni/methods/list.py @@ -7,7 +7,7 @@ from geni.util.parameter import Parameter, Mixed from geni.util.auth import Auth from geni.util.record import GeniRecord -from geni.registry import Registries +from geni.server.registry import Registries class list(Method): """ diff --git a/geni/methods/resolve.py b/geni/methods/resolve.py index 09a068b1..1772c956 100644 --- a/geni/methods/resolve.py +++ b/geni/methods/resolve.py @@ -8,7 +8,7 @@ from geni.util.auth import Auth from geni.util.record import GeniRecord from geni.util.debug import log -from geni.registry import Registries +from geni.server.registry import Registries class resolve(Method): """ diff --git a/geni/sfa-import-plc.py b/geni/plc/sfa-import-plc.py similarity index 100% rename from geni/sfa-import-plc.py rename to geni/plc/sfa-import-plc.py diff --git a/geni/aggregate.py b/geni/server/aggregate.py similarity index 100% rename from geni/aggregate.py rename to geni/server/aggregate.py diff --git a/geni/registry.py b/geni/server/registry.py similarity index 100% rename from geni/registry.py rename to geni/server/registry.py diff --git a/geni/sfa-plc.py b/geni/server/sfa-server.py similarity index 97% rename from geni/sfa-plc.py rename to geni/server/sfa-server.py index b08f7e52..c4e1ddbf 100644 --- a/geni/sfa-plc.py +++ b/geni/server/sfa-server.py @@ -42,9 +42,9 @@ from geni.util.trustedroot import TrustedRootList from geni.util.certificate import Keypair, Certificate from geni.util.config import Config -from geni.registry import Registry -from geni.aggregate import Aggregate -from geni.slicemgr import SliceMgr +from geni.server.registry import Registry +from geni.server.aggregate import Aggregate +from geni.server.slicemgr import SliceMgr # after http://www.erlenstar.demon.co.uk/unix/faq_2.html def daemon(): diff --git a/geni/slicemgr.py b/geni/server/slicemgr.py similarity index 100% rename from geni/slicemgr.py rename to geni/server/slicemgr.py diff --git a/geni/util/__init__.py b/geni/util/__init__.py deleted file mode 100644 index 16fdf927..00000000 --- a/geni/util/__init__.py +++ /dev/null @@ -1,31 +0,0 @@ -## Please use make index to update this file -all = """ -api -auth -cert -config -credential -debug -faults -geniclient -geniserver -genitable -geniticket -gid -hierarchy -method -misc -nodes -parameter -policy -record -remoteshell -report -rights -rspec -slices -specdict -storage -trustedroot -util -""".split() diff --git a/geni/util/api.py b/geni/util/api.py index 8fb6ed69..b45d7f63 100644 --- a/geni/util/api.py +++ b/geni/util/api.py @@ -174,7 +174,7 @@ class GeniAPI: credential = Credential(filename = cred_filename) return credential except IOError: - from geni.registry import Registries + from geni.server.registry import Registries registries = Registries(self) registry = registries[self.hrn] self_cred = registry.get_credential(None, type, self.hrn) diff --git a/geni/util/nodes.py b/geni/util/nodes.py index d77b3f3f..a9c81a14 100644 --- a/geni/util/nodes.py +++ b/geni/util/nodes.py @@ -15,7 +15,7 @@ from geni.util.debug import log from geni.util.rspec import * from geni.util.specdict import * from geni.util.policy import Policy -from geni.aggregate import Aggregates +from geni.server.aggregate import Aggregates class Nodes(SimpleStorage): diff --git a/geni/util/slices.py b/geni/util/slices.py index 1c9669b9..97171d70 100644 --- a/geni/util/slices.py +++ b/geni/util/slices.py @@ -11,8 +11,8 @@ from geni.util.faults import * from geni.util.storage import * from geni.util.policy import Policy from geni.util.debug import log -from geni.aggregate import Aggregates -from geni.registry import Registries +from geni.server.aggregate import Aggregates +from geni.server.registry import Registries class Slices(SimpleStorage): diff --git a/geniwrapper.spec b/geniwrapper.spec index bb5e2eab..4b47a52b 100644 --- a/geniwrapper.spec +++ b/geniwrapper.spec @@ -76,7 +76,7 @@ rm -rf $RPM_BUILD_ROOT /etc/init.d/sfa %{_bindir}/sfa-config-tty %{_bindir}/sfa-import-plc.py* -%{_bindir}/sfa-plc.py* +%{_bindir}/sfa-server.py* %files client %config (noreplace) /etc/sfa/sfi_config diff --git a/setup.py b/setup.py index 917955e4..c8774168 100755 --- a/setup.py +++ b/setup.py @@ -9,8 +9,8 @@ import shutil from distutils.core import setup scripts = [ 'config/sfa-config-tty', - 'geni/sfa-import-plc.py', - 'geni/sfa-plc.py', + 'geni/plc/sfa-import-plc.py', + 'geni/server/sfa-server.py', 'geni/client/sfi.py', 'geni/client/getNodes.py', 'geni/client/getRecord.py', @@ -38,7 +38,7 @@ if sys.argv[1] in ['uninstall', 'remove', 'delete', 'clean']: remove_dirs = ['/etc/sfa/'] + site_packages_path remove_files = [ '/usr/bin/sfa-config-tty', '/usr/bin/sfa-import-plc.py', - '/usr/bin/sfa-plc.py', + '/usr/bin/sfa-server.py', '/usr/bin/sfi.py', '/usr/bin/getNodes.py', '/usr/bin/getRecord.py', -- 2.43.0