Change the signature for config validation function

[nfvbench.git] / nfvbench / nfvbench.py

diff --git a/nfvbench/nfvbench.py b/nfvbench/nfvbench.py
index bf39a44..d3f7f02 100644 (file)
--- a/nfvbench/nfvbench.py
+++ b/nfvbench/nfvbench.py
@@ -21,6 +21,8 @@ from chain_runner import ChainRunner
 from collections import defaultdict
 from config import config_load
 from config import config_loads
+from config import get_err_config
+import copy
 import credentials
 import datetime
 from factory import BasicFactory
@@ -87,7 +89,7 @@ class NFVBench(object):
                     "vswitch": self.specs.openstack.vswitch,
                     "encaps": self.specs.openstack.encaps
                 },
-                "config": self.config_plugin.prepare_results_config(dict(self.config)),
+                "config": self.config_plugin.prepare_results_config(copy.deepcopy(self.config)),
                 "benchmarks": {
                     "network": {
                         "service_chain": self.chain_runner.run(),
@@ -120,8 +122,8 @@ class NFVBench(object):
 
     def print_summary(self, result):
         """Print summary of the result"""
-        print NFVBenchSummarizer(result)
-        sys.stdout.flush()
+        summary = NFVBenchSummarizer(result)
+        LOG.info(str(summary))
 
     def save(self, result):
         """Save results in json format file."""
@@ -204,7 +206,7 @@ class NFVBench(object):
                 raise Exception('Please provide existing path for storing results in JSON file. '
                                 'Path used: {path}'.format(path=self.config.std_json_path))
 
-        self.config_plugin.validate_config(self.config)
+        self.config_plugin.validate_config(self.config, self.specs.openstack)
 
 
 def parse_opts_from_cli():
@@ -364,6 +366,11 @@ def parse_opts_from_cli():
                         default=None,
                         help='Override traffic profile direction (requires -fs)')
 
+    parser.add_argument('--log-file', '--logfile', dest='log_file',
+                        action='store',
+                        help='Filename for saving logs',
+                        metavar='<log_file>')
+
     opts, unknown_opts = parser.parse_known_args()
     return opts, unknown_opts
 
@@ -398,14 +405,14 @@ def override_custom_traffic(config, frame_sizes, unidir):
 def check_physnet(name, netattrs):
     if not netattrs.physical_network:
         raise Exception("SRIOV requires physical_network to be specified for the {n} network"
-                            .format(n=name))
+                        .format(n=name))
     if not netattrs.segmentation_id:
         raise Exception("SRIOV requires segmentation_id to be specified for the {n} network"
-                            .format(n=name))
+                        .format(n=name))
 
 def main():
     try:
-        log.setup('nfvbench')
+        log.setup()
         # load default config file
         config, default_cfg = load_default_config()
         # create factory for platform specific classes
@@ -421,7 +428,7 @@ def main():
         openstack_spec = config_plugin.get_openstack_spec()
 
         opts, unknown_opts = parse_opts_from_cli()
-        log.set_level('nfvbench', debug=opts.debug)
+        log.set_level(debug=opts.debug)
 
         if opts.version:
             print pbr.version.VersionInfo('nfvbench').version_string_with_vcs()
@@ -449,6 +456,13 @@ def main():
                 LOG.info('Loading configuration string: ' + opts.config)
                 config = config_loads(opts.config, config)
 
+        # Making sure no unknown option is given
+        err_config = get_err_config(config, default_cfg)
+        if err_config:
+            err_msg = 'Unknown options found in config file/string: ' + err_config
+            LOG.error(err_msg)
+            raise Exception(err_msg)
+
         # traffic profile override options
         override_custom_traffic(config, opts.frame_sizes, opts.unidir)
 
@@ -456,6 +470,8 @@ def main():
         config.generator_profile = opts.generator_profile
         if opts.sriov:
             config.sriov = True
+        if opts.log_file:
+            config.log_file = opts.log_file
 
         # show running config in json format
         if opts.show_config:
@@ -474,6 +490,10 @@ def main():
         # in a copy of the dict (config plugin still holds the original dict)
         config_plugin.set_config(config)
 
+        # add file log if requested
+        if config.log_file:
+            log.add_file_logger(config.log_file)
+
         nfvbench = NFVBench(config, openstack_spec, config_plugin, factory)
 
         if opts.server:
@@ -492,7 +512,9 @@ def main():
         else:
             with utils.RunLock():
                 if unknown_opts:
-                    LOG.warning('Unknown options: ' + ' '.join(unknown_opts))
+                    err_msg = 'Unknown options: ' + ' '.join(unknown_opts)
+                    LOG.error(err_msg)
+                    raise Exception(err_msg)
 
                 # remove unfilled values
                 opts = {k: v for k, v in vars(opts).iteritems() if v is not None}