Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Report: data
[csit.git]
/
resources
/
tools
/
presentation
/
input_data_parser.py
diff --git
a/resources/tools/presentation/input_data_parser.py
b/resources/tools/presentation/input_data_parser.py
index
87d822f
..
18fea3e
100644
(file)
--- a/
resources/tools/presentation/input_data_parser.py
+++ b/
resources/tools/presentation/input_data_parser.py
@@
-21,6
+21,7
@@
import re
import pandas as pd
import logging
import re
import pandas as pd
import logging
+import xml.etree.ElementTree as ET
from robot.api import ExecutionResult, ResultVisitor
from robot import errors
from robot.api import ExecutionResult, ResultVisitor
from robot import errors
@@
-170,7
+171,7
@@
class ExecutionChecker(ResultVisitor):
REGEX_TOLERANCE = re.compile(r'^[\D\d]*LOSS_ACCEPTANCE:\s(\d*\.\d*)\s'
r'[\D\d]*')
REGEX_TOLERANCE = re.compile(r'^[\D\d]*LOSS_ACCEPTANCE:\s(\d*\.\d*)\s'
r'[\D\d]*')
- REGEX_VERSION = re.compile(r"(
stdout: 'vat# vat# Version:)(
\s*)(.*)")
+ REGEX_VERSION = re.compile(r"(
return STDOUT Version:
\s*)(.*)")
REGEX_TCP = re.compile(r'Total\s(rps|cps|throughput):\s([0-9]*).*$')
REGEX_TCP = re.compile(r'Total\s(rps|cps|throughput):\s([0-9]*).*$')
@@
-243,13
+244,13
@@
class ExecutionChecker(ResultVisitor):
:returns: Nothing.
"""
:returns: Nothing.
"""
- if msg.message.count("
stdout: 'vat# vat#
Version:"):
+ if msg.message.count("
return STDOUT
Version:"):
self._version = str(re.search(self.REGEX_VERSION, msg.message).
self._version = str(re.search(self.REGEX_VERSION, msg.message).
- group(
3
))
+ group(
2
))
self._data["metadata"]["version"] = self._version
self._msg_type = None
self._data["metadata"]["version"] = self._version
self._msg_type = None
- logging.
debug
(" VPP version: {0}".format(self._version))
+ logging.
info
(" VPP version: {0}".format(self._version))
def _get_vat_history(self, msg):
"""Called when extraction of VAT command history is required.
def _get_vat_history(self, msg):
"""Called when extraction of VAT command history is required.
@@
-584,7
+585,7
@@
class ExecutionChecker(ResultVisitor):
:type setup_kw: Keyword
:returns: Nothing.
"""
:type setup_kw: Keyword
:returns: Nothing.
"""
- if setup_kw.name.count("
Vpp Show Version Verbose
") \
+ if setup_kw.name.count("
Show Vpp Version On All Duts
") \
and not self._version:
self._msg_type = "setup-version"
setup_kw.messages.visit(self)
and not self._version:
self._msg_type = "setup-version"
setup_kw.messages.visit(self)
@@
-758,6
+759,10
@@
class InputData(object):
:rtype: dict
"""
:rtype: dict
"""
+ tree = ET.parse(build["file-name"])
+ root = tree.getroot()
+ generated = root.attrib["generated"]
+
with open(build["file-name"], 'r') as data_file:
try:
result = ExecutionResult(data_file)
with open(build["file-name"], 'r') as data_file:
try:
result = ExecutionResult(data_file)
@@
-765,7
+770,7
@@
class InputData(object):
logging.error("Error occurred while parsing output.xml: {0}".
format(err))
return None
logging.error("Error occurred while parsing output.xml: {0}".
format(err))
return None
- checker = ExecutionChecker(job=job, build=build)
+ checker = ExecutionChecker(job=job, build=build
, generated=generated
)
result.visit(checker)
return checker.data
result.visit(checker)
return checker.data