From ea51c75ee0a48a6ccfda70fa6792d011461c8044 Mon Sep 17 00:00:00 2001
From: mortenhillbom <mortenhillbom@gmail.com>
Date: Tue, 19 Sep 2017 15:58:02 -0700
Subject: NFVBENCH-29 Add a user-provided label option to the fluentd perf
records
Change-Id: Ic8bece88a3235130cb0322bff41a09035e7c6d9f
Signed-off-by: mortenhillbom <mortenhillbom@gmail.com>
---
nfvbench/cfg.default.yaml | 4 ++++
nfvbench/nfvbench.py | 6 +++++-
nfvbench/summarizer.py | 1 +
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/nfvbench/cfg.default.yaml b/nfvbench/cfg.default.yaml
index f36cbea..fee65cb 100644
--- a/nfvbench/cfg.default.yaml
+++ b/nfvbench/cfg.default.yaml
@@ -384,3 +384,7 @@ fluentd:
# Module and class name of factory which will be used to provide classes dynamically for other components.
factory_module: 'nfvbench.factory'
factory_class: 'BasicFactory'
+
+# Custom label added for every perf record generated during this run.
+# Can be overriden by --user-label
+user_label:
\ No newline at end of file
diff --git a/nfvbench/nfvbench.py b/nfvbench/nfvbench.py
index 920838a..4256f24 100644
--- a/nfvbench/nfvbench.py
+++ b/nfvbench/nfvbench.py
@@ -377,7 +377,11 @@ def parse_opts_from_cli():
parser.add_argument('--log-file', '--logfile', dest='log_file',
action='store',
help='Filename for saving logs',
- metavar='<log_file>')
+ metavar='<log_file>'),
+
+ parser.add_argument('--user-label', '--userlabel', dest='user_label',
+ action='store',
+ help='Custom label for performance records')
opts, unknown_opts = parser.parse_known_args()
return opts, unknown_opts
diff --git a/nfvbench/summarizer.py b/nfvbench/summarizer.py
index 1eaa8d6..954433d 100644
--- a/nfvbench/summarizer.py
+++ b/nfvbench/summarizer.py
@@ -500,5 +500,6 @@ class NFVBenchSummarizer(Summarizer):
# init is called after checking for sender
self.record_header = {
"runlogdate": self.sender.runlogdate,
+ "user_label": self.config['user_label']
}
self.record_data = {}
--
cgit