X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config%2Fsfa-config-tty;h=2e0e1ed99f6eddd28ee351b40d8b653448c8ce3a;hb=c38cda3920d0efd2edd037f7ce4ea2560e5b293b;hp=5cb575dec1c41c549e08fae94998c3278d3fad22;hpb=e0ffcf4ed82441080a2e1afb6cbfbdc0a57b3c3e;p=sfa.git

diff --git a/config/sfa-config-tty b/config/sfa-config-tty
index 5cb575de..2e0e1ed9 100755
--- a/config/sfa-config-tty
+++ b/config/sfa-config-tty
@@ -15,7 +15,6 @@ import sys
 import os
 import re
 import readline
-import traceback
 import distutils.file_util
 from optparse import OptionParser
 
@@ -29,12 +28,15 @@ all_variables   = ["SFA_REGISTRY_ROOT_AUTH",
                    "SFA_REGISTRY_ENABLED",
                    "SFA_REGISTRY_HOST", 
                    "SFA_REGISTRY_PORT",
+		   "SFA_REGISTRY_TYPE",
                    "SFA_AGGREGATE_ENABLED",
                    "SFA_AGGREGATE_HOST",
                    "SFA_AGGREGATE_PORT",
+		   "SFA_AGGREGATE_TYPE",
                    "SFA_SM_ENABLED",
                    "SFA_SM_HOST",
                    "SFA_SM_PORT",
+		   "SFA_SM_TYPE",
                    "SFA_PLC_USER",
                    "SFA_PLC_PASSWORD",    
                    "SFA_PLC_URL",
@@ -48,6 +50,7 @@ usual_variables = ["SFA_REGISTRY_ROOT_AUTH",
                    "SFA_REGISTRY_LEVEL1_AUTH",
                    "SFA_PLC_USER",
                    "SFA_PLC_PASSWORD",
+                   "SFA_PLC_DB_HOST",
                    "SFA_PLC_DB_USER",
                    "SFA_PLC_DB_PASSWORD",
                    ]
@@ -139,7 +142,7 @@ def get_defaults():
     
     defaults = {}
     for var in dir(sfa_config):
-        if var.startswith('GENI'):
+        if var.startswith('SFA'):
             value = eval("sfa_config.%s" % var)
             defaults[var] = value
 
@@ -207,8 +210,8 @@ def mainloop (default_config, config_file):
                     raise
         elif (answer in ["e","E"]):
             try:
-                prompt_variable (cdef,cread,cwrite,category,variable,
-                                 show_comments,False)
+                for varname in all_variables:
+                    changes[varname] = prompt_variable(varname, default_config)
             except Exception, inst:
                 if (str(inst) != 'BailOut'):
                     raise