Manually merge 136 to add storage_protocol support in generateconfs and address some unwanted side-effects identified around output_objects, environ and configuration defaults.

git-svn-id: svn+ssh://svn.code.sf.net/p/migrid/code/trunk@6154 b75ad72c-e7d7-11dd-a971-7dbc132099af

Author: jonasbardino

mig/install/MiGserver-template.conf

@@ -187,6 +187,7 @@ mig_server_id = %(server_fqdn)s.0
 empty_job_name = no_grid_jobs_in_grid_scheduler
 notify_protocols = email
 smtp_server = __SMTP_SERVER__
+storage_protocols = __STORAGE_PROTOCOLS__
 gdp_email_notify = __GDP_EMAIL_NOTIFY__
 
 # Optional extra service interfaces with common structure

mig/shared/configuration.py

@@ -619,7 +619,7 @@ def fix_missing(config_file, verbose=True):
     'scriptlanguages': [],
     'jobtypes': [],
     'lrmstypes': [],
-    'storage_protocols': ['sftp'],
+    'storage_protocols': [],
     'server_cert': '',
     'server_key': '',
     'passphrase_file': '',

mig/shared/functionality/cat.py

@@ -98,17 +98,23 @@ def main(client_id, user_arguments_dict, environ=None):
     (configuration, logger, output_objects, op_name) = \
         initialize_main_variables(client_id)
 
-    return _main(configuration, logger, op_name=op_name,
+    return _main(configuration, logger, environ, op_name=op_name,
                  output_objects=output_objects, client_id=client_id,
                  user_arguments_dict=user_arguments_dict)
 
 
-def _main(configuration, logger, op_name='', output_objects=[], client_id=None,
-          user_arguments_dict=None, environ=None):
+def _main(configuration, logger, environ, op_name='', output_objects=None, client_id=None,
+          user_arguments_dict=None):
     """Actual main function to generate contents for the front end"""
+
+    assert environ is not None, "required arg: environ"
+
     if logger is None:
         logger = configuration.logger
 
+    if output_objects is None:
+        output_objects = [] # create a new list if one was not supplied
+
     client_dir = client_id_dir(client_id)
     defaults = signature()[1]
     status = returnvalues.OK