r'Latency at 50% PDR:.*\[\'(.*)\', \'(.*)\'\].*\n'
r'Latency at 10% PDR:.*\[\'(.*)\', \'(.*)\'\].*\n'
)
+ REGEX_MRR_MSG_INFO = re.compile(r'.*\[(.*)\]')
+
# TODO: Remove when not needed
REGEX_NDRPDR_LAT_BASE = re.compile(
r'LATENCY.*\[\'(.*)\', \'(.*)\'\]\s\n.*\n.*\n'
"""
return self._data
+ def _get_data_from_mrr_test_msg(self, msg):
+ """Get info from message of MRR performance tests.
+
+ :param msg: Message to be processed.
+ :type msg: str
+ :returns: Processed message or original message if a problem occurs.
+ :rtype: str
+ """
+
+ groups = re.search(self.REGEX_MRR_MSG_INFO, msg)
+ if not groups or groups.lastindex != 1:
+ return msg
+
+ try:
+ data = groups.group(1).split(u", ")
+ except (AttributeError, IndexError, ValueError, KeyError):
+ return msg
+
+ out_str = u"["
+ try:
+ for item in data:
+ out_str += f"{(float(item) / 1e6):.2f}, "
+ return out_str[:-2] + u"]"
+ except (AttributeError, IndexError, ValueError, KeyError):
+ return msg
+
def _get_data_from_perf_test_msg(self, msg):
- """Get
- - NDR_LOWER
- - LATENCY
- - NDR_UPPER
- - PDR_LOWER
- - LATENCY
- - PDR_UPPER
- from message of NDRPDR performance tests.
+ """Get info from message of NDRPDR performance tests.
:param msg: Message to be processed.
:type msg: str
robot framework.
:type in_str_1: str
:type in_str_2: str
- :returns: Processed latency string or empty string if a problem
- occurs.
- :rtype: tuple(str, str)
+ :returns: Processed latency string or None if a problem occurs.
+ :rtype: tuple
"""
in_list_1 = in_str_1.split('/', 3)
in_list_2 = in_str_2.split('/', 3)
if len(in_list_1) != 4 and len(in_list_2) != 4:
- return u""
+ return None
in_list_1[3] += u"=" * (len(in_list_1[3]) % 4)
try:
hdr_lat_1 = hdrh.histogram.HdrHistogram.decode(in_list_1[3])
except hdrh.codec.HdrLengthException:
- return u""
+ return None
in_list_2[3] += u"=" * (len(in_list_2[3]) % 4)
try:
hdr_lat_2 = hdrh.histogram.HdrHistogram.decode(in_list_2[3])
except hdrh.codec.HdrLengthException:
- return u""
+ return None
if hdr_lat_1 and hdr_lat_2:
- hdr_lat_1_50 = hdr_lat_1.get_value_at_percentile(50.0)
- hdr_lat_1_90 = hdr_lat_1.get_value_at_percentile(90.0)
- hdr_lat_1_99 = hdr_lat_1.get_value_at_percentile(99.0)
- hdr_lat_2_50 = hdr_lat_2.get_value_at_percentile(50.0)
- hdr_lat_2_90 = hdr_lat_2.get_value_at_percentile(90.0)
- hdr_lat_2_99 = hdr_lat_2.get_value_at_percentile(99.0)
-
- if (hdr_lat_1_50 + hdr_lat_1_90 + hdr_lat_1_99 +
- hdr_lat_2_50 + hdr_lat_2_90 + hdr_lat_2_99):
- return (
- f"{hdr_lat_1_50} {hdr_lat_1_90} {hdr_lat_1_99} , "
- f"{hdr_lat_2_50} {hdr_lat_2_90} {hdr_lat_2_99}"
- )
+ hdr_lat = (
+ hdr_lat_1.get_value_at_percentile(50.0),
+ hdr_lat_1.get_value_at_percentile(90.0),
+ hdr_lat_1.get_value_at_percentile(99.0),
+ hdr_lat_2.get_value_at_percentile(50.0),
+ hdr_lat_2.get_value_at_percentile(90.0),
+ hdr_lat_2.get_value_at_percentile(99.0)
+ )
+
+ if all(hdr_lat):
+ return hdr_lat
- return u""
+ return None
try:
- pdr_lat_10 = _process_lat(data[u'pdr_lat_10_1'],
- data[u'pdr_lat_10_2'])
- pdr_lat_50 = _process_lat(data[u'pdr_lat_50_1'],
- data[u'pdr_lat_50_2'])
- pdr_lat_90 = _process_lat(data[u'pdr_lat_90_1'],
- data[u'pdr_lat_90_2'])
- pdr_lat_10 = f"\n3. {pdr_lat_10}" if pdr_lat_10 else u""
- pdr_lat_50 = f"\n4. {pdr_lat_50}" if pdr_lat_50 else u""
- pdr_lat_90 = f"\n5. {pdr_lat_90}" if pdr_lat_90 else u""
-
- return (
- u" |prein| "
- f"1. {(data[u'ndr_low'] / 1e6):.2f} {data[u'ndr_low_b']:.2f}"
- f"\n2. {(data[u'pdr_low'] / 1e6):.2f} {data[u'pdr_low_b']:.2f}"
- f"{pdr_lat_10}"
- f"{pdr_lat_50}"
- f"{pdr_lat_90}"
- u" |preout| "
+ out_msg = (
+ f"1. {(data[u'ndr_low'] / 1e6):.2f} "
+ f"{data[u'ndr_low_b']:.2f}"
+ f"\n2. {(data[u'pdr_low'] / 1e6):.2f} "
+ f"{data[u'pdr_low_b']:.2f}"
+ )
+ latency = (
+ _process_lat(data[u'pdr_lat_10_1'], data[u'pdr_lat_10_2']),
+ _process_lat(data[u'pdr_lat_50_1'], data[u'pdr_lat_50_2']),
+ _process_lat(data[u'pdr_lat_90_1'], data[u'pdr_lat_90_2'])
)
+ if all(latency):
+ max_len = len(str(max((max(item) for item in latency))))
+
+ for idx, lat in enumerate(latency):
+ if not idx:
+ out_msg += u"\n"
+ out_msg += f"\n{idx + 3}. "
+ for count, itm in enumerate(lat):
+ if count == 3:
+ out_msg += u" " * 6
+ out_msg += u" " * (max_len - len(str(itm)) + 1)
+ out_msg += str(itm)
+
+ return out_msg
+
except (AttributeError, IndexError, ValueError, KeyError):
return msg
replace(u'\r', u'').\
replace(u'[', u' |br| [').\
replace(u' |br| [', u'[', 1)
- test_result[u"msg"] = self._get_data_from_perf_test_msg(test.message).\
+ test_result[u"msg"] = test.message.\
replace(u'\n', u' |br| ').\
replace(u'\r', u'').\
replace(u'"', u"'")
if test.status == u"PASS":
if u"NDRPDR" in tags:
+ test_result[u"msg"] = self._get_data_from_perf_test_msg(
+ test.message). \
+ replace(u'\n', u' |br| '). \
+ replace(u'\r', u''). \
+ replace(u'"', u"'")
test_result[u"type"] = u"NDRPDR"
test_result[u"throughput"], test_result[u"status"] = \
self._get_ndrpdr_throughput(test.message)
groups = re.search(self.REGEX_TCP, test.message)
test_result[u"result"] = int(groups.group(2))
elif u"MRR" in tags or u"FRMOBL" in tags or u"BMRR" in tags:
+ test_result[u"msg"] = self._get_data_from_mrr_test_msg(
+ test.message). \
+ replace(u'\n', u' |br| '). \
+ replace(u'\r', u''). \
+ replace(u'"', u"'")
if u"MRR" in tags:
test_result[u"type"] = u"MRR"
else:
Code Review / csit.git / blobdiff