Changeset 6bedbdba95fa86da37dcd0fca8e04160480215bf

Timestamp:

01/12/12 20:49:05 (4 months ago)

Author:

Ted Faber <faber@…>

Children:

044dd208e6b97cfce5a2220c8eeb0210935e9188

Parents:

5bbad0849d0e3e3c2e87ee597cde5fe000a6f031

git-committer:

Ted Faber <faber@isi.edu> / 2012-01-12T20:49:05Z-0800

Message:

Split topdl and fedid out to different packages. Add differential
installs

Location:

fedd

Files:

• Makefile (modified) (4 diffs)
• access_to_abac.py (modified) (1 diff)
• compose.py (modified) (1 diff)
• data-setup.py (added)
• db_to_certs.py (modified) (1 diff)
• deter/__init__.py (added)
• deter/fedid.py (moved) (moved from fedd/federation/fedid.py)
• deter/topdl.py (moved) (moved from fedd/federation/topdl.py)
• fedd.py (modified) (1 diff)
• fedd_client.py (modified) (1 diff)
• fedd_create.py (modified) (2 diffs)
• fedd_ftopo.py (modified) (1 diff)
• fedd_image.py (modified) (1 diff)
• fedd_new.py (modified) (1 diff)
• fedd_ns2topdl.py (modified) (1 diff)
• fedd_operation.py (modified) (1 diff)
• fedd_terminate.py (modified) (1 diff)
• federation/__init__.py (modified) (1 diff)
• federation/access.py (modified) (2 diffs)
• federation/authorizer.py (modified) (1 diff)
• federation/client_lib.py (modified) (1 diff)
• federation/deter_impl.py (modified) (1 diff)
• federation/deter_internal_access.py (modified) (2 diffs)
• federation/dragon_access.py (modified) (2 diffs)
• federation/emulab_access.py (modified) (2 diffs)
• federation/experiment_control.py (modified) (2 diffs)
• federation/experiment_control_legacy.py (modified) (2 diffs)
• federation/experiment_info.py (modified) (1 diff)
• federation/experiment_partition.py (modified) (1 diff)
• federation/geniapi_proxy.py (modified) (1 diff)
• federation/ns2topdl.py (modified) (1 diff)
• federation/protogeni_access.py (modified) (2 diffs)
• federation/remote_service.py (modified) (1 diff)
• federation/server.py (modified) (1 diff)
• federation/skeleton_access.py (modified) (1 diff)
• federation/util.py (modified) (1 diff)
• federation/xmlrpc_emulab_segment.py (modified) (1 diff)
• fedid.py (modified) (1 diff)
• setup.py (modified) (1 diff)

fedd/Makefile

@@ -1 +1 @@
 
 MODULE_DIR=federation
+DETER_DIR=deter
 
 GENERATED_MODS= ${MODULE_DIR}/fedd_services.py \
@@ -17 +18 @@
 VERSION=3.21b
 
-DISTFILES= dist/fedd-${VERSION}.tar.gz
+DISTFILES= dist/fedd-${VERSION}.tar.gz dist/deter-data-${VERSION}.tar.gz
 
 all:    ${GENERATED_MODS}
@@ -27 +28 @@
 
 clean:
-        rm -f ${GENERATED_MODS} ${MODULE_DIR}/*.pyc *.pyc
+        rm -f ${GENERATED_MODS} ${MODULE_DIR}/*.pyc ${DETER_DIR}/*.pyc *.pyc 
         rm -rf build dist fedd.egg-info MANIFEST
 
@@ -33 +34 @@
 
 dist/fedd-${VERSION}.tar.gz: all
+        rm -f MANIFEST
         python ./setup.py sdist
+
+dist/deter-data-${VERSION}.tar.gz: all
+        rm -f MANIFEST
+        python ./data-setup.py sdist

fedd/access_to_abac.py

@@ -12 +12 @@
 import Creddy
 
-from federation.fedid import fedid
+from deter import fedid
 from federation.authorizer import abac_authorizer
 from federation.util import abac_split_cert, abac_pem_type, file_expanding_opts

fedd/compose.py

@@ -12 +12 @@
 from federation.remote_service import service_caller
 from federation.service_error import service_error
-from federation import topdl
+from deter import topdl
 
 class config_error(RuntimeError): pass

fedd/db_to_certs.py

@@ -7 +7 @@
 from optparse import OptionParser
 
-from federation import fedid
+from deter import fedid
 
 class opt_parser(OptionParser):

fedd/fedd.py

@@ -82 +82 @@
     servers.remove(s)
     servers_lock.release()
-
 M2Crypto.threading.init()
 opts, args = fedd_opts().parse_args()

fedd/fedd_client.py

@@ -10 +10 @@
 import time
 
-from federation import fedid, service_error
+from deter import fedid
+from deter import topdl
+from federation import service_error
 from federation.util import fedd_ssl_context, pack_id, unpack_id
 from federation.remote_service import service_caller
-from federation import topdl
 
 from optparse import OptionParser, OptionValueError

fedd/fedd_create.py

@@ -11 +11 @@
 from random import choice
 
+from deter import topdl
+from deter import fedid, generate_fedid
+
 from federation.proof import proof
-from federation.fedid import fedid, generate_fedid
 from federation.remote_service import service_caller
 from federation.client_lib import client_opts, exit_with_fault, RPCException, \
@@ -18 +20 @@
         get_abac_certs, log_authentication
 from federation.util import abac_split_cert, abac_context_to_creds
-from federation import topdl
 
 from xml.parsers.expat import ExpatError

fedd/fedd_ftopo.py

@@ -3 +3 @@
 import sys
 
-from federation import topdl
+from deter import topdl
+from deter import fedid
+
 from federation.proof import proof
 from federation.remote_service import service_caller

fedd/fedd_image.py

@@ -7 +7 @@
 import xml.parsers.expat
 
-from federation import topdl
+from deter import fedid
+from deter import topdl
+
 from federation.proof import proof
 from federation.remote_service import service_caller

fedd/fedd_new.py

@@ -4 +4 @@
 from datetime import datetime
 
-from federation.fedid import fedid, generate_fedid
+from deter import fedid, generate_fedid
 from federation.remote_service import service_caller
 from federation.proof import proof

fedd/fedd_ns2topdl.py

@@ -3 +3 @@
 import sys
 
-from federation import topdl
+from deter import topdl
+
 from federation.proof import proof
 from federation.remote_service import service_caller

fedd/fedd_operation.py

@@ -3 +3 @@
 import sys
 
-from federation import topdl
+from deter import topdl
+from deter import fedid
+
 from federation.proof import proof
 from federation.remote_service import service_caller

fedd/fedd_terminate.py

@@ -3 +3 @@
 import sys
 
-from federation.fedid import fedid
+from deter import fedid
 from federation.proof import proof
 from federation.remote_service import service_caller

fedd/federation/__init__.py

@@ -1 +1 @@
 #/usr/local/bin/python
 
-from fedid import fedid
 from service_error import service_error
 from config_parser import config_parser

fedd/federation/access.py

@@ -15 +15 @@
 
 from util import *
-from fedid import fedid, generate_fedid
+from deter import fedid, generate_fedid
 from authorizer import authorizer
 from service_error import service_error
@@ -24 +24 @@
 from urlparse import urlparse
 
-import topdl
+from deter import topdl
 import list_log
 

fedd/federation/authorizer.py

@@ -7 +7 @@
 from string import join, hexdigits
 
-from fedid import fedid
+from deter import fedid
 from remote_service import service_caller
 from service_error import service_error

fedd/federation/client_lib.py

@@ -10 +10 @@
 
 
-from fedid import fedid
+from deter import fedid
 from util import fedd_ssl_context, file_expanding_opts
 from remote_service import service_caller

fedd/federation/deter_impl.py

@@ -12 +12 @@
 from ns2topdl import ns2topdl_local
 from util import read_simple_accessdb
-from fedid import fedid
+from deter import fedid
 
 from authorizer import authorizer, abac_authorizer

fedd/federation/deter_internal_access.py

@@ -13 +13 @@
 
 from util import *
-from fedid import fedid, generate_fedid
+from deter import fedid, generate_fedid
 from authorizer import authorizer, abac_authorizer
 from service_error import service_error
@@ -22 +22 @@
 from urlparse import urlparse
 
-import topdl
+from deter import topdl
 import list_log
 

fedd/federation/dragon_access.py

@@ -14 +14 @@
 
 from util import *
-from fedid import fedid, generate_fedid
+from deter import fedid, generate_fedid
 from authorizer import authorizer, abac_authorizer
 from service_error import service_error
@@ -23 +23 @@
 from urlparse import urlparse
 
-import topdl
+from deter import topdl
 import list_log
 

fedd/federation/emulab_access.py

@@ -18 +18 @@
 
 from util import *
-from fedid import fedid, generate_fedid
+from deter import fedid, generate_fedid
 from authorizer import authorizer, abac_authorizer
 from service_error import service_error
@@ -28 +28 @@
 from urlparse import urlparse
 
-import topdl
+from deter import topdl
 import list_log
 import emulab_segment

fedd/federation/experiment_control.py

@@ -28 +28 @@
 
 from util import *
-from fedid import fedid, generate_fedid
+from deter import fedid, generate_fedid
 from remote_service import xmlrpc_handler, soap_handler, service_caller
 from service_error import service_error
@@ -39 +39 @@
 from operation_status import operation_status
 
-import topdl
+from deter import topdl
 import list_log
 from ip_allocator import ip_allocator

fedd/federation/experiment_control_legacy.py

@@ -26 +26 @@
 
 from util import *
-from fedid import fedid, generate_fedid
+from deter import fedid, generate_fedid
 from remote_service import xmlrpc_handler, soap_handler, service_caller
 from service_error import service_error
@@ -34 +34 @@
 from thread_pool import thread_pool, pooled_thread
 
-import topdl
+from deter import topdl
 import list_log
 from ip_allocator import ip_allocator

fedd/federation/experiment_info.py

@@ -2 +2 @@
 
 import copy
-import topdl
+from deter import topdl
 from datetime import datetime, timedelta
 from numbers import Number

fedd/federation/experiment_partition.py

@@ -25 +25 @@
 
 from util import *
-from fedid import fedid, generate_fedid
+from deter import fedid, generate_fedid
 from remote_service import xmlrpc_handler, soap_handler, service_caller
 from service_error import service_error
 from synch_store import synch_store
 
-import topdl
+from deter import topdl
 import list_log
 from ip_allocator import ip_allocator

fedd/federation/geniapi_proxy.py

@@ -11 +11 @@
 from protogeni_proxy import protogeni_proxy
 
-import topdl
+from deter import topdl
 import list_log
 

fedd/federation/ns2topdl.py

@@ -5 +5 @@
 import tempfile
 import logging
-import topdl
+from deter import topdl
 
 import os.path
 
 from util import *
-from fedid import fedid
+from deter import fedid
 from remote_service import xmlrpc_handler, soap_handler
 from service_error import *

fedd/federation/protogeni_access.py

@@ -17 +17 @@
 
 from util import *
-from fedid import fedid, generate_fedid
+from deter import fedid, generate_fedid
 from authorizer import authorizer, abac_authorizer
 from service_error import service_error
@@ -30 +30 @@
 from geniapi_proxy import geniapi_proxy
 
-import topdl
+from deter import topdl
 import list_log
 

fedd/federation/remote_service.py

@@ -33 +33 @@
     internal_service_port_name = 'getfedd_internal_port'
 from util import fedd_ssl_context
-from fedid import fedid
+from deter import fedid
 import parse_detail
 

fedd/federation/server.py

@@ -12 +12 @@
 import xmlrpclib
 
-from fedid import fedid
+from deter import fedid
 
 # ZSI uses a deprecated multifile interface.  This shuts the warning system up.

fedd/federation/skeleton_access.py

@@ -10 +10 @@
 
 from util import *
-from fedid import fedid, generate_fedid
+from deter import fedid, generate_fedid
 from authorizer import authorizer, abac_authorizer
 from service_error import service_error
 from remote_service import xmlrpc_handler, soap_handler, service_caller
 
-import topdl
+from deter import topdl
 
 from access import access_base

fedd/federation/util.py

@@ -16 +16 @@
 from M2Crypto import SSL
 from M2Crypto.SSL import SSLError
-from fedid import fedid
+from deter import fedid
 from service_error import service_error
 from urlparse import urlparse

fedd/federation/xmlrpc_emulab_segment.py

@@ -3 +3 @@
 import logging 
 import util
-import topdl
+from deter import topdl
 
 from M2Crypto import SSL

fedd/fedid.py

@@ -1 +1 @@
 #!/usr/bin/env python
 
-from federation import fedid
+from deter import fedid
 from optparse import OptionParser
 

fedd/setup.py

@@ -9 +9 @@
         author_email='faber@isi.edu',
         url='http://fedd.isi.deterlab.net',
-        packages=['federation'],
-        package_data={'federation': [ 'LICENSE' ]},
+        packages=['federation', 'deter'],
+        package_data={'federation': [ 'LICENSE' ],'deter': [ 'LICENSE' ]},
         requires=['ZSI(>=2.0)', 'M2Crypto'],
-        provides=['federation'],
+        provides=['federation', 'deter'],
         scripts=['access_to_abac.py', 'cert_to_fedid.py', 'confirm_sshkey.py', 
             'creddy_split.py', 'dump_abac_authorizer.py', 'exp_access_db.py',