summaryrefslogtreecommitdiff
path: root/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/conv
diff options
context:
space:
mode:
authorDante Niewenhuis <d.niewenhuis@hotmail.com>2024-03-05 13:23:57 +0100
committerGitHub <noreply@github.com>2024-03-05 13:23:57 +0100
commit5864cbcbfe2eb8c36ca05c3a39c7e5916aeecaec (patch)
tree5b2773b8dc21c2e1b526fb70f829c376dd80532a /opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/conv
parentd28002a3c151d198298574312f32f1cb43f3a660 (diff)
Updated package versions, updated web server tests. (#207)
* Updated all package versions including kotlin. Updated all web-server tests to run. * Changed the java version of the tests. OpenDC now only supports java 19. * small update * test update * new update * updated docker version to 19 * updated docker version to 19
Diffstat (limited to 'opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/conv')
-rw-r--r--opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/conv/ResourceColumns.kt14
-rw-r--r--opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/conv/ResourceStateColumns.kt24
2 files changed, 19 insertions, 19 deletions
diff --git a/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/conv/ResourceColumns.kt b/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/conv/ResourceColumns.kt
index 89f8dbc4..046dd13d 100644
--- a/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/conv/ResourceColumns.kt
+++ b/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/conv/ResourceColumns.kt
@@ -28,40 +28,40 @@ package org.opendc.trace.conv
* Identifier of the resource.
*/
@JvmField
-public val RESOURCE_ID: String = "id"
+public val resourceID: String = "id"
/**
* The cluster to which the resource belongs.
*/
@JvmField
-public val RESOURCE_CLUSTER_ID: String = "cluster_id"
+public val resourceClusterID: String = "cluster_id"
/**
* Start time for the resource.
*/
@JvmField
-public val RESOURCE_START_TIME: String = "start_time"
+public val resourceStartTime: String = "start_time"
/**
* End time for the resource.
*/
@JvmField
-public val RESOURCE_STOP_TIME: String = "stop_time"
+public val resourceStopTime: String = "stop_time"
/**
* Number of CPUs for the resource.
*/
@JvmField
-public val RESOURCE_CPU_COUNT: String = "cpu_count"
+public val resourceCpuCount: String = "cpu_count"
/**
* Total CPU capacity of the resource in MHz.
*/
@JvmField
-public val RESOURCE_CPU_CAPACITY: String = "cpu_capacity"
+public val resourceCpuCapacity: String = "cpu_capacity"
/**
* Memory capacity for the resource in KB.
*/
@JvmField
-public val RESOURCE_MEM_CAPACITY: String = "mem_capacity"
+public val resourceMemCapacity: String = "mem_capacity"
diff --git a/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/conv/ResourceStateColumns.kt b/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/conv/ResourceStateColumns.kt
index 5187d501..eede6bd6 100644
--- a/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/conv/ResourceStateColumns.kt
+++ b/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/conv/ResourceStateColumns.kt
@@ -28,70 +28,70 @@ package org.opendc.trace.conv
* The timestamp at which the state was recorded.
*/
@JvmField
-public val RESOURCE_STATE_TIMESTAMP: String = "timestamp"
+public val resourceStateTimestamp: String = "timestamp"
/**
* Duration for the state.
*/
@JvmField
-public val RESOURCE_STATE_DURATION: String = "duration"
+public val resourceStateDuration: String = "duration"
/**
* A flag to indicate that the resource is powered on.
*/
@JvmField
-public val RESOURCE_STATE_POWERED_ON: String = "powered_on"
+public val resourceStatePoweredOn: String = "powered_on"
/**
* Total CPU usage of the resource in MHz.
*/
@JvmField
-public val RESOURCE_STATE_CPU_USAGE: String = "cpu_usage"
+public val resourceStateCpuUsage: String = "cpu_usage"
/**
* Total CPU usage of the resource in percentage.
*/
@JvmField
-public val RESOURCE_STATE_CPU_USAGE_PCT: String = "cpu_usage_pct"
+public val resourceStateCpuUsagePct: String = "cpu_usage_pct"
/**
* Total CPU demand of the resource in MHz.
*/
@JvmField
-public val RESOURCE_STATE_CPU_DEMAND: String = "cpu_demand"
+public val resourceStateCpuDemand: String = "cpu_demand"
/**
* CPU ready percentage.
*/
@JvmField
-public val RESOURCE_STATE_CPU_READY_PCT: String = "cpu_ready_pct"
+public val resourceStateCpuReadyPct: String = "cpu_ready_pct"
/**
* Memory usage of the resource in KB.
*/
@JvmField
-public val RESOURCE_STATE_MEM_USAGE: String = "mem_usage"
+public val resourceStateMemUsage: String = "mem_usage"
/**
* Disk read throughput of the resource in KB/s.
*/
@JvmField
-public val RESOURCE_STATE_DISK_READ: String = "disk_read"
+public val resourceStateDiskRead: String = "disk_read"
/**
* Disk write throughput of the resource in KB/s.
*/
@JvmField
-public val RESOURCE_STATE_DISK_WRITE: String = "disk_write"
+public val resourceStateDiskWrite: String = "disk_write"
/**
* Network receive throughput of the resource in KB/s.
*/
@JvmField
-public val RESOURCE_STATE_NET_RX: String = "net_rx"
+public val resourceStateNetRx: String = "net_rx"
/**
* Network transmit throughput of the resource in KB/s.
*/
@JvmField
-public val RESOURCE_STATE_NET_TX: String = "net_tx"
+public val resourceStateNetTx: String = "net_tx"