From: Tony Mack <tmack@cs.princeton.edu>
Date: Thu, 14 Jan 2010 17:14:17 +0000 (+0000)
Subject: dont forget to set SFA_CM_SLICE_PREFIX
X-Git-Tag: sfa-0.9-9~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=eede29d50da023aa04527429c75514b5692ba097;p=sfa.git

dont forget to set SFA_CM_SLICE_PREFIX
---

diff --git a/config/gen-sfa-cm-config.py b/config/gen-sfa-cm-config.py
index c6d480d9..8c278715 100644
--- a/config/gen-sfa-cm-config.py
+++ b/config/gen-sfa-cm-config.py
@@ -1,17 +1,22 @@
 #!/usr/bin/python
 import os
-from sfa.util.config import Config
+import sys
+sys.path.append('/usr/share/plc_api')
+from sfa.util.config import Config as SfaConfig
+from PLC.Config import Config as PlcConfig
 
-sfa_config = Config()
+sfa_config = SfaConfig()
+plc_config = PlcConfig()
 all_vars = ['SFA_CONFIG_DIR', 'SFA_DATA_DIR', 'SFA_INTERFACE_HRN',
-            'SFA_REGISTRY_HOST', 'SFA_REGISTRY_PORT', 
+            '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_PORT': '12346',
+    'SFA_CM_SLICE_PREFIX': plc_config.PLC_SLICE_PREFIX
     }
      
 const_dict = {}