From 2ad90a6526460fd70c656445bafb7529bd1c30b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Tich=C3=A1k?= <michal.tichak@cern.ch>
Date: Mon, 5 May 2025 12:12:58 +0200
Subject: [PATCH] [odc] plumbing for expendable and rmsjobid in odcdevice

---
 core/integration/odc/plugin.go | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/core/integration/odc/plugin.go b/core/integration/odc/plugin.go
index 502b5723..96d0102a 100644
--- a/core/integration/odc/plugin.go
+++ b/core/integration/odc/plugin.go
@@ -110,12 +110,14 @@ type OdcPartitionInfo struct {
 }
 
 type OdcDevice struct {
-	TaskId   string   `json:"taskId"`
-	State    string   `json:"state"`
-	EcsState sm.State `json:"ecsState"`
-	Path     string   `json:"path"`
-	Ignored  bool     `json:"ignored"`
-	Host     string   `json:"host"`
+	TaskId     string   `json:"taskId"`
+	State      string   `json:"state"`
+	EcsState   sm.State `json:"ecsState"`
+	Path       string   `json:"path"`
+	Ignored    bool     `json:"ignored"`
+	Host       string   `json:"host"`
+	Expendable bool     `json:"expendable"`
+	Rmsjobid   string   `json:"rmsjobid"`
 }
 
 type partitionStateChangedEventPayload struct {
@@ -136,6 +138,8 @@ type deviceStateChangedEventPayload struct {
 	Path             string   `json:"path"`
 	Ignored          bool     `json:"ignored"`
 	Host             string   `json:"host"`
+	Expendable       bool     `json:"expendable"`
+	Rmsjobid         string   `json:"rmsjobid"`
 }
 
 func NewPlugin(endpoint string) integration.Plugin {
@@ -258,11 +262,13 @@ func (p *Plugin) queryPartitionStatus() {
 			odcPartInfoSlice[idx].Devices = make(map[OdcDeviceId]*OdcDevice, len(odcPartStateRep.Devices))
 			for _, device := range odcPartStateRep.Devices {
 				odcPartInfoSlice[idx].Devices[OdcDeviceId(device.Id)] = &OdcDevice{
-					TaskId:  strconv.FormatUint(device.Id, 10),
-					State:   device.State,
-					Path:    device.Path,
-					Ignored: device.Ignored,
-					Host:    device.Host,
+					TaskId:     strconv.FormatUint(device.Id, 10),
+					State:      device.State,
+					Path:       device.Path,
+					Ignored:    device.Ignored,
+					Host:       device.Host,
+					Expendable: device.Expendable,
+					Rmsjobid:   device.Rmsjobid,
 				}
 			}
 		}(i, id)
@@ -317,6 +323,8 @@ func (p *Plugin) queryPartitionStatus() {
 						Path:             device.Path,
 						Ignored:          device.Ignored,
 						Host:             device.Host,
+						Expendable:       device.Expendable,
+						Rmsjobid:         device.Rmsjobid,
 					}
 					payloadJson, _ := json.Marshal(payload)