Module: check_mk
Branch: master
Commit: f6dc51ee4f15ce48847977dec9ed25f488ca404e
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6dc51ee4f15ce…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Mon Feb 25 16:42:57 2019 +0100
ucs_c_rack_server_topsystem: Fixed generic test
Change-Id: Iedd9f284ef93ff8f58accd43946bad81b732ace3
---
checks/ucs_c_rack_server_topsystem | 22 +++++++++++-----------
.../datasets/ucs_c_rack_server_topsystem.py | 4 ++--
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/checks/ucs_c_rack_server_topsystem b/checks/ucs_c_rack_server_topsystem
index e98e9cf..a2bb9d9 100644
--- a/checks/ucs_c_rack_server_topsystem
+++ b/checks/ucs_c_rack_server_topsystem
@@ -46,25 +46,25 @@ def parse_ucs_c_rack_server_topsystem(info):
formatted = time.strftime('%Y-%m-%d %H:%M:%S', struct_time)
return formatted
- parsed = {}
+ parsed = []
# The element count of info lines is under our control (agent output) and
# ensured to have expected length. It is ensured that elements contain a
# string. No bad case handling required here.
for _, dn, ip, date_and_time, mode, name in info:
# If more than one info line given or in case of unexpected info list element
format the
# parsed dict will be empty.
- parsed.update({
- 'DN': dn.replace("dn ", ""),
- 'IP': ip.replace("address ", ""),
- 'Mode': mode.replace("mode ", ""),
- 'Name': name.replace("name ", ""),
- })
+ parsed.extend([
+ ('DN', dn.replace("dn ", "")),
+ ('IP', ip.replace("address ", "")),
+ ('Mode', mode.replace("mode ", "")),
+ ('Name', name.replace("name ", "")),
+ ])
try:
- parsed.update(
- {'Date and time':
format_data_and_time(date_and_time.replace("currentTime ", ""))})
+ date_time_value =
format_data_and_time(date_and_time.replace("currentTime ", ""))
except ValueError:
# indicate date and time format not supported
- parsed.update({'Date and time': 'unknown[%s]' %
date_and_time[4:]})
+ date_time_value = 'unknown[%s]' % date_and_time[4:]
+ parsed.append(('Date and time', date_time_value))
return parsed
@@ -75,7 +75,7 @@ def inventory_ucs_c_rack_server_topsystem(parsed):
#@get_parsed_item_data
def check_ucs_c_rack_server_topsystem(item, _no_params, data):
- for title, value in data.items():
+ for title, value in data:
yield 0, "%s: %s" % (title, value)
diff --git a/tests/unit/checks/generictests/datasets/ucs_c_rack_server_topsystem.py
b/tests/unit/checks/generictests/datasets/ucs_c_rack_server_topsystem.py
index dce53ac..5a60799 100644
--- a/tests/unit/checks/generictests/datasets/ucs_c_rack_server_topsystem.py
+++ b/tests/unit/checks/generictests/datasets/ucs_c_rack_server_topsystem.py
@@ -18,6 +18,6 @@ checks = {'': [(None,
{},
[(0, 'DN: sys', []),
(0, 'IP: 192.168.1.1', []),
- (0, 'Date and time: 2019-02-06 09:12:12', []),
(0, 'Mode: stand-alone', []),
- (0, 'Name: CIMC-istreamer2a-etn', [])])]}
+ (0, 'Name: CIMC-istreamer2a-etn', []),
+ (0, 'Date and time: 2019-02-06 09:12:12', [])])]}