rename xmlrpcprotocol into sfaprotocol

diff --git a/sfa/client/xmlrpcprotocol.py b/sfa/client/sfaprotocol.py
similarity index 100%
rename from sfa/client/xmlrpcprotocol.py
rename to sfa/client/sfaprotocol.py

diff --git a/sfa/client/sfascan.py b/sfa/client/sfascan.py
index f252378..6a7e79a 100755 (executable)
--- a/sfa/client/sfascan.py
+++ b/sfa/client/sfascan.py
@@ -13,7 +13,7 @@ from optparse import OptionParser
 
 from sfa.client.sfi import Sfi
 from sfa.util.sfalogging import logger, DEBUG
-import sfa.client.xmlrpcprotocol as xmlrpcprotocol
+import sfa.client.sfaprotocol as sfaprotocol
 
 def url_hostname_port (url):
     if url.find("://")<0:
@@ -151,8 +151,8 @@ class Interface:
             url=self.url()
             logger.info('issuing GetVersion at %s'%url)
             # setting timeout here seems to get the call to fail - even though the response time is fast
-            #server=xmlrpcprotocol.server_proxy(url, key_file, cert_file, verbose=self.verbose, timeout=options.timeout)
-            server=xmlrpcprotocol.server_proxy(url, key_file, cert_file, verbose=self.verbose)
+            #server=sfaprotocol.server_proxy(url, key_file, cert_file, verbose=self.verbose, timeout=options.timeout)
+            server=sfaprotocol.server_proxy(url, key_file, cert_file, verbose=self.verbose)
             self._version=server.GetVersion()
         except:
             logger.log_exc("failed to get version")

diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
index 845b2b1..2314d40 100755 (executable)
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -33,7 +33,7 @@ from sfa.rspecs.rspec_converter import RSpecConverter
 from sfa.rspecs.version_manager import VersionManager
 from sfa.client.return_value import ReturnValue
 
-import sfa.client.xmlrpcprotocol as xmlrpcprotocol
+import sfa.client.sfaprotocol as sfaprotocol
 from sfa.client.client_helper import pg_users_arg, sfa_users_arg
 
 AGGREGATE_PORT=12346
@@ -400,14 +400,13 @@ class Sfi:
        # Get key and certificate
        key_file = self.get_key_file()
        cert_file = self.get_cert_file(key_file)
-       self.key = Keypair(filename=key_file) 
        self.key_file = key_file
        self.cert_file = cert_file
        self.cert = GID(filename=cert_file)
        self.logger.info("Contacting Registry at: %s"%self.reg_url)
-       self.registry = xmlrpcprotocol.server_proxy(self.reg_url, key_file, cert_file, timeout=self.options.timeout, verbose=self.options.debug)  
+       self.registry = sfaprotocol.server_proxy(self.reg_url, key_file, cert_file, timeout=self.options.timeout, verbose=self.options.debug)  
        self.logger.info("Contacting Slice Manager at: %s"%self.sm_url)
-       self.slicemgr = xmlrpcprotocol.server_proxy(self.sm_url, key_file, cert_file, timeout=self.options.timeout, verbose=self.options.debug)
+       self.slicemgr = sfaprotocol.server_proxy(self.sm_url, key_file, cert_file, timeout=self.options.timeout, verbose=self.options.debug)
        return
 
     def get_cached_server_version(self, server):
@@ -500,7 +499,7 @@ class Sfi:
             self.logger.info("Getting Registry issued cert")
             self.read_config()
             # *hack.  need to set registyr before _get_gid() is called 
-            self.registry = xmlrpcprotocol.server_proxy(self.reg_url, key_file, cert_file, timeout=self.options.timeout, verbose=self.options.debug)
+            self.registry = sfaprotocol.server_proxy(self.reg_url, key_file, cert_file, timeout=self.options.timeout, verbose=self.options.debug)
             gid = self._get_gid(type='user')
             self.registry = None 
             self.logger.info("Writing certificate to %s"%cert_file)
@@ -673,7 +672,7 @@ class Sfi:
         host_parts = host.split('/')
         host_parts[0] = host_parts[0] + ":" + str(port)
         url =  "http://%s" %  "/".join(host_parts)    
-        return xmlrpcprotocol.server_proxy(url, keyfile, certfile, timeout=self.options.timeout, verbose=self.options.debug)
+        return sfaprotocol.server_proxy(url, keyfile, certfile, timeout=self.options.timeout, verbose=self.options.debug)
 
     # xxx opts could be retrieved in self.options
     def server_proxy_from_opts(self, opts):
@@ -853,7 +852,7 @@ class Sfi:
         elif record['type'] in ["slice"]:
             try:
                 cred = self.get_slice_cred(record.get_name()).save_to_string(save_parents=True)
-            except xmlrpcprotocol.ServerException, e:
+            except sfaprotocol.ServerException, e:
                # XXX smbaker -- once we have better error return codes, update this
                # to do something better than a string compare
                if "Permission error" in e.args[0]:

diff --git a/sfa/plc/plcomponentdriver.py b/sfa/plc/plcomponentdriver.py
index 07a655c..5e74612 100644 (file)
--- a/sfa/plc/plcomponentdriver.py
+++ b/sfa/plc/plcomponentdriver.py
@@ -1,7 +1,7 @@
 import os
 import tempfile
 
-import sfa.client.xmlrpcprotocol as xmlrpcprotocol
+import sfa.client.sfaprotocol as sfaprotocol
 from sfa.plc.nodemanager import NodeManager
 
 from sfa.trust.credential import Credential
@@ -33,7 +33,7 @@ class PlComponentDriver:
         addr, port = self.config.SFA_REGISTRY_HOST, self.config.SFA_REGISTRY_PORT
         url = "http://%(addr)s:%(port)s" % locals()
         ### xxx this would require access to the api...
-        server = xmlrpcprotocol.server_proxy(url, self.key_file, self.cert_file)
+        server = sfaprotocol.server_proxy(url, self.key_file, self.cert_file)
         return server
 
     def get_node_key(self):

diff --git a/sfa/server/interface.py b/sfa/server/interface.py
index 3866a45..920857c 100644 (file)
--- a/sfa/server/interface.py
+++ b/sfa/server/interface.py
@@ -1,5 +1,5 @@
 #from sfa.util.faults import *
-import sfa.client.xmlrpcprotocol as xmlrpcprotocol
+import sfa.client.sfaprotocol as sfaprotocol
 from sfa.util.xml import XML
 
 # GeniLight client support is optional
@@ -31,7 +31,7 @@ class Interface:
             # xxx url and self.api are undefined
             server = GeniClientLight(url, self.api.key_file, self.api.cert_file)
         else:
-            server = xmlrpcprotocol.server_proxy(self.get_url(), key_file, cert_file, timeout) 
+            server = sfaprotocol.server_proxy(self.get_url(), key_file, cert_file, timeout) 
  
         return server       
 ##

diff --git a/sfa/server/sfa-clean-peer-records.py b/sfa/server/sfa-clean-peer-records.py
index 62acb4b..5024a10 100644 (file)
--- a/sfa/server/sfa-clean-peer-records.py
+++ b/sfa/server/sfa-clean-peer-records.py
@@ -14,7 +14,7 @@ from sfa.server.registry import Registries
 
 from sfa.storage.table import SfaTable
 
-import sfa.client.xmlrpcprotocol as xmlrpcprotocol 
+import sfa.client.sfaprotocol as sfaprotocol 
 
 from sfa.generic import Generic
 
@@ -35,7 +35,7 @@ def main():
     # and a valid credential
     authority = config.SFA_INTERFACE_HRN
     url = 'http://%s:%s/' %(config.SFA_REGISTRY_HOST, config.SFA_REGISTRY_PORT)
-    registry = xmlrpcprotocol.server_proxy(url, key_file, cert_file)
+    registry = sfaprotocol.server_proxy(url, key_file, cert_file)
     sfa_api = Generic.the_flavour()
     credential = sfa_api.getCredential()
 

diff --git a/sfa/server/sfa-start.py b/sfa/server/sfa-start.py
index 6c05060..4f72b67 100755 (executable)
--- a/sfa/server/sfa-start.py
+++ b/sfa/server/sfa-start.py
@@ -39,7 +39,6 @@ from optparse import OptionParser
 from sfa.util.sfalogging import logger
 from sfa.util.xrn import get_authority, hrn_to_urn
 from sfa.util.config import Config
-import sfa.client.xmlrpcprotocol as xmlrpcprotocol
 from sfa.trust.gid import GID
 from sfa.trust.trustedroots import TrustedRoots
 from sfa.trust.certificate import Keypair, Certificate

diff --git a/sfa/server/sfa_component_setup.py b/sfa/server/sfa_component_setup.py
index 3775391..05a9525 100755 (executable)
--- a/sfa/server/sfa_component_setup.py
+++ b/sfa/server/sfa_component_setup.py
@@ -6,7 +6,7 @@ from optparse import OptionParser
 
 from sfa.util.faults import ConnectionKeyGIDMismatch
 from sfa.util.config import Config
-import sfa.client.xmlrpcprotocol as xmlrpcprotocol
+import sfa.client.sfaprotocol as sfaprotocol
 from sfa.util.plxrn import hrn_to_pl_slicename, slicename_to_hrn
 
 from sfa.trust.certificate import Keypair, Certificate
@@ -48,7 +48,7 @@ def server_proxy(url=None, port=None, keyfile=None, certfile=None,verbose=False)
     if verbose:
         print "Contacting registry at: %(url)s" % locals()
 
-    server = xmlrpcprotocol.server_proxy(url, keyfile, certfile)
+    server = sfaprotocol.server_proxy(url, keyfile, certfile)
     return server    
     
 

diff --git a/tests/testInterfaces.py b/tests/testInterfaces.py
index fb57a71..f12cae1 100755 (executable)
--- a/tests/testInterfaces.py
+++ b/tests/testInterfaces.py
@@ -4,7 +4,7 @@ import os
 import random
 import string
 import unittest
-import sfa.util.xmlrpcprotocol as xmlrpcprotocol
+import sfa.util.sfaprotocol as sfaprotocol
 from unittest import TestCase
 from optparse import OptionParser
 from sfa.util.xrn import get_authority
@@ -43,10 +43,10 @@ class Client:
         self.cert.save_to_file(cert_file)        
         SFI_AGGREGATE = config.SFI_SM.replace('12347', '12346')
         SFI_CM = 'http://' + options.cm_host + ':12346'
-        self.registry = xmlrpcprotocol.server_proxy(config.SFI_REGISTRY, key_file, cert_file)
-        self.aggregate = xmlrpcprotocol.server_proxy(SFI_AGGREGATE, key_file, cert_file)
-        self.sm = xmlrpcprotocol.server_proxy(config.SFI_SM, key_file, cert_file)
-        self.cm = xmlrpcprotocol.server_proxy(SFI_CM, key_file, cert_file)
+        self.registry = sfaprotocol.server_proxy(config.SFI_REGISTRY, key_file, cert_file)
+        self.aggregate = sfaprotocol.server_proxy(SFI_AGGREGATE, key_file, cert_file)
+        self.sm = sfaprotocol.server_proxy(config.SFI_SM, key_file, cert_file)
+        self.cm = sfaprotocol.server_proxy(SFI_CM, key_file, cert_file)
         self.hrn = config.SFI_USER
         # XX defaulting to user, but this should be configurable so we can
         # test from components persepctive
@@ -170,7 +170,7 @@ class RegistryTest(BasicTestCase):
         server_exception = False 
         try:
             callable(self.credential)
-        except xmlrpcprotocol.ServerException:
+        except sfaprotocol.ServerException:
             server_exception = True
         finally:
             if self.type in ['user'] and not server_exception: