Changeset 5483

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

Change occurrences of seattlegeni_xmlrpc to seattleclearinghouse_xmlrpc (including some filenames). Refs #1055

Location:
seattle/trunk
Files:
11 modified
4 moved

Legend:

Unmodified
Added
Removed
  • seattle/trunk/CNC/cncSystemPerformance/deploycncexperiment.mix

    r3832 r5483  
    4040import send_gmail 
    4141from datetime import datetime 
    42 import seattlegeni_xmlrpc 
     42import seattleclearinghouse_xmlrpc 
    4343 
    4444include cncdeploylib.mix 
     
    7676    num_vessels_to_get = number_vessels - len(ip_handle_dict.keys()) 
    7777   
    78     proxy = seattlegeni_xmlrpc.SeattleGENIClient(username=XMLRPC_CRED['username'], api_key=XMLRPC_CRED['api_key'], xmlrpc_url= XMLRPC_SERVER_URL, allow_ssl_insecure=True) 
     78    proxy = seattleclearinghouse_xmlrpc.SeattleGENIClient(username=XMLRPC_CRED['username'], api_key=XMLRPC_CRED['api_key'], xmlrpc_url= XMLRPC_SERVER_URL, allow_ssl_insecure=True) 
    7979 
    8080    acquired_dict = [] 
     
    141141   
    142142  #use xmlrpc to release the vessel 
    143   proxy = seattlegeni_xmlrpc.SeattleGENIClient(username=XMLRPC_CRED['username'], api_key=XMLRPC_CRED['api_key'], xmlrpc_url= XMLRPC_SERVER_URL, allow_ssl_insecure=True) 
     143  proxy = seattleclearinghouse_xmlrpc.SeattleGENIClient(username=XMLRPC_CRED['username'], api_key=XMLRPC_CRED['api_key'], xmlrpc_url= XMLRPC_SERVER_URL, allow_ssl_insecure=True) 
    144144  proxy.release_resources([resource_handle]) 
    145145   
     
    321321  #release vessels 
    322322  print "###Releasing Vessels###" 
    323   proxy = seattlegeni_xmlrpc.SeattleGENIClient(username=XMLRPC_CRED['username'], api_key=XMLRPC_CRED['api_key'], xmlrpc_url= XMLRPC_SERVER_URL, allow_ssl_insecure=True) 
     323  proxy = seattleclearinghouse_xmlrpc.SeattleGENIClient(username=XMLRPC_CRED['username'], api_key=XMLRPC_CRED['api_key'], xmlrpc_url= XMLRPC_SERVER_URL, allow_ssl_insecure=True) 
    324324  proxy.release_resources(client_ip_handle_dict.values()) 
    325325   
     
    383383  #release vessels 
    384384  print "###Releasing Vessels###" 
    385   proxy = seattlegeni_xmlrpc.SeattleGENIClient(username=XMLRPC_CRED['username'], api_key=XMLRPC_CRED['api_key'], xmlrpc_url= XMLRPC_SERVER_URL, allow_ssl_insecure=True) 
     385  proxy = seattleclearinghouse_xmlrpc.SeattleGENIClient(username=XMLRPC_CRED['username'], api_key=XMLRPC_CRED['api_key'], xmlrpc_url= XMLRPC_SERVER_URL, allow_ssl_insecure=True) 
    386386  proxy.release_resources(client_ip_handle_dict.values()) 
    387387   
  • seattle/trunk/dist/build_demokit.py

    r3744 r5483  
    6969  # Copy necessary Seattle files 
    7070  shutil.copy2(trunk_location + os.sep + "experimentmanager/experimentlib.py", temp_demokit_dir) 
    71   shutil.copy2(trunk_location + os.sep + "seattlegeni/xmlrpc_clients/seattlegeni_xmlrpc.py", temp_demokit_dir) 
     71  shutil.copy2(trunk_location + os.sep + "seattlegeni/xmlrpc_clients/seattleclearinghouse_xmlrpc.py", temp_demokit_dir) 
    7272  shutil.copy2(trunk_location + os.sep + "experimentmanager/repyimporter.py", temp_demokit_dir) 
    7373 
  • seattle/trunk/dist/demokit_files.fi

    r3744 r5483  
    130130req virtual_namespace.py 
    131131req experimentlib.py 
    132 req seattlegeni_xmlrpc.py 
     132req seattleclearinghouse_xmlrpc.py 
    133133req repyimporter.py 
    134134req LICENSE.txt, LICENSE.TXT 
  • seattle/trunk/experimentmanager/examples/seattlegeni_maintain_vessels.py

    r3274 r5483  
    2727 
    2828# If using secure ssl communication with seattlegeni, then this is the path 
    29 # to the CA certs file. See the file seattlegeni_xmlrpc.py for details. 
     29# 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) 
    3131experimentlib.SEATTLEGENI_CA_CERTS_FILES = None 
  • seattle/trunk/experimentmanager/experimentlib.py

    r4444 r5483  
    1717<Usage> 
    1818  Ensure that this file is in a directory containing the seattlelib files as 
    19   well as the seattlegeni_xmlrpc.py module. In your own script, add: 
     19  well as the seattleclearinghouse_xmlrpc.py module. In your own script, add: 
    2020   
    2121    import experimentlib 
     
    111111import xmlrpclib 
    112112 
    113 import seattlegeni_xmlrpc 
     113import seattleclearinghouse_xmlrpc 
    114114 
    115115# We use a helper module to do repy module imports so that we don't import 
     
    271271#This is the base class for all SeattleGENI errors. We make this available 
    272272#in the namespace of the experimentlib so that clients do not have to import 
    273 #seattlegeni_xmlrpc to catch these. 
    274 SeattleGENIError = seattlegeni_xmlrpc.SeattleGENIError 
     273#seattleclearinghouse_xmlrpc to catch these. 
     274SeattleGENIError = seattleclearinghouse_xmlrpc.SeattleGENIError 
    275275 
    276276# We make these available, as well, in case users find them useful. We prefix 
    277277# all of these error names with SeattleGENI. 
    278 SeattleGENICommunicationError = seattlegeni_xmlrpc.CommunicationError 
    279 SeattleGENIInternalError = seattlegeni_xmlrpc.InternalError 
    280 SeattleGENIAuthenticationError = seattlegeni_xmlrpc.AuthenticationError 
    281 SeattleGENIInvalidRequestError = seattlegeni_xmlrpc.InvalidRequestError 
    282 SeattleGENINotEnoughCreditsError = seattlegeni_xmlrpc.NotEnoughCreditsError 
    283 SeattleGENIUnableToAcquireResourcesError = seattlegeni_xmlrpc.UnableToAcquireResourcesError 
     278SeattleGENICommunicationError = seattleclearinghouse_xmlrpc.CommunicationError 
     279SeattleGENIInternalError = seattleclearinghouse_xmlrpc.InternalError 
     280SeattleGENIAuthenticationError = seattleclearinghouse_xmlrpc.AuthenticationError 
     281SeattleGENIInvalidRequestError = seattleclearinghouse_xmlrpc.InvalidRequestError 
     282SeattleGENINotEnoughCreditsError = seattleclearinghouse_xmlrpc.NotEnoughCreditsError 
     283SeattleGENIUnableToAcquireResourcesError = seattleclearinghouse_xmlrpc.UnableToAcquireResourcesError 
    284284 
    285285 
     
    15731573  """ 
    15741574  Helper function to limit the potential errors raised by seattlegeni_* 
    1575   functions to SeattleGENIError or classes that extend it. The seattlegeni_xmlrpc 
     1575  functions to SeattleGENIError or classes that extend it. The seattleclearinghouse_xmlrpc 
    15761576  module doesn't catch ProtocolError or unexpected xmlrpc faults. At the level 
    15771577  of the experimentlib, though, we just consider these generic failures for the 
     
    15861586    raise SeattleGENIError("Unexpected XML-RPC fault when talking to SeattleGENI. " + 
    15871587                           "Are you using a current version of experimentlib.py and " + 
    1588                            "seattlegeni_xmlrpc.py? " + traceback.format_exc()) 
     1588                           "seattleclearinghouse_xmlrpc.py? " + traceback.format_exc()) 
    15891589 
    15901590   
     
    15991599    # We use _call_seattlegeni_func because the SeattleGENIClient constructor 
    16001600    # may attempt to communicate with SeattleGENI. 
    1601     client = _call_seattlegeni_func(seattlegeni_xmlrpc.SeattleGENIClient, 
     1601    client = _call_seattlegeni_func(seattleclearinghouse_xmlrpc.SeattleGENIClient, 
    16021602                                    identity['username'], 
    16031603                                    private_key_string=private_key_string, 
  • seattle/trunk/integrationtests/seattleclearinghouse/test_vessel_acquire_renew_release.py

    r5177 r5483  
    2727import sys 
    2828 
    29 import seattlegeni_xmlrpc 
     29import seattleclearinghouse_xmlrpc 
    3030import integrationtestlib 
    3131import send_gmail 
     
    5353 
    5454  try: 
    55     client = seattlegeni_xmlrpc.SeattleGENIClient(username=USERNAME, 
     55    client = seattleclearinghouse_xmlrpc.SeattleGENIClient(username=USERNAME, 
    5656               private_key_string=private_key_string, 
    5757               allow_ssl_insecure=ALLOW_SSL_INSECURE) 
     
    108108  try: 
    109109    return function(*args) 
    110   except seattlegeni_xmlrpc.CommunicationError, e: 
     110  except seattleclearinghouse_xmlrpc.CommunicationError, e: 
    111111    msg = 'Method ' + fname + ' failed. Error: ' + str(e) 
    112112    _notify_admins(msg) 
    113   except seattlegeni_xmlrpc.UnableToAcquireResourcesError, e: 
     113  except seattleclearinghouse_xmlrpc.UnableToAcquireResourcesError, e: 
    114114    msg = 'Failed to acquire resources. Error: ' + str(e) 
    115115    _notify_admins(msg) 
  • seattle/trunk/production_nat_new/src/nmpatch/addme.py

    r4118 r5483  
    11""" 
    2 Example of using the seattlegeni_xmlrpc module's SeattleGENIClient. 
     2Example of using the seattleclearinghouse_xmlrpc module's SeattleGENIClient. 
    33 
    44This script tries to acquire, renew, and release some vessels and prints out 
     
    2323 
    2424# Allowing SSL to be insecure means it will be susceptible to MITM attacks. 
    25 # See the instructions in seattlegeni_xmlrpc.py for using SSL securely. 
     25# See the instructions in seattleclearinghouse_xmlrpc.py for using SSL securely. 
    2626ALLOW_SSL_INSECURE = True 
    2727 
     
    9898""" 
    9999<Program> 
    100   seattlegeni_xmlrpc.py 
     100  seattleclearinghouse_xmlrpc.py 
    101101 
    102102<Started> 
  • seattle/trunk/protogeni_integration/README.txt

    r3982 r5483  
    1111Files that are required to run XMLRPC server: 
    1212 
    13   1. seattlegeni_xmlrpc_server.pl (included) 
     13  1. seattleclearinghouse_xmlrpc_server.pl (included) 
    1414  2. generate_pubkey.py (included) 
    1515  3. protogeni reference component files. 
    16   4. seattlegeni_xmlrpc.logfile 
     16  4. seattleclearinghouse_xmlrpc.logfile 
    1717  5. protogeni_user_file.txt 
    1818  6. protogeni_vessel_handle.txt 
     
    7070     to some other value after the XMLRPC server has run. 
    7171 
    72   7. Edit the seattlegeni_xmlrpc_server.pl file to make sure some of the global 
     72  7. Edit the seattleclearinghouse_xmlrpc_server.pl file to make sure some of the global 
    7373     variables are set correctly if not done so already. The variables that  
    7474     need to be changed if necessary are: 
     
    113113    
    114114    These files are used to grant access to emulab users. 
    115   * The path to the seattlegeni_xmlrpc_server.pl should be set for the variable ScriptAlias 
     115  * The path to the seattleclearinghouse_xmlrpc_server.pl should be set for the variable ScriptAlias 
    116116    in line 49. 
    117117  * The directory where the  XMLRPC server resides should be set at line 51 as the directory path. 
  • seattle/trunk/protogeni_integration/prepare_seattlegeni_server.py

    r3982 r5483  
    2424CURRENT_DIR = "" 
    2525 
    26 create_required_files_list = ['seattlegeni_xmlrpc.logfile', 'protogeni_user_file.txt', 
     26create_required_files_list = ['seattleclearinghouse_xmlrpc.logfile', 'protogeni_user_file.txt', 
    2727                              'protogeni_vessel_handle.txt', '__lockfile__'] 
    2828 
     
    114114#  should have been done in Step 2 and 3 in the README.txt              
    115115#                                                                  
    116 #  seattlegeni_xmlrpc_server.pl:                                                   
     116#  seattleclearinghouse_xmlrpc_server.pl:                                                   
    117117#    * use lib '/path/to/protogeni/reference-cm-2.0/xmlrpc'; (Line 12) 
    118118#    * use lib '/path/to/protogeni/reference-cm-2.0/lib'; (Line 13)    
  • seattle/trunk/protogeni_integration/seattleclearinghouse_xmlrpc_server.pl

    r3982 r5483  
    9696my $ERROR_LOG = 1; 
    9797 
    98 my $log_filepath = $directory_prefix . "seattlegeni_xmlrpc.logfile"; 
     98my $log_filepath = $directory_prefix . "seattleclearinghouse_xmlrpc.logfile"; 
    9999 
    100100 
  • seattle/trunk/protogeni_integration/seattlegeni_apache.conf

    r3951 r5483  
    4747 
    4848 
    49     ScriptAlias /xmlrpc/ /location/of/xmlrpc/server/seattlegeni_xmlrpc_server.pl 
     49    ScriptAlias /xmlrpc/ /location/of/xmlrpc/server/seattleclearinghouse_xmlrpc_server.pl 
    5050 
    5151    <Directory "/location/of/xmlrpc/server/"> 
  • seattle/trunk/protogeni_integration/test/test_seattleclearinghouse_xmlrpc.py

    r3982 r5483  
    11""" 
    2 Program Name: test_seattlegeni_xmlrpc.py 
     2Program Name: test_seattleclearinghouse_xmlrpc.py 
    33Author: Monzur Muhammad 
    44Created: May 25, 2010 
  • seattle/trunk/seattlegeni/xmlrpc_clients/examples/example1.py

    r3227 r5483  
    11""" 
    2 Example of using the seattlegeni_xmlrpc module's SeattleGENIClient. 
     2Example of using the seattleclearinghouse_xmlrpc module's SeattleGENIClient. 
    33 
    44This script tries to acquire, renew, and release some vessels and prints out 
     
    88# This module must be in your python path (for example, in the same directory 
    99# as the current script is in). 
    10 import seattlegeni_xmlrpc 
     10import seattleclearinghouse_xmlrpc 
    1111 
    1212 
     
    2020 
    2121# Allowing SSL to be insecure means it will be susceptible to MITM attacks. 
    22 # See the instructions in seattlegeni_xmlrpc.py for using SSL securely. 
     22# See the instructions in seattleclearinghouse_xmlrpc.py for using SSL securely. 
    2323ALLOW_SSL_INSECURE = False 
    2424 
    2525 
    2626def do_example_acquire_renew_release(): 
    27   client = seattlegeni_xmlrpc.SeattleGENIClient(username=USERNAME, 
     27  client = seattleclearinghouse_xmlrpc.SeattleGENIClient(username=USERNAME, 
    2828                                                private_key_string=PRIVATE_KEY_STRING, 
    2929                                                allow_ssl_insecure=ALLOW_SSL_INSECURE) 
     
    4747    # This is a list of dictionaries just like the one above. 
    4848    newly_acquired_vessels = client.acquire_wan_resources(2) 
    49   except seattlegeni_xmlrpc.NotEnoughCreditsError, err: 
     49  except seattleclearinghouse_xmlrpc.NotEnoughCreditsError, err: 
    5050    print("Couldn't acquire resources because we don't have enough vessel " + 
    5151          "credits: " + str(err)) 
    5252    return 
    53   except seattlegeni_xmlrpc.UnableToAcquireResourcesError, err: 
     53  except seattleclearinghouse_xmlrpc.UnableToAcquireResourcesError, err: 
    5454    print("Couldn't acquire vessels because SeattleGENI doesn't have enough " + 
    5555          "of what we asked for: " + str(err)) 
     
    6464  try: 
    6565    client.renew_resources(acquired_handle_list) 
    66   except seattlegeni_xmlrpc.NotEnoughCreditsError, err: 
     66  except seattleclearinghouse_xmlrpc.NotEnoughCreditsError, err: 
    6767    # This is probably not going to happen immediately after acquiring vessels. 
    6868    print("Couldn't renew vessels because we are over our vessel credit " + 
     
    8888  try: 
    8989    do_example_acquire_renew_release() 
    90   except seattlegeni_xmlrpc.SeattleGENIError: 
     90  except seattleclearinghouse_xmlrpc.SeattleGENIError: 
    9191    # In a real script, you'd want to handle this. Could be an authentication 
    9292    # error, communication error, etc. You can use the fine-grained exceptions 
  • seattle/trunk/seattlegeni/xmlrpc_clients/seattleclearinghouse_xmlrpc.py

    r3841 r5483  
    11""" 
    22<Program> 
    3   seattlegeni_xmlrpc.py 
     3  seattleclearinghouse_xmlrpc.py 
    44 
    55<Started>