X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=nfvbench%2Fnfvbench.py;h=6f59e24c59979b945fe1f4bcfcd7c209545a8acb;hb=efc678c9d3843dcfd373b5749a88c51228b0b27c;hp=bbee4f4231a4f0064aed12fd8ba398dec04f9ce8;hpb=5be3729e65156be16a88d94e8943b79edf3f7eb0;p=nfvbench.git diff --git a/nfvbench/nfvbench.py b/nfvbench/nfvbench.py index bbee4f4..6f59e24 100644 --- a/nfvbench/nfvbench.py +++ b/nfvbench/nfvbench.py @@ -131,13 +131,7 @@ class NFVBench(object): def prepare_summary(self, result): """Prepares summary of the result to print and send it to logger (eg: fluentd)""" global fluent_logger - sender = None - if self.config.fluentd.result_tag: - sender = FluentLogHandler(self.config.fluentd.result_tag, - fluentd_ip=self.config.fluentd.ip, - fluentd_port=self.config.fluentd.port) - sender.runlogdate = fluent_logger.runlogdate - summary = NFVBenchSummarizer(result, sender) + summary = NFVBenchSummarizer(result, fluent_logger) LOG.info(str(summary)) def save(self, result): @@ -290,6 +284,12 @@ def parse_opts_from_cli(): action='store_true', help='Use SRIOV (no vswitch - requires SRIOV support in compute nodes)') + parser.add_argument('--use-sriov-middle-net', dest='use_sriov_middle_net', + default=None, + action='store_true', + help='Use SRIOV to handle the middle network traffic ' + '(PVVP with SRIOV only)') + parser.add_argument('-d', '--debug', dest='debug', action='store_true', default=None, @@ -446,18 +446,17 @@ def main(): config = config_plugin.get_config() openstack_spec = config_plugin.get_openstack_spec() - # setup the fluent logger as soon as possible right after the config plugin is called - if config.fluentd.logging_tag: - fluent_logger = FluentLogHandler(config.fluentd.logging_tag, - fluentd_ip=config.fluentd.ip, - fluentd_port=config.fluentd.port) - LOG.addHandler(fluent_logger) - else: - fluent_logger = None - opts, unknown_opts = parse_opts_from_cli() log.set_level(debug=opts.debug) + # setup the fluent logger as soon as possible right after the config plugin is called, + # if there is any logging or result tag is set then initialize the fluent logger + for fluentd in config.fluentd: + if fluentd.logging_tag or fluentd.result_tag: + fluent_logger = FluentLogHandler(config.fluentd) + LOG.addHandler(fluent_logger) + break + if opts.version: print pbr.version.VersionInfo('nfvbench').version_string_with_vcs() sys.exit(0) @@ -467,14 +466,7 @@ def main(): result = json.load(json_data) if opts.user_label: result['config']['user_label'] = opts.user_label - if config.fluentd.result_tag: - sender = FluentLogHandler(config.fluentd.result_tag, - fluentd_ip=config.fluentd.ip, - fluentd_port=config.fluentd.port) - sender.runlogdate = fluent_logger.runlogdate - print NFVBenchSummarizer(result, sender) - else: - print NFVBenchSummarizer(result, None) + print NFVBenchSummarizer(result, fluent_logger) sys.exit(0) # show default config in text/yaml format @@ -489,11 +481,11 @@ def main(): # override default config options with start config at path parsed from CLI # check if it is an inline yaml/json config or a file name if os.path.isfile(opts.config): - LOG.info('Loading configuration file: ' + opts.config) + LOG.info('Loading configuration file: %s', opts.config) config = config_load(opts.config, config, whitelist_keys) config.name = os.path.basename(opts.config) else: - LOG.info('Loading configuration string: ' + opts.config) + LOG.info('Loading configuration string: %s', opts.config) config = config_loads(opts.config, config, whitelist_keys) # traffic profile override options @@ -505,20 +497,29 @@ def main(): config.sriov = True if opts.log_file: config.log_file = opts.log_file + if opts.service_chain: + config.service_chain = opts.service_chain + if opts.service_chain_count: + config.service_chain_count = opts.service_chain_count - # show running config in json format - if opts.show_config: - print json.dumps(config, sort_keys=True, indent=4) - sys.exit(0) + if opts.use_sriov_middle_net: + if (not config.sriov) or (not config.service_chain == ChainType.PVVP): + raise Exception("--use-sriov-middle-net is only valid for PVVP with SRIOV") + config.use_sriov_middle_net = True if config.sriov and config.service_chain != ChainType.EXT: # if sriov is requested (does not apply to ext chains) # make sure the physnet names are specified check_physnet("left", config.internal_networks.left) check_physnet("right", config.internal_networks.right) - if config.service_chain == ChainType.PVVP: + if config.service_chain == ChainType.PVVP and config.use_sriov_middle_net: check_physnet("middle", config.internal_networks.middle) + # show running config in json format + if opts.show_config: + print json.dumps(config, sort_keys=True, indent=4) + sys.exit(0) + # update the config in the config plugin as it might have changed # in a copy of the dict (config plugin still holds the original dict) config_plugin.set_config(config) @@ -531,8 +532,7 @@ def main(): if opts.server: if os.path.isdir(opts.server): - server = WebSocketIoServer(opts.server, nfvbench_instance, fluent_logger, - config.fluentd.result_tag) + server = WebSocketIoServer(opts.server, nfvbench_instance, fluent_logger) nfvbench_instance.set_notifier(server) try: port = int(opts.port)