refactor score fixtures files (snapshots) to new rate v2 structure

ereuse_devicehub/dummy/files/asus-1001pxd.snapshot.11.yaml

@@ -131,7 +131,12 @@
     "type": "GraphicCard"
   },
   {
-    "events": [],
+    "events": [
+    {
+      "type": "TestBios",
+      "accessRange": "A"
+    }
+    ],
     "firewire": 0,
     "manufacturer": "ASUSTeK Computer INC.",
     "model": "1001PXD",
@@ -158,9 +163,8 @@
     },
     {
       "appearanceRange": "A",
-      "biosRange": "A",
       "functionalityRange": "A",
-      "type": "WorkbenchRate"
+      "type": "TestVisual"
     }
     ],
     "manufacturer": "ASUSTeK Computer INC.",

ereuse_devicehub/dummy/files/asus-eee-1000h.snapshot.11.yaml

@@ -1,10 +1,5 @@
 {
   "type": "Snapshot",
-  "expectedEvents": [
-    "Benchmark",
-    "TestDataStorage",
-    "StressTest"
-  ],
   "software": "Workbench",
   "closed": false,
   "device": {
@@ -20,9 +15,8 @@
     },
     {
       "appearanceRange": "A",
-      "biosRange": "A",
       "functionalityRange": "A",
-      "type": "WorkbenchRate"
+      "type": "TestVisual"
     }
     ],
     "manufacturer": "ASUSTeK Computer INC."
@@ -116,7 +110,12 @@
     "serial": 0,
     "slots": 1,
     "model": "1000H",
-    "events": [],
+    "events": [
+    {
+      "accessRange": "A",
+      "type": "TestBios"
+    }
+    ],
     "manufacturer": "ASUSTeK Computer INC."
   }
   ],

ereuse_devicehub/dummy/files/computer-monitor.snapshot.yaml

@@ -11,7 +11,7 @@ device:
   resolutionHeight: 1080
   size: 21.5
   events:
-  - type: ManualRate
+    - type: TestVisual
     appearanceRange: A
     functionalityRange: C
     labelling: False

ereuse_devicehub/dummy/files/dell-optiplexgx520.snapshot.11.yaml

@@ -15,9 +15,8 @@
     },
     {
       "appearanceRange": "A",
-      "biosRange": "A",
       "functionalityRange": "A",
-      "type": "WorkbenchRate"
+      "type": "TestVisual"
     }
     ],
     "type": "Desktop",
@@ -135,7 +134,12 @@
     "slots": 0,
     "usb": 5,
     "serial": 1,
-    "events": [],
+    "events": [
+    {
+      "type": "TestBios",
+      "accessRange": "A"
+    }
+    ],
     "serialNumber": "..CN1374063201S5.",
     "pcmcia": 0,
     "type": "Motherboard",

ereuse_devicehub/dummy/files/keyboard.snapshot.yaml

@@ -8,7 +8,7 @@ device:
   manufacturer: BAZ
   layout: ES
   events:
-  - type: ManualRate
+    - type: TestVisual
     appearanceRange: A
     functionalityRange: A
     labelling: False

ereuse_devicehub/dummy/files/laptop-with-2-hid.snapshot.11.yaml

@@ -9,7 +9,6 @@
       "elapsed": 16
     },
     {
-
       "type": "StressTest",
       "elapsed": 120
     }

ereuse_devicehub/dummy/files/nec.snapshot.11.yaml

@@ -17,9 +17,8 @@
     },
     {
       "appearanceRange": "B",
-      "biosRange": "A",
       "functionalityRange": "C",
-      "type": "WorkbenchRate"
+      "type": "TestVisual"
     }
     ],
     "type": "Desktop",
@@ -137,7 +136,12 @@
     "serial": 1,
     "pcmcia": 0,
     "usb": 8,
-    "events": [],
+    "events": [
+    {
+      "type": "TestBios",
+      "accessRange": "A"
+    }
+    ],
     "type": "Motherboard",
     "model": "MS-7377",
     "firewire": 1,

ereuse_devicehub/dummy/files/pc-laudem.snapshot.11.yaml

@@ -89,7 +89,12 @@
     "type": "GraphicCard"
   },
   {
-    "events": [],
+    "events": [
+    {
+      "type": "TestBios",
+      "accessRange": "A"
+    }
+    ],
     "firewire": 0,
     "manufacturer": "Hewlett-Packard",
     "model": "3031h",
@@ -116,9 +121,8 @@
     },
     {
       "appearanceRange": "A",
-      "biosRange": "A",
       "functionalityRange": "A",
-      "type": "WorkbenchRate"
+      "type": "TestVisual"
     }
     ],
     "manufacturer": "Hewlett-Packard",

ereuse_devicehub/dummy/files/real-eee-1001pxd.snapshot.11.yaml

@@ -120,7 +120,12 @@
     "serialNumber": "Eee0123456789",
     "usb": 5,
     "manufacturer": "ASUSTeK Computer INC.",
-    "events": []
+    "events": [
+    {
+      "type": "TestBios",
+      "accessRange": "C"
+    }
+    ]
   }
   ],
   "elapsed": 4875,
@@ -148,9 +153,8 @@
     },
     {
       "appearanceRange": "B",
-      "biosRange": "C",
       "functionalityRange": "A",
-      "type": "WorkbenchRate"
+      "type": "TestVisual"
     }
     ]
   },

ereuse_devicehub/dummy/files/real-hp-quad-core.snapshot.11.yaml

@@ -31,7 +31,13 @@
     "speed": 1.9980000000000002,
     "serialNumber": null,
     "manufacturer": "Intel Corp.",
-    "events": [],
+    "events": [
+    {
+      "elapsed": 0,
+      "rate": 6665.7,
+      "type": "BenchmarkProcessor"
+    }
+    ],
     "address": 64
   },
   {
@@ -85,6 +91,12 @@
       "status": "Unspecified Error. Self-test not started.",
       "severity": "Error",
       "length": "Short"
+    },
+    {
+      "type": "BenchmarkDataStorage",
+      "elapsed": 16,
+      "readSpeed": 66.2,
+      "writeSpeed": 21.8
     }
     ]
   },

ereuse_devicehub/dummy/files/real-hp.snapshot.11.yaml

@@ -117,7 +117,12 @@
     "model": "Core Processor Integrated Graphics Controller"
   },
   {
-    "events": [],
+    "events": [
+    {
+      "type": "TestBios",
+      "accessRange": "A"
+    }
+    ],
     "firewire": 0,
     "pcmcia": 0,
     "serialNumber": "CZC0408YJG",
@@ -151,9 +156,8 @@
     },
     {
       "appearanceRange": "B",
-      "biosRange": "A",
       "functionalityRange": "D",
-      "type": "WorkbenchRate"
+      "type": "TestVisual"
     }
     ],
     "serialNumber": "CZC0408YJG",

ereuse_devicehub/dummy/files/smartphone.snapshot.yaml

@@ -8,7 +8,7 @@ device:
   serialNumber: ABCDEF
   imei: 35686800-004141-20
   events:
-  - type: ManualRate
+    - type: TestVisual
     appearanceRange: A
     functionalityRange: B
     labelling: False

ereuse_devicehub/dummy/files/workbench-server-1.snapshot.yaml

@@ -21,7 +21,7 @@ device:
   - type: Tag
     id: tag1
   events:
-  - type: WorkbenchRate
+    - type: TestVisual
     appearanceRange: A
     functionalityRange: B
   - type: BenchmarkRamSysbench

tests/files/1-device-with-components.snapshot.yaml

@@ -14,6 +14,10 @@ components:
     speed: 1.23
     cores: 2
     type: Processor
+    events:
+      - type: BenchmarkProcessor
+        rate: 1
+        elapsed: 166
   - manufacturer: p1c3m
     serialNumber: p1c3s
     type: GraphicCard

tests/files/asus-1001pxd.snapshot.yaml

@@ -90,7 +90,12 @@
     "type": "GraphicCard"
   },
   {
-    "events": [],
+    "events": [
+    {
+      "type": "TestBios",
+      "accessRange": "A",
+    }
+    ],
     "firewire": 0,
     "manufacturer": "ASUSTeK Computer INC.",
     "model": "1001PXD",
@@ -112,9 +117,8 @@
     },
     {
       "appearanceRange": "A",
-      "biosRange": "A",
       "functionalityRange": "A",
-      "type": "WorkbenchRate"
+      "type": "TestVisual"
     }
     ],
     "manufacturer": "ASUSTeK Computer INC.",

tests/files/basic.snapshot.yaml

@@ -10,11 +10,9 @@ device:
   model: d1ml
   manufacturer: d1mr
   events:
-  - type: WorkbenchRate
+    - type: TestVisual
     appearanceRange: A
     functionalityRange: B
-    labelling: True
-    biosRange: B
 components:
 - type: GraphicCard
   serialNumber: gc1s

tests/files/david.lshw.snapshot.yaml

@@ -19,7 +19,18 @@
       "manufacturer": "Intel Corp.",
       "model": "Intel Core i7-4600M CPU @ 2.90GHz",
       "serialNumber": null,
-      "events": [],
+      "events": [
+      {
+          "elapsed": 165,
+          "rate": 164.8342,
+          "type": "BenchmarkProcessorSysbench"
+      },
+      {
+          "elapsed": 0,
+          "rate": 6665.7,
+          "type": "BenchmarkProcessor"
+      }
+      ],
       "type": "Processor",
       "speed": 1.259899,
       "address": 64,
@@ -52,7 +63,14 @@
       "manufacturer": null,
       "model": "Crucial_CT525MX3",
       "serialNumber": "164014297BCC",
-      "events": [],
+      "events": [
+      {
+          "readSpeed": 63.3,
+          "type": "BenchmarkDataStorage",
+          "elapsed": 18,
+          "writeSpeed": 20.1
+      }
+      ],
       "type": "HardDrive",
       "size": 500786,
       "interface": null

tests/files/desktop-9644w8n-lenovo-0169622.snapshot.yaml

@@ -69,7 +69,12 @@
     "type": "GraphicCard"
   },
   {
-    "events": [],
+    "events": [
+    {
+      "type": "TestBios",
+      "accessRange": "E"
+    }
+    ],
     "firewire": 0,
     "manufacturer": "LENOVO",
     "model": "LENOVO",
@@ -86,9 +91,8 @@
     "events": [
     {
       "appearanceRange": "D",
-      "biosRange": "E",
       "functionalityRange": "D",
-      "type": "WorkbenchRate"
+      "type": "TestVisual"
     },
     {
       "elapsed": 300,

tests/files/erase-sectors-2-hdd.snapshot.yaml

@@ -25,7 +25,13 @@
     "address": 64,
     "model": "Intel Core i3-2100 CPU @ 3.10GHz",
     "type": "Processor",
-    "events": [],
+    "events": [
+    {
+      "elapsed": 0,
+      "rate": 6665.7,
+      "type": "BenchmarkProcessor"
+    }
+    ],
     "cores": 2,
     "speed": 1.6071410000000002
   },
@@ -90,6 +96,12 @@
       "reallocatedSectorCount": 15,
       "type": "TestDataStorage",
       "status": "Completed: read failure"
+    },
+    {
+      "readSpeed": 63.3,
+      "type": "BenchmarkDataStorage",
+      "elapsed": 18,
+      "writeSpeed": 20.1
     }
     ],
     "interface": "ATA"
@@ -127,6 +139,12 @@
       "reallocatedSectorCount": 0,
       "type": "TestDataStorage",
       "status": "Completed without error"
+    },
+    {
+      "readSpeed": 63.3,
+      "type": "BenchmarkDataStorage",
+      "elapsed": 18,
+      "writeSpeed": 20.1
     }
     ],
     "interface": "ATA"

tests/files/erase-sectors.snapshot.yaml

@@ -27,10 +27,18 @@ components:
             severity: Info
             startTime: '2018-06-01T08:16:00+02:00'
             endTime: '2018-06-01T09:17:00+02:00'
+      - type: BenchmarkDataStorage
+        elapsed: 16
+        readSpeed: 66.2
+        writeSpeed: 21.8
   - type: Processor
     serialNumber: p1s
     model: p1ml
     manufacturer: p1mr
+    events:
+      - type: BenchmarkProcessor
+        elapsed: 0
+        rate: 6665.7
   - type: RamModule
     serialNumber: rm1s
     model: rm1ml

tests/files/laptop-hp_255_g3_notebook-hewlett-packard-cnd52270fw.snapshot.yaml

@@ -137,7 +137,7 @@
       {
         "appearanceRange": "A",
         "functionalityRange": "A",
-        "type": "WorkbenchRate"
+        "type": "TestVisual"
       },
       {
         "elapsed": 300,

tests/files/multiples_devices.csv

@@ -1,13 +1,13 @@
 Type,Chassis,Tag 1,Tag 2,Tag 3,Serial Number,Model,Manufacturer,Registered in,Price,Processor,RAM (GB),Data Storage Size (MB),Rate,Range,Processor Rate,Processor Range,RAM Rate,RAM Range,Data Storage Rate,Data Storage Range,DataStorage 1,DataStorage 1 Manufacturer,DataStorage 1 Model,DataStorage 1 Serial Number,DataStorage 2,DataStorage 2 Manufacturer,DataStorage 2 Model,DataStorage 2 Serial Number,DataStorage 3,DataStorage 3 Manufacturer,DataStorage 3 Model,DataStorage 3 Serial Number,DataStorage 4,DataStorage 4 Manufacturer,DataStorage 4 Model,DataStorage 4 Serial Number,Display 1,Display 1 Manufacturer,Display 1 Model,Display 1 Serial Number,GraphicCard 1,GraphicCard 1 Manufacturer,GraphicCard 1 Model,GraphicCard 1 Serial Number,GraphicCard 1 Memory (MB),GraphicCard 2,GraphicCard 2 Manufacturer,GraphicCard 2 Model,GraphicCard 2 Serial Number,Motherboard 1,Motherboard 1 Manufacturer,Motherboard 1 Model,Motherboard 1 Serial Number,NetworkAdapter 1,NetworkAdapter 1 Manufacturer,NetworkAdapter 1 Model,NetworkAdapter 1 Serial Number,NetworkAdapter 2,NetworkAdapter 2 Manufacturer,NetworkAdapter 2 Model,NetworkAdapter 2 Serial Number,Processor 1,Processor 1 Manufacturer,Processor 1 Model,Processor 1 Serial Number,Processor 1 Number of cores,Processor 1 Speed (GHz),Processor 2,Processor 2 Manufacturer,Processor 2 Model,Processor 2 Serial Number,RamModule 1,RamModule 1 Manufacturer,RamModule 1 Model,RamModule 1 Serial Number,RamModule 1 Size (MB),RamModule 1 Speed (MHz),RamModule 2,RamModule 2 Manufacturer,RamModule 2 Model,RamModule 2 Serial Number,RamModule 3,RamModule 3 Manufacturer,RamModule 3 Model,RamModule 3 Serial Number,RamModule 4,RamModule 4 Manufacturer,RamModule 4 Model,RamModule 4 Serial Number,SoundCard 1,SoundCard 1 Manufacturer,SoundCard 1 Model,SoundCard 1 Serial Number,SoundCard 2,SoundCard 2 Manufacturer,SoundCard 2 Model,SoundCard 2 Serial Number
-Laptop,Netbook,,,,b8oaas048286,1001pxd,asustek computer inc.,Wed Mar 6 18:22:05 2019,,intel atom cpu n455 @ 1.66ghz,1024,238475,1.73,Very low,1.0,Very low,1.53,Very low,3.76,Medium,,,,,,,,,,,,,,,,,,,,,"GraphicCard 5: model atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller, S/N None",,,,256,,,,,"Motherboard 10: model 1001pxd, S/N eee0123456789",eee0123456789,eee0123456789,eee0123456789,"NetworkAdapter 2: model ar9285 wireless network adapter, S/N 74:2f:68:8b:fd:c8",74:2f:68:8b:fd:c8,74:2f:68:8b:fd:c8,74:2f:68:8b:fd:c8,"NetworkAdapter 3: model ar8152 v2.0 fast ethernet, S/N 14:da:e9:42:f6:7c",14:da:e9:42:f6:7c,14:da:e9:42:f6:7c,14:da:e9:42:f6:7c,"Processor 4: model intel atom cpu n455 @ 1.66ghz, S/N None",,,,1,1.667,,,,,"RamModule 8: model None, S/N None",,,,1024,667,,,,,,,,,,,,,"SoundCard 6: model nm10/ich7 family high definition audio controller, S/N None",,,,"SoundCard 7: model usb 2.0 uvc vga webcam, S/N 0x0001",0x0001,0x0001,0x0001
+Laptop         ,Netbook   ,     ,     ,     ,b8oaas048286        ,1001pxd                                                          ,asustek computer inc.,Wed Mar 6 18:22:05 2019 ,     ,intel atom cpu n455 @ 1.66ghz,1024    ,238475                ,1.98    ,Very low,1.31          ,Very low       ,1.53    ,Very low ,3.76             ,Medium            ,             ,                          ,                   ,                           ,             ,                          ,                   ,                           ,             ,                          ,                   ,                           ,             ,                          ,                   ,                           ,         ,                      ,               ,                       ,"GraphicCard 5: model atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller, S/N None",                          ,                   ,                           ,256                      ,             ,                          ,                   ,                           ,"Motherboard 10: model 1001pxd, S/N eee0123456789",eee0123456789             ,eee0123456789      ,eee0123456789              ,"NetworkAdapter 2: model ar9285 wireless network adapter, S/N 74:2f:68:8b:fd:c8",74:2f:68:8b:fd:c8            ,74:2f:68:8b:fd:c8     ,74:2f:68:8b:fd:c8             ,"NetworkAdapter 3: model ar8152 v2.0 fast ethernet, S/N 14:da:e9:42:f6:7c",14:da:e9:42:f6:7c            ,14:da:e9:42:f6:7c     ,14:da:e9:42:f6:7c             ,"Processor 4: model intel atom cpu n455 @ 1.66ghz, S/N None",                        ,                 ,                         ,1                          ,1.667                  ,           ,                        ,                 ,                         ,"RamModule 8: model None, S/N None"  ,                        ,                 ,                         ,1024                 ,667                    ,           ,                        ,                 ,                         ,           ,                        ,                 ,                         ,           ,                        ,                 ,                         ,"SoundCard 6: model nm10/ich7 family high definition audio controller, S/N None",                        ,                 ,                         ,"SoundCard 7: model usb 2.0 uvc vga webcam, S/N 0x0001",0x0001                  ,0x0001           ,0x0001
-NetworkAdapter,,,,,74:2f:68:8b:fd:c8,ar9285 wireless network adapter,qualcomm atheros,Wed Mar 6 18:22:05 2019,,1.73,Very low,1.0,Very low,1.53,Very low,3.76,Medium
+NetworkAdapter ,          ,     ,     ,     ,74:2f:68:8b:fd:c8   ,ar9285 wireless network adapter                                  ,qualcomm atheros     ,Wed Mar 6 18:22:05 2019 ,     ,1.98                         ,Very low,1.0                   ,Very low,1.53    ,Very low      ,3.76           ,Medium
-NetworkAdapter,,,,,14:da:e9:42:f6:7c,ar8152 v2.0 fast ethernet,qualcomm atheros,Wed Mar 6 18:22:05 2019,,1.73,Very low,1.0,Very low,1.53,Very low,3.76,Medium
+NetworkAdapter ,          ,     ,     ,     ,14:da:e9:42:f6:7c   ,ar8152 v2.0 fast ethernet                                        ,qualcomm atheros     ,Wed Mar 6 18:22:05 2019 ,     ,1.98                         ,Very low,1.0                   ,Very low,1.53    ,Very low      ,3.76           ,Medium
-Processor,,,,,,intel atom cpu n455 @ 1.66ghz,intel corp.,Wed Mar 6 18:22:05 2019,,1.73,Very low,1.0,Very low,1.53,Very low,3.76,Medium
+Processor      ,          ,     ,     ,     ,                    ,intel atom cpu n455 @ 1.66ghz                                    ,intel corp.          ,Wed Mar 6 18:22:05 2019 ,     ,1.98                         ,Very low,1.0                   ,Very low,1.53    ,Very low      ,3.76           ,Medium
-GraphicCard,,,,,,atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller,intel corporation,Wed Mar 6 18:22:05 2019,,1.73,Very low,1.0,Very low,1.53,Very low,3.76,Medium
+GraphicCard    ,          ,     ,     ,     ,                    ,atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller,intel corporation    ,Wed Mar 6 18:22:05 2019 ,     ,1.98                         ,Very low,1.0                   ,Very low,1.53    ,Very low      ,3.76           ,Medium
 SoundCard,,,,,,nm10/ich7 family high definition audio controller,intel corporation,Wed Mar 6 18:22:05 2019,,1.73,Very low,1.0,Very low,1.53,Very low,3.76,Medium
-SoundCard,,,,,0x0001,usb 2.0 uvc vga webcam,azurewave,Wed Mar 6 18:22:05 2019,,1.73,Very low,1.0,Very low,1.53,Very low,3.76,Medium
+SoundCard      ,          ,     ,     ,     ,0x0001              ,usb 2.0 uvc vga webcam                                           ,azurewave            ,Wed Mar 6 18:22:05 2019 ,     ,1.98                         ,Very low,1.0                   ,Very low,1.53    ,Very low      ,3.76           ,Medium
-RamModule,,,,,,,,Wed Mar  6 18:22:05 2019,,1.73,Very low,1.0,Very low,1.53,Very low,3.76,Medium
+RamModule      ,          ,     ,     ,     ,                    ,                                                                 ,                     ,Wed Mar  6 18:22:05 2019,     ,1.98                         ,Very low,1.0                   ,Very low,1.53    ,Very low      ,3.76           ,Medium
-HardDrive,,,,,e2024242cv86hj,hts54322,hitachi,Wed Mar6 18:22:05 2019,,1.73,Very low,1.0,Very low,1.53,Very low,3.76,Medium
+HardDrive      ,          ,     ,     ,     ,e2024242cv86hj      ,hts54322                                                         ,hitachi              ,Wed Mar6 18:22:05 2019  ,     ,1.98                         ,Very low,1.0                   ,Very low,1.53    ,Very low      ,3.76           ,Medium
 Motherboard,,,,,eee0123456789,1001pxd,asustek computer inc.,Wed Mar  6 18:22:05 2019,,1.73,Very low,1.0,Very low,1.53,Very low,3.76,Medium
 Desktop,Microtower,,,,d1s,d1ml,d1mr,Wed Mar 6 18:22:06 2019,,p1ml,0,0,0.8,Very low,1.0,Very low,1.0,Very low,1.0,Very low,,,,,,,,,,,,,,,,,,,,,"GraphicCard 12: model gc1ml, S/N gc1s",gc1s,gc1s,gc1s,,,,,,,,,,,,,,,,,,"Processor 14: model p1ml, S/N p1s",p1s,p1s,p1s,,1.6,,,,,"RamModule 13: model rm1ml, S/N rm1s",rm1s,rm1s,rm1s,,1333,,,,,,,,,,,,,,,,,,,,
 GraphicCard,,,,,gc1s,gc1ml,gc1mr,Wed Mar 6 18:22:06 2019,,0.8,Very low,1.0,Very low,1.0,Very low,1.0,Very low

tests/files/real-eee-1001pxd.csv

@@ -1,2 +1,2 @@
 Type,Chassis,Tag 1,Tag 2,Tag 3,Serial Number,Model,Manufacturer,Registered in,Price,Processor,RAM (GB),Data Storage Size (MB),Rate,Range,Processor Rate,Processor Range,RAM Rate,RAM Range,Data Storage Rate,Data Storage Range,DataStorage 1,DataStorage 1 Manufacturer,DataStorage 1 Model,DataStorage 1 Serial Number,DataStorage 2,DataStorage 2 Manufacturer,DataStorage 2 Model,DataStorage 2 Serial Number,DataStorage 3,DataStorage 3 Manufacturer,DataStorage 3 Model,DataStorage 3 Serial Number,DataStorage 4,DataStorage 4 Manufacturer,DataStorage 4 Model,DataStorage 4 Serial Number,Display 1,Display 1 Manufacturer,Display 1 Model,Display 1 Serial Number,GraphicCard 1,GraphicCard 1 Manufacturer,GraphicCard 1 Model,GraphicCard 1 Serial Number,GraphicCard 1 Memory (MB),GraphicCard 2,GraphicCard 2 Manufacturer,GraphicCard 2 Model,GraphicCard 2 Serial Number,Motherboard 1,Motherboard 1 Manufacturer,Motherboard 1 Model,Motherboard 1 Serial Number,NetworkAdapter 1,NetworkAdapter 1 Manufacturer,NetworkAdapter 1 Model,NetworkAdapter 1 Serial Number,NetworkAdapter 2,NetworkAdapter 2 Manufacturer,NetworkAdapter 2 Model,NetworkAdapter 2 Serial Number,Processor 1,Processor 1 Manufacturer,Processor 1 Model,Processor 1 Serial Number,Processor 1 Number of cores,Processor 1 Speed (GHz),Processor 2,Processor 2 Manufacturer,Processor 2 Model,Processor 2 Serial Number,RamModule 1,RamModule 1 Manufacturer,RamModule 1 Model,RamModule 1 Serial Number,RamModule 1 Size (MB),RamModule 1 Speed (MHz),RamModule 2,RamModule 2 Manufacturer,RamModule 2 Model,RamModule 2 Serial Number,RamModule 3,RamModule 3 Manufacturer,RamModule 3 Model,RamModule 3 Serial Number,RamModule 4,RamModule 4 Manufacturer,RamModule 4 Model,RamModule 4 Serial Number,SoundCard 1,SoundCard 1 Manufacturer,SoundCard 1 Model,SoundCard 1 Serial Number,SoundCard 2,SoundCard 2 Manufacturer,SoundCard 2 Model,SoundCard 2 Serial Number
-Laptop,Netbook,,,,b8oaas048286,1001pxd,asustek computer inc.,Tue Mar  5 19:56:08 2019,,intel atom cpu n455 @ 1.66ghz,1024,238475,1.73,Very low,1.0,Very low,1.53,Very low,3.76,Medium,,,,,,,,,,,,,,,,,,,,,"GraphicCard 5: model atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller, S/N None",,,,256,,,,,"Motherboard 10: model 1001pxd, S/N eee0123456789",eee0123456789,eee0123456789,eee0123456789,"NetworkAdapter 2: model ar9285 wireless network adapter, S/N 74:2f:68:8b:fd:c8",74:2f:68:8b:fd:c8,74:2f:68:8b:fd:c8,74:2f:68:8b:fd:c8,"NetworkAdapter 3: model ar8152 v2.0 fast ethernet, S/N 14:da:e9:42:f6:7c",14:da:e9:42:f6:7c,14:da:e9:42:f6:7c,14:da:e9:42:f6:7c,"Processor 4: model intel atom cpu n455 @ 1.66ghz, S/N None",,,,1,1.667,,,,,"RamModule 8: model None, S/N None",,,,1024,667,,,,,,,,,,,,,"SoundCard 6: model nm10/ich7 family high definition audio controller, S/N None",,,,"SoundCard 7: model usb 2.0 uvc vga webcam, S/N 0x0001",0x0001,0x0001,0x0001
+Laptop,Netbook,     ,     ,     ,b8oaas048286 ,1001pxd,asustek computer inc.,Tue Mar  5 19:56:08 2019,     ,intel atom cpu n455 @ 1.66ghz,1024    ,238475                ,1.98,Very low,1.31          ,Very low       ,1.53    ,Very low ,3.76             ,Medium            ,             ,                          ,                   ,                           ,             ,                          ,                   ,                           ,             ,                          ,                   ,                           ,             ,                          ,                   ,                           ,         ,                      ,               ,                       ,"GraphicCard 5: model atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller, S/N None",                          ,                   ,                           ,256                      ,             ,                          ,                   ,                           ,"Motherboard 10: model 1001pxd, S/N eee0123456789",eee0123456789             ,eee0123456789      ,eee0123456789              ,"NetworkAdapter 2: model ar9285 wireless network adapter, S/N 74:2f:68:8b:fd:c8",74:2f:68:8b:fd:c8            ,74:2f:68:8b:fd:c8     ,74:2f:68:8b:fd:c8             ,"NetworkAdapter 3: model ar8152 v2.0 fast ethernet, S/N 14:da:e9:42:f6:7c",14:da:e9:42:f6:7c            ,14:da:e9:42:f6:7c     ,14:da:e9:42:f6:7c             ,"Processor 4: model intel atom cpu n455 @ 1.66ghz, S/N None",                        ,                 ,                         ,1                          ,1.667                  ,           ,                        ,                 ,                         ,"RamModule 8: model None, S/N None",                        ,                 ,                         ,1024                 ,667                    ,           ,                        ,                 ,                         ,           ,                        ,                 ,                         ,           ,                        ,                 ,                         ,"SoundCard 6: model nm10/ich7 family high definition audio controller, S/N None",                        ,                 ,                         ,"SoundCard 7: model usb 2.0 uvc vga webcam, S/N 0x0001",0x0001                  ,0x0001           ,0x0001