From: Tony Mack <tmack@cs.princeton.edu>
Date: Mon, 4 Jan 2010 16:03:11 +0000 (+0000)
Subject: geniclient isnt used anymore
X-Git-Tag: sfa-0.9-7~21
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4cde3c8196d2897b5a7a9f3ee3c6230ac964470b;p=sfa.git

geniclient isnt used anymore
---

diff --git a/sfa/server/aggregate.py b/sfa/server/aggregate.py
index 9aee8649..478a5ac0 100644
--- a/sfa/server/aggregate.py
+++ b/sfa/server/aggregate.py
@@ -73,7 +73,7 @@ class Aggregates(dict):
     def connectAggregates(self):
         """
         Get connection details for the trusted peer aggregates from file and 
-        create an GeniClient connection to each. 
+        create an connection to each. 
         """
         aggregates = self.aggregate_info['aggregates']['aggregate']
         if isinstance(aggregates, dict):
@@ -88,8 +88,8 @@ class Aggregates(dict):
                     continue
                 self.interfaces.append(aggregate)
                 # check which client we should use
-                # geniclient is default
-                client_type = 'geniclient'
+                # sfa.util.xmlrpcprotocol is default
+                client_type = 'xmlrpcprotocol'
                 if aggregate.has_key('client') and aggregate['client'] in ['geniclientlight']:
                     client_type = 'geniclientlight'
                 
@@ -104,7 +104,6 @@ class Aggregates(dict):
                     self[hrn] = xmlrpcprotocol.get_server(url, self.api.key_file, self.api.cert_file)
 
         # set up a connection to the local registry
-        # connect to registry using GeniClient
         address = self.api.config.SFA_AGGREGATE_HOST
         port = self.api.config.SFA_AGGREGATE_PORT
         url = 'http://%(address)s:%(port)s' % locals()
diff --git a/sfa/server/registry.py b/sfa/server/registry.py
index 42258464..c5d7cdf1 100644
--- a/sfa/server/registry.py
+++ b/sfa/server/registry.py
@@ -81,7 +81,7 @@ class Registries(dict):
     def connectRegistries(self):
         """
         Get connection details for the trusted peer registries from file and 
-        create an GeniClient connection to each. 
+        create a connection to each. 
         """
         registries = self.registry_info['registries']['registry']
         if isinstance(registries, dict):
@@ -96,8 +96,8 @@ class Registries(dict):
                     continue
                 self.interfaces.append(registry)
                 # check which client we should use
-                # geniclient is default
-                client_type = 'geniclient'
+                # sfa.util.xmlrpcprotocol is default
+                client_type = 'xmlrpcprotocol'
                 if registry.has_key('client') and registry['client'] in ['geniclientlight']:
                     client_type = 'geniclientlight'
                 
@@ -112,7 +112,6 @@ class Registries(dict):
                     self[hrn] = xmlrpcprotocol.get_server(url, self.api.key_file, self.api.cert_file)
 
         # set up a connection to the local registry
-        # connect to registry using GeniClient
         address = self.api.config.SFA_REGISTRY_HOST
         port = self.api.config.SFA_REGISTRY_PORT
         url = 'http://%(address)s:%(port)s' % locals()