From: Tony Mack <tmack@cs.princeton.edu>
Date: Wed, 20 Jan 2010 18:31:22 +0000 (+0000)
Subject: make sure certain address's are resolvable by the component manager
X-Git-Tag: sfa-0.9-10~7
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=d199baa96e61847ad87b71ec947f2c3ead785aee

make sure certain address's are resolvable by the component manager
---

diff --git a/config/gen-sfa-cm-config.py b/config/gen-sfa-cm-config.py
index 8c278715..d7cda113 100644
--- a/config/gen-sfa-cm-config.py
+++ b/config/gen-sfa-cm-config.py
@@ -1,31 +1,46 @@
 #!/usr/bin/python
 import os
 import sys
+import socket
 sys.path.append('/usr/share/plc_api')
 from sfa.util.config import Config as SfaConfig
 from PLC.Config import Config as PlcConfig
 
 sfa_config = SfaConfig()
 plc_config = PlcConfig()
+default_host = socket.gethostbyname(socket.gethostname())
 all_vars = ['SFA_CONFIG_DIR', 'SFA_DATA_DIR', 'SFA_INTERFACE_HRN',
             'SFA_CM_SLICE_PREFIX', 'SFA_REGISTRY_HOST', 'SFA_REGISTRY_PORT', 
             'SFA_AGGREGATE_HOST', 'SFA_AGGREGATE_PORT', 
             'SFA_SM_HOST', 'SFA_SM_PORT',
             'SFA_CM_ENABLED', 'SFA_CM_HOST', 'SFA_CM_PORT']
+
 defaults = {
     'SFA_CM_ENABLED': '1',
     'SFA_CM_HOST': 'localhost',
     'SFA_CM_PORT': '12346',
     'SFA_CM_SLICE_PREFIX': plc_config.PLC_SLICE_PREFIX
     }
+
+host_defaults = {
+    'SFA_REGISTRY_HOST': default_host,
+    'SFA_AGGREGATE_HOST': default_host,
+    'SFA_SM_HOST': default_host,    
+    }
      
 const_dict = {}
 for key in all_vars:
-    value = ""        
+    value = ""
+    
+           
     if key in defaults:
         value = defaults[key]
     elif hasattr(sfa_config, key):
         value = getattr(sfa_config, key)
+        # sfa_config may specify localhost instead of a resolvalbe host or ip
+        # if so replace this with the host's address
+        if key in host_defaults and value in ['localhost', '127.0.0.1']:
+            value = host_defaults[key] 
     const_dict[key] = value
 
 filename = sfa_config.config_path + os.sep + 'sfa_component_config'