From: Tony Mack <tmack@cs.princeton.edu>
Date: Thu, 26 Mar 2009 23:49:24 +0000 (+0000)
Subject: fix bug in connectRegistries:
X-Git-Tag: sfa-0.9-0@14641~536
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=49a935f8d2ff6f83a48f7f127450f4810bce06f0;p=sfa.git

fix bug in connectRegistries:
---

diff --git a/geni/registry.py b/geni/registry.py
index eb7e5991..bcd1e8d3 100644
--- a/geni/registry.py
+++ b/geni/registry.py
@@ -194,15 +194,18 @@ class Registry(GeniServer):
         create an GeniClient connection to each. 
         """
         self.registries= {}
+        required_fields = ['hrn', 'addr', 'port']
         registries = self.registry_info['registries']['registry']
         if isinstance(registries, dict):
             registries = [registries]
         if isinstance(registries, list):
             for registry in registries:
                 # create xmlrpc connection using GeniClient
+                if not set(required_fields).issubset(registry.keys()):
+                    continue  
+                hrn, address, port = registry['hrn'], registry['addr'], registry['port']
                 if not hrn or not address or not port:
                     continue
-                hrn, address, port = registry['hrn'], registry['addr'], registry['port']
                 url = 'http://%(address)s:%(port)s' % locals()
                 self.registries[hrn] = GeniClient(url, self.key_file, self.cert_file)