From 49b673e26ebf9f6a1c96f083d3876b19027b2abc Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Fri, 21 Feb 2020 15:47:33 +0100
Subject: feat: Simplify tagging of cloud resources

---
 .../main/kotlin/com/atlarge/opendc/format/trace/gwf/GwfTraceReader.kt  | 3 +--
 .../main/kotlin/com/atlarge/opendc/format/trace/vm/VmTraceReader.kt    | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'opendc/opendc-format/src')

diff --git a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/gwf/GwfTraceReader.kt b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/gwf/GwfTraceReader.kt
index 6b721212..498e2d1d 100644
--- a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/gwf/GwfTraceReader.kt
+++ b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/gwf/GwfTraceReader.kt
@@ -26,7 +26,6 @@ package com.atlarge.opendc.format.trace.gwf
 
 import com.atlarge.opendc.compute.core.image.FlopsApplicationImage
 import com.atlarge.opendc.core.User
-import com.atlarge.opendc.core.resource.TagContainerImpl
 import com.atlarge.opendc.format.trace.TraceEntry
 import com.atlarge.opendc.format.trace.TraceReader
 import com.atlarge.opendc.workflows.workload.Job
@@ -121,7 +120,7 @@ class GwfTraceReader(reader: BufferedReader) : TraceReader<Job> {
                     val workflow = entry.workload
                     val task = Task(
                         UUID(0L, taskId), "<unnamed>",
-                        FlopsApplicationImage(UUID.randomUUID(), "<unnamed>", TagContainerImpl(), flops, cores),
+                        FlopsApplicationImage(UUID.randomUUID(), "<unnamed>", emptyMap(), flops, cores),
                         HashSet()
                     )
                     entry.submissionTime = min(entry.submissionTime, submitTime)
diff --git a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/vm/VmTraceReader.kt b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/vm/VmTraceReader.kt
index e8c8ac88..f4ed0f57 100644
--- a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/vm/VmTraceReader.kt
+++ b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/vm/VmTraceReader.kt
@@ -28,7 +28,6 @@ import com.atlarge.opendc.compute.core.image.FlopsHistoryFragment
 import com.atlarge.opendc.compute.core.image.VmImage
 import com.atlarge.opendc.compute.core.workload.VmWorkload
 import com.atlarge.opendc.core.User
-import com.atlarge.opendc.core.resource.TagContainerImpl
 import com.atlarge.opendc.format.trace.TraceEntry
 import com.atlarge.opendc.format.trace.TraceReader
 import java.io.BufferedReader
@@ -112,7 +111,7 @@ class VmTraceReader(traceDirectory: File) : TraceReader<VmWorkload> {
                 val uuid = UUID(0L, vmId)
                 val vmWorkload = VmWorkload(
                     uuid, "<unnamed>", UnnamedUser,
-                    VmImage(uuid, "<unnamed>", TagContainerImpl(), flopsHistory, cores)
+                    VmImage(uuid, "<unnamed>", emptyMap(), flopsHistory, cores)
                 )
                 entries[vmId] = TraceEntryImpl(
                     flopsHistory.firstOrNull()?.tick ?: -1,
-- 
cgit v1.2.3