Changeset 5485

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

Replace all occurrences of SeattleGENIClient in xmlrpc lib. Refs #1055

Location:
seattle/trunk
Files:
6 modified

Legend:

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

    r5483 r5485  
    7676    num_vessels_to_get = number_vessels - len(ip_handle_dict.keys()) 
    7777   
    78     proxy = seattleclearinghouse_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.SeattleClearinghouseClient(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 = seattleclearinghouse_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.SeattleClearinghouseClient(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 = seattleclearinghouse_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.SeattleClearinghouseClient(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 = seattleclearinghouse_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.SeattleClearinghouseClient(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/experimentmanager/experimentlib.py

    r5483 r5485  
    15971597    _validate_identity(identity, require_private_key=True, require_username=True) 
    15981598    private_key_string = rsa.rsa_privatekey_to_string(identity["privatekey_dict"]) 
    1599     # We use _call_seattlegeni_func because the SeattleGENIClient constructor 
    1600     # may attempt to communicate with SeattleGENI. 
    1601     client = _call_seattlegeni_func(seattleclearinghouse_xmlrpc.SeattleGENIClient, 
     1599    # We use _call_seattlegeni_func because the SeattleClearinghouseClient constructor 
     1600    # may attempt to communicate with SeattleClearinghouse. 
     1601    client = _call_seattlegeni_func(seattleclearinghouse_xmlrpc.SeattleClearinghouseClient, 
    16021602                                    identity['username'], 
    16031603                                    private_key_string=private_key_string, 
  • seattle/trunk/integrationtests/seattleclearinghouse/test_vessel_acquire_renew_release.py

    r5483 r5485  
    5353 
    5454  try: 
    55     client = seattleclearinghouse_xmlrpc.SeattleGENIClient(username=USERNAME, 
     55    client = seattleclearinghouse_xmlrpc.SeattleClearinghouseClient(username=USERNAME, 
    5656               private_key_string=private_key_string, 
    5757               allow_ssl_insecure=ALLOW_SSL_INSECURE) 
  • seattle/trunk/production_nat_new/src/nmpatch/addme.py

    r5483 r5485  
    11""" 
    2 Example of using the seattleclearinghouse_xmlrpc module's SeattleGENIClient. 
     2Example of using the seattleclearinghouse_xmlrpc module's SeattleClearinghouseClient. 
    33 
    44This script tries to acquire, renew, and release some vessels and prints out 
     
    2828 
    2929def do_example_acquire_renew_release(): 
    30   client = SeattleGENIClient(username=USERNAME, 
     30  client = SeattleClearinghouseClient(username=USERNAME, 
    3131                             api_key=API_KEY, 
    3232                             allow_ssl_insecure=ALLOW_SSL_INSECURE) 
     
    111111   
    112112  Your Python scripts can import this library, create an instance of the 
    113   SeattleGENIClient class, then call methods on the object to perform XMLRPC 
     113  SeattleClearinghouseClient class, then call methods on the object to perform XMLRPC 
    114114  calls through the SeattleGENI XMLRPC API. 
    115115 
     
    129129  attack. To enable this insecure mode, include the argument: 
    130130    allow_ssl_insecure=True 
    131   when creating a SeattleGENIClient instance. 
     131  when creating a SeattleClearinghouseClient instance. 
    132132   
    133133<Notes> 
     
    166166 
    167167 
    168 class SeattleGENIClient(object): 
     168class SeattleClearinghouseClient(object): 
    169169  """ 
    170170  Implementation of an XMLRPC client for communicating with a SeattleGENI 
  • seattle/trunk/seattlegeni/xmlrpc_clients/examples/example1.py

    r5483 r5485  
    11""" 
    2 Example of using the seattleclearinghouse_xmlrpc module's SeattleGENIClient. 
     2Example of using the seattleclearinghouse_xmlrpc module's SeattleClearinghouseClient. 
    33 
    44This script tries to acquire, renew, and release some vessels and prints out 
     
    1414 
    1515# Only one of either the API key or the private key is needed. If providing 
    16 # your API key, be sure to pass the API key to the SeattleGENIClient 
     16# your API key, be sure to pass the API key to the SeattleClearinghouseClient 
    1717# constructor below. 
    1818#API_KEY = "your_api_key" 
     
    2525 
    2626def do_example_acquire_renew_release(): 
    27   client = seattleclearinghouse_xmlrpc.SeattleGENIClient(username=USERNAME, 
     27  client = seattleclearinghouse_xmlrpc.SeattleClearinghouseClient(username=USERNAME, 
    2828                                                private_key_string=PRIVATE_KEY_STRING, 
    2929                                                allow_ssl_insecure=ALLOW_SSL_INSECURE) 
  • seattle/trunk/seattlegeni/xmlrpc_clients/seattleclearinghouse_xmlrpc.py

    r5483 r5485  
    1414   
    1515  Your Python scripts can import this library, create an instance of the 
    16   SeattleGENIClient class, then call methods on the object to perform XMLRPC 
     16  SeattleClearinghouseClient class, then call methods on the object to perform XMLRPC 
    1717  calls through the SeattleGENI XMLRPC API. 
    1818 
     
    3232  attack. To enable this insecure mode, include the argument: 
    3333    allow_ssl_insecure=True 
    34   when creating a SeattleGENIClient instance. 
     34  when creating a SeattleClearinghouseClient instance. 
    3535   
    3636<Notes> 
     
    7272 
    7373 
    74 class SeattleGENIClient(object): 
     74class SeattleClearinghouseClient(object): 
    7575  """ 
    7676  Implementation of an XMLRPC client for communicating with a SeattleGENI