import argparse
import logging
+import os
from nitsi.logger import init_logging, Log_Formatter
from nitsi.recipe import RecipeExeption
import nitsi.test
-import nitsi.settings
+from nitsi.settings import settings_parse_copy_from, NitsiSettings
logger = logging.getLogger("nitsi")
logger.addHandler(fh)
logger.debug("We now logging everything to {}/general.log".format(log_dir))
- # Build up settings dict
- settings = {}
+ # Build up settings
+ settings = nitsi.settings.NitsiSettings(priority_list=["cmd", "settings-file", "nitsi-default"])
+
if args.name:
- settings["name"] = args.name
+ settings.set_config_value("name", args.name, type="cmd")
if args.desc:
- settings["description"] = args.desc
+ settings.set_config_value("description", args.desc, type="cmd")
if args.copy_to:
- settings["copy_to"] = args.copy_to
+ settings.set_config_value("copy_to", args.copy_to, type="cmd")
if args.copy_from:
- settings["copy_from"] = nitsi.settings.settings_parse_copy_from(args.copy_from)
+ settings.set_config_value("copy_from", nitsi.settings.settings_parse_copy_from(args.copy_from), type="cmd")
if args.virtual_environ_path:
- settings["virtual_environ_path"] = args.virtual_environ_path
+ path = args.virtual_environ_path
+ if not os.path.isabs(path):
+ path = os.path.abspath(path)
+ settings.set_config_value("virtual_environ_path", path, type="cmd")
# here we run a test
try:
dir=args.dir,
recipe_file=args.recipe,
settings_file=args.settings,
- cmd_settings=settings)
- currenttest.read_settings()
+ settings=settings)
currenttest.virtual_environ_setup_stage_1()
currenttest.load_recipe()
currenttest.virtual_environ_setup_stage_2()