From 04aea0d7b78516dc02388e66052f9c02879c40fd Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Thu, 20 Feb 2020 23:15:40 +0100
Subject: feat: Add support for resource tagging

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

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

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 33db78c9..6b721212 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,6 +26,7 @@ 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
@@ -120,7 +121,7 @@ class GwfTraceReader(reader: BufferedReader) : TraceReader<Job> {
                     val workflow = entry.workload
                     val task = Task(
                         UUID(0L, taskId), "<unnamed>",
-                        FlopsApplicationImage(flops, cores),
+                        FlopsApplicationImage(UUID.randomUUID(), "<unnamed>", TagContainerImpl(), 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 b5c6ca0d..e8c8ac88 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,6 +28,7 @@ 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
@@ -108,9 +109,10 @@ class VmTraceReader(traceDirectory: File) : TraceReader<VmWorkload> {
                         }
                 }
 
+                val uuid = UUID(0L, vmId)
                 val vmWorkload = VmWorkload(
-                    UUID(0L, vmId), "<unnamed>", UnnamedUser,
-                    VmImage(flopsHistory, cores)
+                    uuid, "<unnamed>", UnnamedUser,
+                    VmImage(uuid, "<unnamed>", TagContainerImpl(), flopsHistory, cores)
                 )
                 entries[vmId] = TraceEntryImpl(
                     flopsHistory.firstOrNull()?.tick ?: -1,
-- 
cgit v1.2.3