[Fuego] [PATCH 25/29] fio: adapt to new parser

[Daniel Sangorrin]

Signed-off-by: Daniel Sangorrin <daniel.sangorrin at toshiba.co.jp>
---
 engine/tests/Benchmark.fio/criteria.json  | 47 ++++++++++++++++++++
 engine/tests/Benchmark.fio/parser.py      | 29 ++++++------
 engine/tests/Benchmark.fio/reference.json | 73 +++++++++++++++++++++++++++++++
 engine/tests/Benchmark.fio/reference.log  | 13 ------
 4 files changed, 133 insertions(+), 29 deletions(-)
 create mode 100644 engine/tests/Benchmark.fio/criteria.json
 create mode 100644 engine/tests/Benchmark.fio/reference.json
 delete mode 100644 engine/tests/Benchmark.fio/reference.log

diff --git a/engine/tests/Benchmark.fio/criteria.json b/engine/tests/Benchmark.fio/criteria.json
new file mode 100644
index 0000000..4d84cb8
--- /dev/null
+++ b/engine/tests/Benchmark.fio/criteria.json
@@ -0,0 +1,47 @@
+{
+    "schema_version":"1.0",
+    "criteria":[
+        {
+            "tguid":"File.Read.speed",
+            "reference":{
+                "threshold":1,
+                "comparison":"ge"
+            }
+        },
+        {
+            "tguid":"File.Write.speed",
+            "reference":{
+                "threshold":1,
+                "comparison":"ge"
+            }
+        },
+        {
+            "tguid":"SSD_Read.Random.speed",
+            "reference":{
+                "threshold":1,
+                "comparison":"ge"
+            }
+        },
+        {
+            "tguid":"SSD_Read.Seq.speed",
+            "reference":{
+                "threshold":1,
+                "comparison":"ge"
+            }
+        },
+        {
+            "tguid":"SSD_Write.Random.speed",
+            "reference":{
+                "threshold":1,
+                "comparison":"ge"
+            }
+        },
+        {
+            "tguid":"SSD_Write.Seq.speed",
+            "reference":{
+                "threshold":1,
+                "comparison":"ge"
+            }
+        }
+    ]
+}
diff --git a/engine/tests/Benchmark.fio/parser.py b/engine/tests/Benchmark.fio/parser.py
index 7a5df06..2007fb2 100755
--- a/engine/tests/Benchmark.fio/parser.py
+++ b/engine/tests/Benchmark.fio/parser.py
@@ -1,23 +1,20 @@
-#!/bin/python
+#!/usr/bin/python
 # See common.py for description of command-line arguments
 
-import os, re, sys
+import os, sys
 sys.path.insert(0, os.environ['FUEGO_CORE'] + '/engine/scripts/parser')
 import common as plib
 
-ref_section_pat = "^\[[\w\d_ .]+.[gle]{2}\]"
-cur_search_pat = re.compile("(  READ:|  WRITE:)(.*)(aggrb=)([\d.]+)(KB\/s)",re.MULTILINE)
+regex_string = '(  READ:|  WRITE:)(.*)(aggrb=)([\d.]+)(KB\/s)'
+measurements = {}
 
-res_dict = {}
-cur_dict = {}
+matches = plib.parse(regex_string)
+if matches:
+    measurements['SSD_Read.Seq'] = [{"name": "speed", "measure" : '%.2f' % float(matches[0][3])}]
+    measurements['SSD_Read.Random'] = [{"name": "speed", "measure" : '%.2f' % float(matches[1][3])}]
+    measurements['SSD_Write.Seq'] = [{"name": "speed", "measure" : '%.2f' % float(matches[2][3])}]
+    measurements['SSD_Write.Random'] = [{"name": "speed", "measure" : '%.2f' % float(matches[3][3])}]
+    measurements['File.Read'] = [{"name": "speed", "measure" : '%.2f' % float(matches[4][3])}]
+    measurements['File.Write'] = [{"name": "speed", "measure" : '%.2f' % float(matches[5][3])}]
 
-pat_result = plib.parse(cur_search_pat)
-if pat_result:
-	cur_dict["SSD_Read.Seq"] = '%.2f' % float(pat_result[0][3])
-	cur_dict["SSD_Read.Random"] = '%.2f' % float(pat_result[1][3])
-	cur_dict["SSD_Write.Seq"] = '%.2f' % float(pat_result[2][3])
-	cur_dict["SSD_Write.Random"] = '%.2f' % float(pat_result[3][3])
-	cur_dict["File.Read"] = '%.2f' % float(pat_result[4][3])
-	cur_dict["File.Write"] = '%.2f' % float(pat_result[5][3])
-
-sys.exit(plib.process_data(ref_section_pat, cur_dict, 'm', 'Avg bandwidth.KB/s'))
+sys.exit(plib.process_data(measurements))
diff --git a/engine/tests/Benchmark.fio/reference.json b/engine/tests/Benchmark.fio/reference.json
new file mode 100644
index 0000000..ccbdcee
--- /dev/null
+++ b/engine/tests/Benchmark.fio/reference.json
@@ -0,0 +1,73 @@
+{
+    "test_sets":[
+        {
+            "name":"SSD_Read",
+            "test_cases":[
+                {
+                    "name":"Seq",
+                    "measurements":[
+                        {
+                            "name":"speed",
+                            "unit":"KB/s"
+                        }
+                    ]
+                },
+                {
+                    "name":"Random",
+                    "measurements":[
+                        {
+                            "name":"speed",
+                            "unit":"KB/s"
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "name":"SSD_Write",
+            "test_cases":[
+                {
+                    "name":"Seq",
+                    "measurements":[
+                        {
+                            "name":"speed",
+                            "unit":"KB/s"
+                        }
+                    ]
+                },
+                {
+                    "name":"Random",
+                    "measurements":[
+                        {
+                            "name":"speed",
+                            "unit":"KB/s"
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "name":"File",
+            "test_cases":[
+                {
+                    "name":"Read",
+                    "measurements":[
+                        {
+                            "name":"speed",
+                            "unit":"KB/s"
+                        }
+                    ]
+                },
+                {
+                    "name":"Write",
+                    "measurements":[
+                        {
+                            "name":"speed",
+                            "unit":"KB/s"
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
diff --git a/engine/tests/Benchmark.fio/reference.log b/engine/tests/Benchmark.fio/reference.log
deleted file mode 100644
index 06396ba..0000000
--- a/engine/tests/Benchmark.fio/reference.log
+++ /dev/null
@@ -1,13 +0,0 @@
-# Automatically generated on fuego by thresholds.awk based on [519, 621] build range
-[File.Read|ge]
-1
-[File.Write|ge]
-1
-[SSD_Read.Random|ge]
-1
-[SSD_Read.Seq|ge]
-1
-[SSD_Write.Random|ge]
-1
-[SSD_Write.Seq|ge]
-1
-- 
2.7.4