diff options
Diffstat (limited to 'nfvbench/nfvbench.py')
| -rw-r--r-- | nfvbench/nfvbench.py | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/nfvbench/nfvbench.py b/nfvbench/nfvbench.py index a4f9ead..5b94ce7 100644 --- a/nfvbench/nfvbench.py +++ b/nfvbench/nfvbench.py @@ -21,6 +21,7 @@ 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 @@ -404,10 +405,10 @@ 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: @@ -455,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) @@ -504,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} |