Fix various bugs

[aquarium] / logic / src / test / resources / data.json

diff --git a/logic/src/test/resources/data.json b/logic/src/test/resources/data.json
index 1c8b36d..4228c91 100644 (file)
--- a/logic/src/test/resources/data.json
+++ b/logic/src/test/resources/data.json
@@ -203,10 +203,7 @@
         "pk": 1,
         "fields": {
             "name" : "x64 CPU",
-            "restype" : 1,
-            "unit" : "CPU MINS",
-            "period" : "HOUR",
-            "cost" : 1
+            "restype" : 1
            }
     },
     {
@@ -214,10 +211,7 @@
         "pk": 2,
         "fields": {
             "name" : "RAM",
-            "restype" : 2,
-            "unit" : "MB",
-            "period" : "DAY",
-            "cost" : 0.2
+            "restype" : 2
            }
     },
     {
@@ -225,10 +219,7 @@
         "pk": 3,
         "fields": {
             "name" : "VIRT DISK",
-            "restype" : 3,
-            "unit" : "MB",
-            "period" : "HOUR",
-            "cost" : 0.001
+            "restype" : 3
            }
     },
     {
@@ -236,10 +227,7 @@
         "pk": 4,
         "fields": {
             "name" : "VIRT NET IFACE",
-            "restype" : 4,
-            "unit" : "MB",
-            "period" : "HOUR",
-            "cost" : 0.002
+            "restype" : 4
            }
     },
     {
@@ -247,10 +235,7 @@
         "pk": 5,
         "fields": {
             "name" : "MATLAB LICENSE",
-            "restype" : 5,
-            "unit" : "PIECE",
-            "period" : "DAY",
-            "cost" : 2
+            "restype" : 5
            }
     },
     {
@@ -258,10 +243,7 @@
         "pk": 6,
         "fields": {
             "name" : "WINDOWS LICENSE",
-            "restype" : 5,
-            "unit" : "PIECE",
-            "period" : "MONTH",
-            "cost" : 1
+            "restype" : 5
            }
     },
     {
@@ -308,5 +290,50 @@
             "resource" : 4,
             "quantity" : 2
            }
+    },
+    {
+        "model": "gr.grnet.aquarium.model.RuntimeData",
+        "pk": 1,
+        "fields": {
+            "item" : 1,
+            "timestamp" : 1316509472,
+            "measurement" : 0.02
+           }
+    },
+    {
+        "model": "gr.grnet.aquarium.model.RuntimeData",
+        "pk": 2,
+        "fields": {
+            "item" : 1,
+            "timestamp" : 1316509345,
+            "measurement" : 0.043
+           }
+    },
+    {
+        "model": "gr.grnet.aquarium.model.RuntimeData",
+        "pk": 3,
+        "fields": {
+            "item" : 1,
+            "timestamp" : 1316509123,
+            "measurement" : 0.05
+           }
+    },
+    {
+        "model": "gr.grnet.aquarium.model.RuntimeData",
+        "pk": 4,
+        "fields": {
+            "item" : 4,
+            "timestamp" : 1316509472,
+            "measurement" : 1232
+           }
+    },
+    {
+        "model": "gr.grnet.aquarium.model.RuntimeData",
+        "pk": 5,
+        "fields": {
+            "item" : 4,
+            "timestamp" : 1316509372,
+            "measurement" : 432
+           }
     }
 ]
\ No newline at end of file