Restructured Testing files (#287)

15 files changed, 12 insertions, 82 deletions

diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/failureTraces/11_failures.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/failureTraces/11_failures.parquet
deleted file mode 100644
index dbd93acb..00000000
--- a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/failureTraces/11_failures.parquet
+++ /dev/null
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/failureTraces/single_failure.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/failureTraces/single_failure.parquet
deleted file mode 100644
index d1f8b853..00000000
--- a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/failureTraces/single_failure.parquet
+++ /dev/null
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/topologies/multi.json b/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/topologies/multi.json
deleted file mode 100644
index c3a060cc..00000000
--- a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/topologies/multi.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-    "clusters":
-    [
-        {
-            "name": "C01",
-            "hosts" :
-            [
-                {
-                    "name": "H01",
-                    "cpu":
-                    {
-                        "coreCount": 32,
-                        "coreSpeed": 3200
-                    },
-                    "memory": {
-                        "memorySize": 256000
-                    }
-                }
-            ]
-        },
-        {
-            "name": "C02",
-            "hosts" :
-            [
-                {
-                    "name": "H02",
-                    "count": 6,
-                    "cpu":
-                    {
-                        "coreCount": 8,
-                        "coreSpeed": 2930
-                    },
-                    "memory": {
-                        "memorySize": 64000
-                    }
-                }
-            ]
-        },
-        {
-            "name": "C03",
-            "hosts" :
-            [
-                {
-                    "name": "H03",
-                    "count": 2,
-                    "cpu":
-                    {
-                        "coreCount": 16,
-                        "coreSpeed": 3200
-                    },
-                    "memory": {
-                        "memorySize": 128000
-                    }
-                }
-            ]
-        }
-    ]
-}
-
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/topologies/single.json b/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/topologies/single.json
deleted file mode 100644
index de66bfc2..00000000
--- a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/topologies/single.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "clusters":
-    [
-        {
-            "name": "C01",
-            "hosts" :
-            [
-                {
-                    "name": "H01",
-                    "cpu":
-                    {
-                        "coreCount": 12,
-                        "coreSpeed": 3300,
-                        "count": 1
-                    },
-                    "memory": {
-                        "memorySize": 140457600000
-                    }
-                }
-            ]
-        }
-    ]
-}
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/single_failure.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/single_failure.parquet
new file mode 100644
index 00000000..44804ffa
--- /dev/null
+++ b/opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/single_failure.parquet
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/single_failure_2.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/single_failure_2.parquet
new file mode 100644
index 00000000..7dae482a
--- /dev/null
+++ b/opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/single_failure_2.parquet
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/two_failures.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/two_failures.parquet
new file mode 100644
index 00000000..9f0fea0f
--- /dev/null
+++ b/opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/two_failures.parquet
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/FlowDistributor/topologies/single_1_2000.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000.json
index 6790a10f..ac9a3082 100644
--- a/opendc-experiments/opendc-experiments-base/src/test/resources/FlowDistributor/topologies/single_1_2000.json
+++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000.json
@@ -14,6 +14,12 @@
                     },
                     "memory": {
                         "memorySize": 140457600000
+                    },
+                    "powerModel": {
+                        "modelType": "linear",
+                        "power": 400.0,
+                        "idlePower": 100.0,
+                        "maxPower": 200.0
                     }
                 }
             ]
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/FlowDistributor/topologies/single_2_2000.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_2_2000.json
index 4bab620a..24ab0bcd 100644
--- a/opendc-experiments/opendc-experiments-base/src/test/resources/FlowDistributor/topologies/single_2_2000.json
+++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_2_2000.json
@@ -14,6 +14,12 @@
                     },
                     "memory": {
                         "memorySize": 140457600000
+                    },
+                    "powerModel": {
+                        "modelType": "linear",
+                        "power": 400.0,
+                        "idlePower": 100.0,
+                        "maxPower": 200.0
                     }
                 }
             ]
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/FlowDistributor/topologies/single_5000_2000.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_5000_2000.json
index 9f1e418f..9f1e418f 100644
--- a/opendc-experiments/opendc-experiments-base/src/test/resources/FlowDistributor/topologies/single_5000_2000.json
+++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_5000_2000.json
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/traces/bitbrains-small/fragments.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/bitbrains-small/fragments.parquet
index 240f58e3..240f58e3 100644
--- a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/traces/bitbrains-small/fragments.parquet
+++ b/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/bitbrains-small/fragments.parquet
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/traces/bitbrains-small/interference-model.json b/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/bitbrains-small/interference-model.json
index 51fc6366..51fc6366 100644
--- a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/traces/bitbrains-small/interference-model.json
+++ b/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/bitbrains-small/interference-model.json
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/traces/bitbrains-small/tasks.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/bitbrains-small/tasks.parquet
index 8e9dcea7..8e9dcea7 100644
--- a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/traces/bitbrains-small/tasks.parquet
+++ b/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/bitbrains-small/tasks.parquet
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/traces/single_task/fragments.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/single_task/fragments.parquet
index 94a2d69e..94a2d69e 100644
--- a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/traces/single_task/fragments.parquet
+++ b/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/single_task/fragments.parquet
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/traces/single_task/tasks.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/single_task/tasks.parquet
index 2a7da2eb..2a7da2eb 100644
--- a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/traces/single_task/tasks.parquet
+++ b/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/single_task/tasks.parquet