Changeset e252e5d


Ignore:
Timestamp:
Sep 9, 2011 1:59:08 PM (13 years ago)
Author:
Ted Faber <faber@…>
Branches:
compt_changes, info-ops, master
Children:
a3bbb4a
Parents:
f585453 (diff), 355b17e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'axis_example'

Files:
27 added
5 edited

Legend:

Unmodified
Added
Removed

  • fedd/Makefile

    r355b17e re252e5d  
    1414WSDL_FILES= ../wsdl/fedd.wsdl ../wsdl/fedd_types.xsd ../wsdl/fedd_internal.wsdl ../wsdl/topdl.xsd
    1515
    16 VERSION=3.20
     16VERSION=3.21b
    1717
    1818DISTFILES= dist/fedd-${VERSION}.tar.gz

  • fedd/federation/emulab_segment.py

    r355b17e re252e5d  
    4545        except socket_error, e:
    4646            raise service_error(service_error.connect,
    47                     "Cannot connect to %s: %s" % (url, e[1]))
     47                    "Cannot connect" % e)
    4848            raise e
    4949        except BIOError, e:
    5050            if self.log:
    51                 self.log.warn("BIO error contacting %s: %s" % (url, e))
     51                self.log.warn("BIO error: %s" % e)
    5252            raise e
    5353        except sslerror, e:
    5454            if self.log:
    55                 self.log.warn("SSL (socket) error contacting %s: %s" %
    56                         (url, e))
     55                self.log.warn("SSL (socket) error: %s" %  e)
    5756            raise e
    5857        except SSLError, e:
    5958            if self.log:
    60                 self.log.warn("SSL error contacting %s: %s" % (url, e))
     59                self.log.warn("SSL error: %s" % e)
    6160            raise e
    6261        except httplib.HTTPException, e:
    6362            if self.log:
    64                 self.log.warn("HTTP error contacting %s: %s" % (url, e))
     63                self.log.warn("HTTP error: %s" % e)
    6564            raise e
    6665        except Fault, f:
    67             raise service_error(f.faultCode, f.faultString)
     66            raise service_error(service_error.protocol,
     67                    "Remote XMLRPC Fault: %s" % f)
    6868        except Error, e:
    6969            raise service_error(service_error.protocol,

  • fedd/federation/experiment_control.py

    r355b17e re252e5d  
    12471247                        "More than one project export is not supported")
    12481248
    1249         def add_services(svcs, type, slist):
     1249        def add_services(svcs, type, slist, keys):
    12501250            """
    1251             Add the given services to slist.  type is import or export.
     1251            Add the given services to slist.  type is import or export.  Also
     1252            add a mapping entry from the assigned id to the original service
     1253            record.
    12521254            """
    12531255            for i, s in enumerate(svcs):
    12541256                idx = '%s%d' % (type, i)
     1257                keys[idx] = s
    12551258                sr = {'id': idx, 'name': s.name, 'visibility': type }
    12561259                if s.params:
    … …  
    12941297        if import_svcs or export_svcs:
    12951298            slist = []
    1296             add_services(import_svcs, 'import', slist)
    1297             add_services(export_svcs, 'export', slist)
     1299            add_services(import_svcs, 'import', slist, e_keys)
     1300            add_services(export_svcs, 'export', slist, e_keys)
    12981301            req['service'] = slist
    12991302

  • fedd/federation/thread_pool.py

    r355b17e re252e5d  
    33import logging
    44import time
     5import sys
     6import traceback
     7
    58from threading import Lock, Thread, Condition
    69from service_error import service_error

  • fedd/setup.py

    r355b17e re252e5d  
    44
    55setup(name='fedd',
    6         version='3.20',
     6        version='3.21b',
    77        description='DETER Federation daemon',
    88        author='Ted Faber',
Note: See TracChangeset for help on using the changeset viewer.