From a17e7eda3cfd70b033e2fb6097880fba7f5af864 Mon Sep 17 00:00:00 2001
From: Dante Niewenhuis <d.niewenhuis@hotmail.com>
Date: Fri, 12 Jul 2024 14:08:53 +0200
Subject: Merged experiment-scenario and experiment-base by moving
 ScenarioCli.kt to experiment-base. Renamed the distribution of
 experiment-base to OpenDCScenarioRunner (#236)

---
 .../bitbrains-small/interference-model.json        |  21 -------
 .../resources/bitbrains-small/trace/meta.parquet   | Bin 2723 -> 0 bytes
 .../resources/bitbrains-small/trace/trace.parquet  | Bin 2163354 -> 0 bytes
 .../src/main/resources/env/multi.json              |  66 ---------------------
 .../src/main/resources/env/single.json             |  26 --------
 .../src/main/resources/log4j2.xml                  |  43 --------------
 .../src/main/resources/scenario.json               |  16 -----
 7 files changed, 172 deletions(-)
 delete mode 100644 opendc-experiments/opendc-experiments-scenario/src/main/resources/bitbrains-small/interference-model.json
 delete mode 100644 opendc-experiments/opendc-experiments-scenario/src/main/resources/bitbrains-small/trace/meta.parquet
 delete mode 100644 opendc-experiments/opendc-experiments-scenario/src/main/resources/bitbrains-small/trace/trace.parquet
 delete mode 100644 opendc-experiments/opendc-experiments-scenario/src/main/resources/env/multi.json
 delete mode 100644 opendc-experiments/opendc-experiments-scenario/src/main/resources/env/single.json
 delete mode 100644 opendc-experiments/opendc-experiments-scenario/src/main/resources/log4j2.xml
 delete mode 100644 opendc-experiments/opendc-experiments-scenario/src/main/resources/scenario.json

(limited to 'opendc-experiments/opendc-experiments-scenario/src/main/resources')

diff --git a/opendc-experiments/opendc-experiments-scenario/src/main/resources/bitbrains-small/interference-model.json b/opendc-experiments/opendc-experiments-scenario/src/main/resources/bitbrains-small/interference-model.json
deleted file mode 100644
index 51fc6366..00000000
--- a/opendc-experiments/opendc-experiments-scenario/src/main/resources/bitbrains-small/interference-model.json
+++ /dev/null
@@ -1,21 +0,0 @@
-[
-    {
-        "vms": [
-            "141",
-            "379",
-            "851",
-            "116"
-        ],
-        "minServerLoad": 0.0,
-        "performanceScore": 0.8830158730158756
-    },
-    {
-        "vms": [
-            "205",
-            "116",
-            "463"
-        ],
-        "minServerLoad": 0.0,
-        "performanceScore": 0.7133055555552751
-    }
-]
diff --git a/opendc-experiments/opendc-experiments-scenario/src/main/resources/bitbrains-small/trace/meta.parquet b/opendc-experiments/opendc-experiments-scenario/src/main/resources/bitbrains-small/trace/meta.parquet
deleted file mode 100644
index 9cded35f..00000000
Binary files a/opendc-experiments/opendc-experiments-scenario/src/main/resources/bitbrains-small/trace/meta.parquet and /dev/null differ
diff --git a/opendc-experiments/opendc-experiments-scenario/src/main/resources/bitbrains-small/trace/trace.parquet b/opendc-experiments/opendc-experiments-scenario/src/main/resources/bitbrains-small/trace/trace.parquet
deleted file mode 100644
index 9d953956..00000000
Binary files a/opendc-experiments/opendc-experiments-scenario/src/main/resources/bitbrains-small/trace/trace.parquet and /dev/null differ
diff --git a/opendc-experiments/opendc-experiments-scenario/src/main/resources/env/multi.json b/opendc-experiments/opendc-experiments-scenario/src/main/resources/env/multi.json
deleted file mode 100644
index 721005b0..00000000
--- a/opendc-experiments/opendc-experiments-scenario/src/main/resources/env/multi.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "clusters":
-    [
-        {
-            "name": "C01",
-            "hosts" :
-            [
-                {
-                    "name": "H01",
-                    "cpus":
-                    [
-                        {
-                            "coreCount": 32,
-                            "coreSpeed": 3200
-                        }
-                    ],
-                    "memory": {
-                        "memorySize": 256000
-                    }
-                }
-            ]
-        },
-        {
-            "name": "C02",
-            "hosts" :
-            [
-                {
-                    "name": "H02",
-                    "count": 6,
-                    "cpus":
-                    [
-                        {
-                            "coreCount": 8,
-                            "coreSpeed": 2930
-                        }
-                    ],
-                    "memory": {
-                        "memorySize": 64000
-                    }
-                }
-            ]
-        },
-        {
-            "name": "C03",
-            "hosts" :
-            [
-                {
-                    "name": "H03",
-                    "count": 2,
-                    "cpus":
-                    [
-                        {
-                            "coreCount": 16,
-                            "coreSpeed": 3200
-                        }
-                    ],
-                    "memory": {
-                        "memorySize": 128000
-                    }
-                }
-            ]
-        }
-    ]
-}
-
-
diff --git a/opendc-experiments/opendc-experiments-scenario/src/main/resources/env/single.json b/opendc-experiments/opendc-experiments-scenario/src/main/resources/env/single.json
deleted file mode 100644
index a1c8d95a..00000000
--- a/opendc-experiments/opendc-experiments-scenario/src/main/resources/env/single.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "clusters":
-    [
-        {
-            "name": "C01",
-            "hosts" :
-            [
-                {
-                    "name": "H01",
-                    "cpus":
-                    [
-                        {
-                            "coreCount": 8,
-                            "coreSpeed": 3200
-                        }
-                    ],
-                    "memory": {
-                        "memorySize": 128000
-                    }
-                }
-            ]
-        }
-    ]
-}
-
-
diff --git a/opendc-experiments/opendc-experiments-scenario/src/main/resources/log4j2.xml b/opendc-experiments/opendc-experiments-scenario/src/main/resources/log4j2.xml
deleted file mode 100644
index e479f2ca..00000000
--- a/opendc-experiments/opendc-experiments-scenario/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ MIT License
-  ~
-  ~ Copyright (c) 2020 atlarge-research
-  ~
-  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
-  ~ of this software and associated documentation files (the "Software"), to deal
-  ~ in the Software without restriction, including without limitation the rights
-  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  ~ copies of the Software, and to permit persons to whom the Software is
-  ~ furnished to do so, subject to the following conditions:
-  ~
-  ~ The above copyright notice and this permission notice shall be included in all
-  ~ copies or substantial portions of the Software.
-  ~
-  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  ~ SOFTWARE.
-  -->
-
-<Configuration status="WARN">
-    <Appenders>
-        <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%highlight{%-5level}] %logger{36} - %msg%n" disableAnsi="false"/>
-        </Console>
-    </Appenders>
-    <Loggers>
-        <Logger name="org.opendc" level="warn" additivity="false">
-            <AppenderRef ref="Console"/>
-        </Logger>
-        <Logger name="org.apache.hadoop" level="warn" additivity="false">
-            <AppenderRef ref="Console"/>
-        </Logger>
-        <Root level="error">
-            <AppenderRef ref="Console"/>
-        </Root>
-    </Loggers>
-</Configuration>
diff --git a/opendc-experiments/opendc-experiments-scenario/src/main/resources/scenario.json b/opendc-experiments/opendc-experiments-scenario/src/main/resources/scenario.json
deleted file mode 100644
index 3b22e5f4..00000000
--- a/opendc-experiments/opendc-experiments-scenario/src/main/resources/scenario.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "runs": 5,
-    "topology": {
-        "pathToFile": "resources/env/single.json"
-    },
-    "workload": {
-        "pathToFile": "resources/bitbrains-small",
-        "type": "ComputeWorkload"
-    },
-    "allocationPolicy": {
-        "policyType": "Mem"
-    },
-    "failureModel": {
-        "name": "TEST"
-    }
-}
-- 
cgit v1.2.3