summaryrefslogtreecommitdiff
path: root/opendc-experiments/opendc-experiments-base/src/test/resources/env
diff options
context:
space:
mode:
authorDante Niewenhuis <d.niewenhuis@hotmail.com>2024-04-29 12:48:20 +0200
committerGitHub <noreply@github.com>2024-04-29 12:48:20 +0200
commit2dc44c7283200f4689cc1be15115a8b1cd37d456 (patch)
treee815ceb7a2c54ec40ac4072a594687dfe1d95f1b /opendc-experiments/opendc-experiments-base/src/test/resources/env
parentaefa53bc65309869922d44509739bf2664cf50a5 (diff)
Fixed several cpu related bugs, changed input topology (#226)
Diffstat (limited to 'opendc-experiments/opendc-experiments-base/src/test/resources/env')
-rw-r--r--opendc-experiments/opendc-experiments-base/src/test/resources/env/multi.json36
-rw-r--r--opendc-experiments/opendc-experiments-base/src/test/resources/env/single.json12
2 files changed, 20 insertions, 28 deletions
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/env/multi.json b/opendc-experiments/opendc-experiments-base/src/test/resources/env/multi.json
index d23dbfe3..c3a060cc 100644
--- a/opendc-experiments/opendc-experiments-base/src/test/resources/env/multi.json
+++ b/opendc-experiments/opendc-experiments-base/src/test/resources/env/multi.json
@@ -7,13 +7,11 @@
[
{
"name": "H01",
- "cpus":
- [
- {
- "coreCount": 32,
- "coreSpeed": 3200
- }
- ],
+ "cpu":
+ {
+ "coreCount": 32,
+ "coreSpeed": 3200
+ },
"memory": {
"memorySize": 256000
}
@@ -27,13 +25,11 @@
{
"name": "H02",
"count": 6,
- "cpus":
- [
- {
- "coreCount": 8,
- "coreSpeed": 2930
- }
- ],
+ "cpu":
+ {
+ "coreCount": 8,
+ "coreSpeed": 2930
+ },
"memory": {
"memorySize": 64000
}
@@ -47,13 +43,11 @@
{
"name": "H03",
"count": 2,
- "cpus":
- [
- {
- "coreCount": 16,
- "coreSpeed": 3200
- }
- ],
+ "cpu":
+ {
+ "coreCount": 16,
+ "coreSpeed": 3200
+ },
"memory": {
"memorySize": 128000
}
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/env/single.json b/opendc-experiments/opendc-experiments-base/src/test/resources/env/single.json
index 2d68b234..f69b21be 100644
--- a/opendc-experiments/opendc-experiments-base/src/test/resources/env/single.json
+++ b/opendc-experiments/opendc-experiments-base/src/test/resources/env/single.json
@@ -7,13 +7,11 @@
[
{
"name": "H01",
- "cpus":
- [
- {
- "coreCount": 8,
- "coreSpeed": 3200
- }
- ],
+ "cpu":
+ {
+ "coreCount": 8,
+ "coreSpeed": 3200
+ },
"memory": {
"memorySize": 128000
}