Add TPM device to the VM inventory

Signed-off-by: Liran Rotenberg <[email protected]>
kubev2v · Nov 27, 2023 · c5137ff · c5137ff
1 parent d70b67d
commit c5137ff
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/pkg/controller/provider/container/ovirt/model.go b/pkg/controller/provider/container/ovirt/model.go
@@ -837,7 +837,7 @@ func (r *VMAdapter) Event() []int {
 // List the collection.
 func (r *VMAdapter) List(ctx *Context) (itr fb.Iterator, err error) {
 	vmList := VMList{}
-	err = ctx.client.list("vms", &vmList, r.follow())
+	err = ctx.client.list("vms", &vmList, r.follow(), libweb.Param{Key: "all_content", Value: "true"})
 	if err != nil {
 		return
 	}

diff --git a/pkg/controller/provider/container/ovirt/resource.go b/pkg/controller/provider/container/ovirt/resource.go
@@ -220,6 +220,7 @@ type VM struct {
 	USB              struct {
 		Enabled string `json:"enabled"`
 	} `json:"usb"`
+	TPM string `json:"tpm_enabled"`
 	Timezone struct {
 		Name string `json:"name"`
 	} `json:"time_zone"`
@@ -361,6 +362,7 @@ func (r *VM) ApplyTo(m *model.VM) {
 	m.StorageErrorResumeBehaviour = r.StorageErrorResumeBehaviour
 	m.HaEnabled = r.bool(r.HA.Enabled)
 	m.IOThreads = r.int16(r.IO.Threads)
+	m.TpmEnabled = r.bool(r.TPM)
 	r.addCpuAffinity(m)
 	r.addNICs(m)
 	r.addDiskAttachment(m)

diff --git a/pkg/controller/provider/model/ovirt/model.go b/pkg/controller/provider/model/ovirt/model.go
@@ -155,6 +155,7 @@ type VM struct {
 	Concerns                    []Concern        `sql:"" eq:"-"`
 	Guest                       Guest            `sql:""`
 	OSType                      string           `sql:""`
+	TpmEnabled                  bool             `sql:""`
 }
 
 // Determine if current revision has been validated.

diff --git a/pkg/controller/provider/web/ovirt/vm.go b/pkg/controller/provider/web/ovirt/vm.go
@@ -253,6 +253,7 @@ type VM struct {
 	Snapshots                   []Snapshot       `json:"snapshots"`
 	Guest                       Guest            `json:"guest"`
 	OSType                      string           `json:"osType"`
+	TpmEnabled                  bool             `json:"tpmEnabled"`
 }
 
 type VNIC = model.NIC
@@ -303,6 +304,7 @@ func (r *VM) With(m *model.VM) {
 	r.Snapshots = m.Snapshots
 	r.Guest = m.Guest
 	r.OSType = m.OSType
+	r.TpmEnabled = m.TpmEnabled
 }
 
 // Build self link (URI).