Changeset 5488

Show
Ignore:
Timestamp:
05/21/12 23:42:12 (7 years ago)
Author:
sushant
Message:

Replace occurrences of SEATTLEGENI. Refs #1055

Location:
seattle/trunk
Files:
8 modified

Legend:

Unmodified
Added
Removed
  • seattle/trunk/experimentmanager/examples/find_available_seattlegeni_vessels.py

    r3280 r5488  
    3737 
    3838# The public key that all seattlegeni nodes advertise under. 
    39 SEATTLEGENI_PUBLICKEY_FILENAME = "seattlegeni_advertisement.publickey" 
     39SEATTLECLEARINGHOUSE_PUBLICKEY_FILENAME = "seattlegeni_advertisement.publickey" 
    4040 
    4141# Useful for development. Only contact this many nodes. 
     
    4848def main(): 
    4949 
    50   identity = experimentlib.create_identity_from_key_files(SEATTLEGENI_PUBLICKEY_FILENAME) 
     50  identity = experimentlib.create_identity_from_key_files(SEATTLECLEARINGHOUSE_PUBLICKEY_FILENAME) 
    5151 
    5252  nodelocation_list = experimentlib.lookup_node_locations_by_identity(identity) 
  • seattle/trunk/experimentmanager/examples/seattlegeni_maintain_vessels.py

    r5486 r5488  
    2424# Whether to allow insecure ssl when communicating with seattlegeni. 
    2525# True, False, or None (None indicates to use the default) 
    26 experimentlib.SEATTLEGENI_ALLOW_SSL_INSECURE = None 
     26experimentlib.SEATTLECLEARINGHOUSE_ALLOW_SSL_INSECURE = None 
    2727 
    2828# If using secure ssl communication with seattlegeni, then this is the path 
    2929# to the CA certs file. See the file seattleclearinghouse_xmlrpc.py for details. 
    3030# This should be a path to the pem file or None (None indicates to use the default) 
    31 experimentlib.SEATTLEGENI_CA_CERTS_FILES = None 
     31experimentlib.SEATTLECLEARINGHOUSE_CA_CERTS_FILES = None 
    3232 
    3333# The seattlegeni username will be derived from the filename. 
     
    115115      print("Will try to acquire " + str(num_vessels_to_request) + " vessels.") 
    116116 
    117     vessel_type = experimentlib.SEATTLEGENI_VESSEL_TYPE_WAN 
     117    vessel_type = experimentlib.SEATTLECLEARINGHOUSE_VESSEL_TYPE_WAN 
    118118    acquired_vessels = experimentlib.seattlegeni_acquire_vessels(identity, vessel_type, num_vessels_to_request) 
    119119     
  • seattle/trunk/experimentmanager/experimentlib.py

    r5486 r5488  
    150150# A few options to be passed along to the SeattleGENI xmlrpc client. 
    151151# None means the default. 
    152 SEATTLEGENI_XMLRPC_URL = None 
    153 SEATTLEGENI_ALLOW_SSL_INSECURE = None # Set to True to allow insecure SSL. 
    154 SEATTLEGENI_CA_CERTS_FILES = None 
     152SEATTLECLEARINGHOUSE_XMLRPC_URL = None 
     153SEATTLECLEARINGHOUSE_ALLOW_SSL_INSECURE = None # Set to True to allow insecure SSL. 
     154SEATTLECLEARINGHOUSE_CA_CERTS_FILES = None 
    155155 
    156156# These constants can be used as the type argument to seattlegeni_acquire_vessels. 
    157 SEATTLEGENI_VESSEL_TYPE_WAN = "wan" 
    158 SEATTLEGENI_VESSEL_TYPE_LAN = "lan" 
    159 SEATTLEGENI_VESSEL_TYPE_NAT = "nat" 
    160 SEATTLEGENI_VESSEL_TYPE_RAND = "rand" 
     157SEATTLECLEARINGHOUSE_VESSEL_TYPE_WAN = "wan" 
     158SEATTLECLEARINGHOUSE_VESSEL_TYPE_LAN = "lan" 
     159SEATTLECLEARINGHOUSE_VESSEL_TYPE_NAT = "nat" 
     160SEATTLECLEARINGHOUSE_VESSEL_TYPE_RAND = "rand" 
    161161 
    162162# Some of these vessel status explanations are from: 
     
    16021602                                    identity['username'], 
    16031603                                    private_key_string=private_key_string, 
    1604                                     xmlrpc_url=SEATTLEGENI_XMLRPC_URL, 
    1605                                     allow_ssl_insecure=SEATTLEGENI_ALLOW_SSL_INSECURE, 
    1606                                     ca_certs_file=SEATTLEGENI_CA_CERTS_FILES) 
     1604                                    xmlrpc_url=SEATTLECLEARINGHOUSE_XMLRPC_URL, 
     1605                                    allow_ssl_insecure=SEATTLECLEARINGHOUSE_ALLOW_SSL_INSECURE, 
     1606                                    ca_certs_file=SEATTLECLEARINGHOUSE_CA_CERTS_FILES) 
    16071607    identity["seattlegeniclient"] = client 
    16081608     
     
    16401640    vesseltype 
    16411641      The type of vessels to be acquired. This must be one of the constants 
    1642       named SEATTLEGENI_VESSEL_TYPE_* 
     1642      named SEATTLECLEARINGHOUSE_VESSEL_TYPE_* 
    16431643    number 
    16441644      The number of vessels to be acquired. 
  • seattle/trunk/experimentmanager/tests/run_experimentlib_examples.py

    r3275 r5488  
    5050 
    5151# For test_seattlegeni_maintain_vessels(). 
    52 experimentlib.SEATTLEGENI_ALLOW_SSL_INSECURE = False 
    53 experimentlib.SEATTLEGENI_CA_CERTS_FILES = None 
     52experimentlib.SEATTLECLEARINGHOUSE_ALLOW_SSL_INSECURE = False 
     53experimentlib.SEATTLECLEARINGHOUSE_CA_CERTS_FILES = None 
    5454MIN_VESSELS_TO_KEEP = 4 
    5555 
  • seattle/trunk/overlord/overlord.py

    r5486 r5488  
    236236        The number of vessels on which to deploy. 
    237237      vesseltype 
    238         The type of vessel to acquire, based on the SEATTLEGENI_VESSEL_TYPE_* 
     238        The type of vessel to acquire, based on the SEATTLECLEARINGHOUSE_VESSEL_TYPE_* 
    239239        constants within experimentlib.py 
    240240      program_filename 
     
    247247      ValueError 
    248248        Raised if argument vesseltype doesn't match one of the experimentlib 
    249         SEATTLEGENI_VESSEL_TYPE_* constants, if argument program file does not 
     249        SEATTLECLEARINGHOUSE_VESSEL_TYPE_* constants, if argument program file does not 
    250250        exist, or if argument number of vessels on which to deploy exceeds the 
    251251        user's number of vessel credits. 
     
    265265 
    266266    # List of valid vessel types. 
    267     vessel_types = [explib.SEATTLEGENI_VESSEL_TYPE_WAN, 
    268                     explib.SEATTLEGENI_VESSEL_TYPE_LAN, 
    269                     explib.SEATTLEGENI_VESSEL_TYPE_NAT, 
    270                     explib.SEATTLEGENI_VESSEL_TYPE_RAND] 
     267    vessel_types = [explib.SEATTLECLEARINGHOUSE_VESSEL_TYPE_WAN, 
     268                    explib.SEATTLECLEARINGHOUSE_VESSEL_TYPE_LAN, 
     269                    explib.SEATTLECLEARINGHOUSE_VESSEL_TYPE_NAT, 
     270                    explib.SEATTLECLEARINGHOUSE_VESSEL_TYPE_RAND] 
    271271   
    272272    if vessel_type not in vessel_types: 
    273273      raise ValueError("Invalid vessel type specified. Argument 'vessel_type' must be one of " + 
    274                         "the SEATTLEGENI_VESSEL_TYPE_* constants defined in 'experimentlib.py'") 
     274                        "the SEATTLECLEARINGHOUSE_VESSEL_TYPE_* constants defined in 'experimentlib.py'") 
    275275     
    276276    self.config['vessel_type'] = vessel_type 
  • seattle/trunk/repy/apps/appmap/appmap.py

    r5486 r5488  
    462462def main(appmap_config): 
    463463  # Set SSL security level and warn user if running without SSL 
    464   experimentlib.SEATTLEGENI_ALLOW_SSL_INSECURE = appmap_config['allow_ssl_insecure'] 
     464  experimentlib.SEATTLECLEARINGHOUSE_ALLOW_SSL_INSECURE = appmap_config['allow_ssl_insecure'] 
    465465  if appmap_config['allow_ssl_insecure']: 
    466466    print "Running without secure SSL connection to SeattleGENI" 
  • seattle/trunk/seattlegeni/deploymentscripts/start_seattlegeni_components.sh

    r4428 r5488  
    2222 
    2323# The seattlegeni/ directory in the directory deployed to (by the deployment script) 
    24 SEATTLEGENI_DIR="/home/geni/live/seattlegeni" 
     24SEATTLECLEARINGHOUSE_DIR="/home/geni/live/seattlegeni" 
    2525 
    2626# The directory that output to stdout/stderr will be logged to. 
     
    6363 
    6464echo "Starting lockserver." 
    65 $SUDO_CMD python $SEATTLEGENI_DIR/lockserver/lockserver_daemon.py >>$LOG_DIR/lockserver.log 2>&1 & 
     65$SUDO_CMD python $SEATTLECLEARINGHOUSE_DIR/lockserver/lockserver_daemon.py >>$LOG_DIR/lockserver.log 2>&1 & 
    6666sleep 1 # Wait a moment to make sure it has started (lockserver is used by other components). 
    6767 
    6868echo "Starting backend." 
    69 $SUDO_CMD python $SEATTLEGENI_DIR/backend/backend_daemon.py >>$LOG_DIR/backend.log 2>&1 & 
     69$SUDO_CMD python $SEATTLECLEARINGHOUSE_DIR/backend/backend_daemon.py >>$LOG_DIR/backend.log 2>&1 & 
    7070sleep 1 # Wait a moment to make sure it has started (backend is used by other components). 
    7171 
     
    7474 
    7575echo "Starting check_active_db_nodes.py." 
    76 $SUDO_CMD python $SEATTLEGENI_DIR/polling/check_active_db_nodes.py >>$LOG_DIR/check_active_db_nodes.log 2>&1 & 
     76$SUDO_CMD python $SEATTLECLEARINGHOUSE_DIR/polling/check_active_db_nodes.py >>$LOG_DIR/check_active_db_nodes.log 2>&1 & 
    7777sleep 1 # We need to wait for each process to start before beginning the next 
    7878        # because repyhelper has an issue with concurrent file access. 
     
    8282TRANSITION_NAME=transition_donation_to_canonical 
    8383echo "Starting transition script $TRANSITION_NAME" 
    84 $SUDO_CMD python $SEATTLEGENI_DIR/node_state_transitions/$TRANSITION_NAME.py >>$LOG_DIR/$TRANSITION_NAME.log 2>&1 & 
     84$SUDO_CMD python $SEATTLECLEARINGHOUSE_DIR/node_state_transitions/$TRANSITION_NAME.py >>$LOG_DIR/$TRANSITION_NAME.log 2>&1 & 
    8585sleep 1 
    8686 
    8787TRANSITION_NAME=transition_canonical_to_twopercent 
    8888echo "Starting transition script $TRANSITION_NAME" 
    89 $SUDO_CMD python $SEATTLEGENI_DIR/node_state_transitions/$TRANSITION_NAME.py >>$LOG_DIR/$TRANSITION_NAME.log 2>&1 & 
     89$SUDO_CMD python $SEATTLECLEARINGHOUSE_DIR/node_state_transitions/$TRANSITION_NAME.py >>$LOG_DIR/$TRANSITION_NAME.log 2>&1 & 
    9090sleep 1 
    9191 
    9292TRANSITION_NAME=transition_twopercent_to_twopercent 
    9393echo "Starting transition script $TRANSITION_NAME" 
    94 $SUDO_CMD python $SEATTLEGENI_DIR/node_state_transitions/$TRANSITION_NAME.py >>$LOG_DIR/$TRANSITION_NAME.log 2>&1 & 
     94$SUDO_CMD python $SEATTLECLEARINGHOUSE_DIR/node_state_transitions/$TRANSITION_NAME.py >>$LOG_DIR/$TRANSITION_NAME.log 2>&1 & 
    9595sleep 1 
    9696 
    9797TRANSITION_NAME=transition_onepercentmanyevents_to_canonical 
    9898echo "Starting transition script $TRANSITION_NAME" 
    99 $SUDO_CMD python $SEATTLEGENI_DIR/node_state_transitions/$TRANSITION_NAME.py >>$LOG_DIR/$TRANSITION_NAME.log 2>&1 & 
     99$SUDO_CMD python $SEATTLECLEARINGHOUSE_DIR/node_state_transitions/$TRANSITION_NAME.py >>$LOG_DIR/$TRANSITION_NAME.log 2>&1 & 
    100100 
    101101echo "All components started. Kill this process (CTRL-C or 'kill $$') to stop all started components (except apache)." 
  • seattle/trunk/seattlegeni/website/xmlrpc/dispatcher.py

    r2575 r5488  
    2828# This is the url that will be displayed if the xmlrpc service is requested 
    2929# directory through a web browser (that is, through a GET request). 
    30 SEATTLEGENI_XMLRPC_API_DOC_URL = "https://seattle.cs.washington.edu/wiki/SeattleGeniAPI" 
     30SEATTLECLEARINGHOUSE_XMLRPC_API_DOC_URL = "https://seattle.cs.washington.edu/wiki/SeattleGeniAPI" 
    3131 
    3232# Create a Dispatcher. This handles the calls and translates info to function maps. 
     
    5757  else: 
    5858    response.write("<b>This is the SeattleGeni XML-RPC Service.</b><br>") 
    59     response.write("Please see " + SEATTLEGENI_XMLRPC_API_DOC_URL + " for more information.") 
     59    response.write("Please see " + SEATTLECLEARINGHOUSE_XMLRPC_API_DOC_URL + " for more information.") 
    6060 
    6161  response['Content-length'] = str(len(response.content))