Changeset 6bedbdba


Ignore:
Timestamp:
Jan 12, 2012 8:49:05 PM (13 years ago)
Author:
Ted Faber <faber@…>
Branches:
compt_changes, info-ops, master
Children:
044dd20
Parents:
5bbad08
Message:

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

Location:
fedd
Files:
2 added
35 edited
2 moved

Legend:

Unmodified
Added
Removed

  • fedd/Makefile

    r5bbad08 r6bedbdba  
    11
    22MODULE_DIR=federation
     3DETER_DIR=deter
    34
    45GENERATED_MODS= ${MODULE_DIR}/fedd_services.py \
    … …  
    1718VERSION=3.21b
    1819
    19 DISTFILES= dist/fedd-${VERSION}.tar.gz
     20DISTFILES= dist/fedd-${VERSION}.tar.gz dist/deter-data-${VERSION}.tar.gz
    2021
    2122all:    ${GENERATED_MODS}
    … …  
    2728
    2829clean:
    29         rm -f ${GENERATED_MODS} ${MODULE_DIR}/*.pyc *.pyc
     30        rm -f ${GENERATED_MODS} ${MODULE_DIR}/*.pyc ${DETER_DIR}/*.pyc *.pyc
    3031        rm -rf build dist fedd.egg-info MANIFEST
    3132
    … …  
    3334
    3435dist/fedd-${VERSION}.tar.gz: all
     36        rm -f MANIFEST
    3537        python ./setup.py sdist
     38
     39dist/deter-data-${VERSION}.tar.gz: all
     40        rm -f MANIFEST
     41        python ./data-setup.py sdist

  • fedd/access_to_abac.py

    r5bbad08 r6bedbdba  
    1212import Creddy
    1313
    14 from federation.fedid import fedid
     14from deter import fedid
    1515from federation.authorizer import abac_authorizer
    1616from federation.util import abac_split_cert, abac_pem_type, file_expanding_opts

  • fedd/compose.py

    r5bbad08 r6bedbdba  
    1212from federation.remote_service import service_caller
    1313from federation.service_error import service_error
    14 from federation import topdl
     14from deter import topdl
    1515
    1616class config_error(RuntimeError): pass

  • fedd/db_to_certs.py

    r5bbad08 r6bedbdba  
    77from optparse import OptionParser
    88
    9 from federation import fedid
     9from deter import fedid
    1010
    1111class opt_parser(OptionParser):

  • fedd/fedd.py

    r5bbad08 r6bedbdba  
    8282    servers.remove(s)
    8383    servers_lock.release()
    84 
    8584M2Crypto.threading.init()
    8685opts, args = fedd_opts().parse_args()

  • fedd/fedd_client.py

    r5bbad08 r6bedbdba  
    1010import time
    1111
    12 from federation import fedid, service_error
     12from deter import fedid
     13from deter import topdl
     14from federation import service_error
    1315from federation.util import fedd_ssl_context, pack_id, unpack_id
    1416from federation.remote_service import service_caller
    15 from federation import topdl
    1617
    1718from optparse import OptionParser, OptionValueError

  • fedd/fedd_create.py

    r5bbad08 r6bedbdba  
    1111from random import choice
    1212
     13from deter import topdl
     14from deter import fedid, generate_fedid
     15
    1316from federation.proof import proof
    14 from federation.fedid import fedid, generate_fedid
    1517from federation.remote_service import service_caller
    1618from federation.client_lib import client_opts, exit_with_fault, RPCException, \
    … …  
    1820        get_abac_certs, log_authentication
    1921from federation.util import abac_split_cert, abac_context_to_creds
    20 from federation import topdl
    2122
    2223from xml.parsers.expat import ExpatError

  • fedd/fedd_ftopo.py

    r5bbad08 r6bedbdba  
    33import sys
    44
    5 from federation import topdl
     5from deter import topdl
     6from deter import fedid
     7
    68from federation.proof import proof
    79from federation.remote_service import service_caller

  • fedd/fedd_image.py

    r5bbad08 r6bedbdba  
    77import xml.parsers.expat
    88
    9 from federation import topdl
     9from deter import fedid
     10from deter import topdl
     11
    1012from federation.proof import proof
    1113from federation.remote_service import service_caller

  • fedd/fedd_new.py

    r5bbad08 r6bedbdba  
    44from datetime import datetime
    55
    6 from federation.fedid import fedid, generate_fedid
     6from deter import fedid, generate_fedid
    77from federation.remote_service import service_caller
    88from federation.proof import proof

  • fedd/fedd_ns2topdl.py

    r5bbad08 r6bedbdba  
    33import sys
    44
    5 from federation import topdl
     5from deter import topdl
     6
    67from federation.proof import proof
    78from federation.remote_service import service_caller

  • fedd/fedd_operation.py

    r5bbad08 r6bedbdba  
    33import sys
    44
    5 from federation import topdl
     5from deter import topdl
     6from deter import fedid
     7
    68from federation.proof import proof
    79from federation.remote_service import service_caller

  • fedd/fedd_terminate.py

    r5bbad08 r6bedbdba  
    33import sys
    44
    5 from federation.fedid import fedid
     5from deter import fedid
    66from federation.proof import proof
    77from federation.remote_service import service_caller

  • fedd/federation/__init__.py

    r5bbad08 r6bedbdba  
    11#/usr/local/bin/python
    22
    3 from fedid import fedid
    43from service_error import service_error
    54from config_parser import config_parser

  • fedd/federation/access.py

    r5bbad08 r6bedbdba  
    1515
    1616from util import *
    17 from fedid import fedid, generate_fedid
     17from deter import fedid, generate_fedid
    1818from authorizer import authorizer
    1919from service_error import service_error
    … …  
    2424from urlparse import urlparse
    2525
    26 import topdl
     26from deter import topdl
    2727import list_log
    2828

  • fedd/federation/authorizer.py

    r5bbad08 r6bedbdba  
    77from string import join, hexdigits
    88
    9 from fedid import fedid
     9from deter import fedid
    1010from remote_service import service_caller
    1111from service_error import service_error

  • fedd/federation/client_lib.py

    r5bbad08 r6bedbdba  
    1010
    1111
    12 from fedid import fedid
     12from deter import fedid
    1313from util import fedd_ssl_context, file_expanding_opts
    1414from remote_service import service_caller

  • fedd/federation/deter_impl.py

    r5bbad08 r6bedbdba  
    1212from ns2topdl import ns2topdl_local
    1313from util import read_simple_accessdb
    14 from fedid import fedid
     14from deter import fedid
    1515
    1616from authorizer import authorizer, abac_authorizer

  • fedd/federation/deter_internal_access.py

    r5bbad08 r6bedbdba  
    1313
    1414from util import *
    15 from fedid import fedid, generate_fedid
     15from deter import fedid, generate_fedid
    1616from authorizer import authorizer, abac_authorizer
    1717from service_error import service_error
    … …  
    2222from urlparse import urlparse
    2323
    24 import topdl
     24from deter import topdl
    2525import list_log
    2626

  • fedd/federation/dragon_access.py

    r5bbad08 r6bedbdba  
    1414
    1515from util import *
    16 from fedid import fedid, generate_fedid
     16from deter import fedid, generate_fedid
    1717from authorizer import authorizer, abac_authorizer
    1818from service_error import service_error
    … …  
    2323from urlparse import urlparse
    2424
    25 import topdl
     25from deter import topdl
    2626import list_log
    2727

  • fedd/federation/emulab_access.py

    r5bbad08 r6bedbdba  
    1818
    1919from util import *
    20 from fedid import fedid, generate_fedid
     20from deter import fedid, generate_fedid
    2121from authorizer import authorizer, abac_authorizer
    2222from service_error import service_error
    … …  
    2828from urlparse import urlparse
    2929
    30 import topdl
     30from deter import topdl
    3131import list_log
    3232import emulab_segment

  • fedd/federation/experiment_control.py

    r5bbad08 r6bedbdba  
    2828
    2929from util import *
    30 from fedid import fedid, generate_fedid
     30from deter import fedid, generate_fedid
    3131from remote_service import xmlrpc_handler, soap_handler, service_caller
    3232from service_error import service_error
    … …  
    3939from operation_status import operation_status
    4040
    41 import topdl
     41from deter import topdl
    4242import list_log
    4343from ip_allocator import ip_allocator

  • fedd/federation/experiment_control_legacy.py

    r5bbad08 r6bedbdba  
    2626
    2727from util import *
    28 from fedid import fedid, generate_fedid
     28from deter import fedid, generate_fedid
    2929from remote_service import xmlrpc_handler, soap_handler, service_caller
    3030from service_error import service_error
    … …  
    3434from thread_pool import thread_pool, pooled_thread
    3535
    36 import topdl
     36from deter import topdl
    3737import list_log
    3838from ip_allocator import ip_allocator

  • fedd/federation/experiment_info.py

    r5bbad08 r6bedbdba  
    22
    33import copy
    4 import topdl
     4from deter import topdl
    55from datetime import datetime, timedelta
    66from numbers import Number

  • fedd/federation/experiment_partition.py

    r5bbad08 r6bedbdba  
    2525
    2626from util import *
    27 from fedid import fedid, generate_fedid
     27from deter import fedid, generate_fedid
    2828from remote_service import xmlrpc_handler, soap_handler, service_caller
    2929from service_error import service_error
    3030from synch_store import synch_store
    3131
    32 import topdl
     32from deter import topdl
    3333import list_log
    3434from ip_allocator import ip_allocator

  • fedd/federation/geniapi_proxy.py

    r5bbad08 r6bedbdba  
    1111from protogeni_proxy import protogeni_proxy
    1212
    13 import topdl
     13from deter import topdl
    1414import list_log
    1515

  • fedd/federation/ns2topdl.py

    r5bbad08 r6bedbdba  
    55import tempfile
    66import logging
    7 import topdl
     7from deter import topdl
    88
    99import os.path
    1010
    1111from util import *
    12 from fedid import fedid
     12from deter import fedid
    1313from remote_service import xmlrpc_handler, soap_handler
    1414from service_error import *

  • fedd/federation/protogeni_access.py

    r5bbad08 r6bedbdba  
    1717
    1818from util import *
    19 from fedid import fedid, generate_fedid
     19from deter import fedid, generate_fedid
    2020from authorizer import authorizer, abac_authorizer
    2121from service_error import service_error
    … …  
    3030from geniapi_proxy import geniapi_proxy
    3131
    32 import topdl
     32from deter import topdl
    3333import list_log
    3434

  • fedd/federation/remote_service.py

    r5bbad08 r6bedbdba  
    3333    internal_service_port_name = 'getfedd_internal_port'
    3434from util import fedd_ssl_context
    35 from fedid import fedid
     35from deter import fedid
    3636import parse_detail
    3737

  • fedd/federation/server.py

    r5bbad08 r6bedbdba  
    1212import xmlrpclib
    1313
    14 from fedid import fedid
     14from deter import fedid
    1515
    1616# ZSI uses a deprecated multifile interface.  This shuts the warning system up.

  • fedd/federation/skeleton_access.py

    r5bbad08 r6bedbdba  
    1010
    1111from util import *
    12 from fedid import fedid, generate_fedid
     12from deter import fedid, generate_fedid
    1313from authorizer import authorizer, abac_authorizer
    1414from service_error import service_error
    1515from remote_service import xmlrpc_handler, soap_handler, service_caller
    1616
    17 import topdl
     17from deter import topdl
    1818
    1919from access import access_base

  • fedd/federation/util.py

    r5bbad08 r6bedbdba  
    1616from M2Crypto import SSL
    1717from M2Crypto.SSL import SSLError
    18 from fedid import fedid
     18from deter import fedid
    1919from service_error import service_error
    2020from urlparse import urlparse

  • fedd/federation/xmlrpc_emulab_segment.py

    r5bbad08 r6bedbdba  
    33import logging
    44import util
    5 import topdl
     5from deter import topdl
    66
    77from M2Crypto import SSL

  • fedd/fedid.py

    r5bbad08 r6bedbdba  
    11#!/usr/bin/env python
    22
    3 from federation import fedid
     3from deter import fedid
    44from optparse import OptionParser
    55

  • fedd/setup.py

    r5bbad08 r6bedbdba  
    99        author_email='faber@isi.edu',
    1010        url='http://fedd.isi.deterlab.net',
    11         packages=['federation'],
    12         package_data={'federation': [ 'LICENSE' ]},
     11        packages=['federation', 'deter'],
     12        package_data={'federation': [ 'LICENSE' ],'deter': [ 'LICENSE' ]},
    1313        requires=['ZSI(>=2.0)', 'M2Crypto'],
    14         provides=['federation'],
     14        provides=['federation', 'deter'],
    1515        scripts=['access_to_abac.py', 'cert_to_fedid.py', 'confirm_sshkey.py',
    1616            'creddy_split.py', 'dump_abac_authorizer.py', 'exp_access_db.py',
Note: See TracChangeset for help on using the changeset viewer.