From 8e774224b6cc220da32fca3838bc0abe738cbeef Mon Sep 17 00:00:00 2001
From: Stephen Cheng <stephen.cheng@citrix.com>
Date: Mon, 8 Jun 2026 14:24:11 +0800
Subject: [PATCH] Convert all OpaqueRef fields in host, pool, SR and VM records

xsconsole maps raw xapi OpaqueRef strings to typed HotOpaqueRef objects
using hand-maintained converter tables in HotData. Newer XAPI releases
added several Ref fields (e.g. host.control_domain, host.certificates,
host.features, pool.repositories, VM.groups) that were missing from
these tables. In testing mode this caused xsconsole to spam "Missed
OpaqueRef" messages over the curses UI, notably on the Resource Pool
Configuration screen.

Add the missing Ref / Set(Ref) fields to the FetchHost, FetchPool,
FetchSR and FetchVM converters, cross-referenced against the xen-api
datamodel. Map(String, Ref) fields such as host.blobs are intentionally
left unconverted.

Signed-off-by: Stephen Cheng <stephen.cheng@citrix.com>
(cherry picked from commit 5fa04f1952a58bda026f8562e861f8b5d6a2fafa)
---
 XSConsoleHotData.py | 37 ++++++++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/XSConsoleHotData.py b/XSConsoleHotData.py
index cd8c6cd..352d99f 100644
--- a/XSConsoleHotData.py
+++ b/XSConsoleHotData.py
@@ -310,15 +310,26 @@ def FetchLocalPool(self, inOpaqueRef):
     def FetchHost(self, inOpaqueRef):
         def LocalConverter(inHost):
             return HotData.ConvertOpaqueRefs(inHost,
+                certificates = 'certificate',
+                control_domain = 'vm',
+                crashdumps = 'host_crashdump',
                 crash_dump_sr = 'sr',
                 consoles = 'console',
                 current_operations = 'task',
+                features = 'feature',
                 host_CPUs = 'host_cpu',
+                local_cache_sr = 'sr',
                 metrics = 'host::metrics',
+                patches = 'host_patch',
                 PBDs = 'pbd',
+                PCIs = 'pci',
+                PGPUs = 'pgpu',
                 PIFs='pif',
+                PUSBs = 'pusb',
                 resident_VMs = 'vm',
                 suspend_image_sr = 'sr',
+                updates = 'pool_update',
+                updates_requiring_reboot = 'pool_update',
                 VBDs = 'vbd',
                 VIFs = 'vif'
                 )
@@ -369,7 +380,12 @@ def LocalConverter(inPool):
                 crash_dump_SR='sr',
                 default_SR='sr',
                 master='host',
-                suspend_image_SR='sr'
+                metadata_VDIs='vdi',
+                redo_log_vdi='vdi',
+                repositories='repository',
+                repository_proxy_password='secret',
+                suspend_image_SR='sr',
+                telemetry_uuid='secret'
             )
 
         if inOpaqueRef is not None:
@@ -387,6 +403,7 @@ def FetchSR(self, inOpaqueRef):
         def LocalConverter(inSR):
             return HotData.ConvertOpaqueRefs(inSR,
                 current_operations = 'task',
+                introduced_by = 'dr_task',
                 PBDs = 'pbd',
                 VDIs = 'vdi')
 
@@ -424,16 +441,30 @@ def FetchVM(self, inOpaqueRef):
         def LocalConverter(inVM):
             return HotData.ConvertOpaqueRefs(inVM,
                 affinity='host',
+                appliance='vm_appliance',
+                attached_PCIs='pci',
+                children='vm',
                 consoles='console',
+                crash_dumps='crashdump',
                 current_operations = 'task',
+                groups='vm_group',
                 guest_metrics='guest_metrics',
                 metrics='vm::metrics',
+                parent='vm',
                 PIFs='pif',
+                protection_policy='vmpp',
                 resident_on='host',
-                suspend_VDI='vdi',
+                scheduled_to_be_resident_on='host',
+                snapshots='vm',
                 snapshot_of='snapshot',
+                snapshot_schedule='vmss',
+                suspend_SR='sr',
+                suspend_VDI='vdi',
                 VBDs = 'vbd',
-                VIFs = 'vif')
+                VGPUs='vgpu',
+                VIFs = 'vif',
+                VTPMs='vtpm',
+                VUSBs='vusb')
 
         if inOpaqueRef is not None:
             vm = self.Session().xenapi.VM.get_record(inOpaqueRef.OpaqueRef())