From 8bbc3de611f9a679b5fb542241d32f887b4fe921 Mon Sep 17 00:00:00 2001 From: Dante Niewenhuis Date: Fri, 6 Dec 2024 15:44:09 +0100 Subject: Renamed Multiplexer to FlowDistributor (#282) * Restructured opendc-simulator-flow. Renamed Multiplexer to FlowDistributor. * spotless applied * Added FlowDistributor topologies back --- .../FlowDistributor/topologies/single_1_2000.json | 22 ++++++++++++++++++++++ .../FlowDistributor/topologies/single_2_2000.json | 22 ++++++++++++++++++++++ .../Multiplexer/topologies/single_1_2000.json | 22 ---------------------- .../Multiplexer/topologies/single_2_2000.json | 22 ---------------------- 4 files changed, 44 insertions(+), 44 deletions(-) create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/FlowDistributor/topologies/single_1_2000.json create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/FlowDistributor/topologies/single_2_2000.json delete mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/Multiplexer/topologies/single_1_2000.json delete mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/Multiplexer/topologies/single_2_2000.json (limited to 'opendc-experiments/opendc-experiments-base/src/test/resources') 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/FlowDistributor/topologies/single_1_2000.json new file mode 100644 index 00000000..6790a10f --- /dev/null +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/FlowDistributor/topologies/single_1_2000.json @@ -0,0 +1,22 @@ +{ + "clusters": + [ + { + "name": "C01", + "hosts" : + [ + { + "name": "H01", + "cpu": + { + "coreCount": 1, + "coreSpeed": 2000 + }, + "memory": { + "memorySize": 140457600000 + } + } + ] + } + ] +} 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/FlowDistributor/topologies/single_2_2000.json new file mode 100644 index 00000000..4bab620a --- /dev/null +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/FlowDistributor/topologies/single_2_2000.json @@ -0,0 +1,22 @@ +{ + "clusters": + [ + { + "name": "C01", + "hosts" : + [ + { + "name": "H01", + "cpu": + { + "coreCount": 2, + "coreSpeed": 2000 + }, + "memory": { + "memorySize": 140457600000 + } + } + ] + } + ] +} diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/Multiplexer/topologies/single_1_2000.json b/opendc-experiments/opendc-experiments-base/src/test/resources/Multiplexer/topologies/single_1_2000.json deleted file mode 100644 index 6790a10f..00000000 --- a/opendc-experiments/opendc-experiments-base/src/test/resources/Multiplexer/topologies/single_1_2000.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "clusters": - [ - { - "name": "C01", - "hosts" : - [ - { - "name": "H01", - "cpu": - { - "coreCount": 1, - "coreSpeed": 2000 - }, - "memory": { - "memorySize": 140457600000 - } - } - ] - } - ] -} diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/Multiplexer/topologies/single_2_2000.json b/opendc-experiments/opendc-experiments-base/src/test/resources/Multiplexer/topologies/single_2_2000.json deleted file mode 100644 index 4bab620a..00000000 --- a/opendc-experiments/opendc-experiments-base/src/test/resources/Multiplexer/topologies/single_2_2000.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "clusters": - [ - { - "name": "C01", - "hosts" : - [ - { - "name": "H01", - "cpu": - { - "coreCount": 2, - "coreSpeed": 2000 - }, - "memory": { - "memorySize": 140457600000 - } - } - ] - } - ] -} -- cgit v1.2.3