WIP use ironic inventory API

metal3-io · Sep 13, 2023 · 6525397 · 6525397
1 parent 04764be
commit 6525397
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 16 deletions.
diff --git a/cmd/get-hardware-details/main.go b/cmd/get-hardware-details/main.go
@@ -8,7 +8,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/gophercloud/gophercloud/openstack/baremetalintrospection/v1/introspection"
+	"github.com/gophercloud/gophercloud/openstack/baremetal/v1/nodes"
+	"k8s.io/klog/v2"
 
 	"github.com/metal3-io/baremetal-operator/pkg/provisioner/ironic/clients"
 	"github.com/metal3-io/baremetal-operator/pkg/provisioner/ironic/hardwaredetails"
@@ -34,20 +35,20 @@ func main() {
 		InsecureSkipVerify: ironicInsecure,
 	}
 
-	inspector, err := clients.InspectorClient(opts.Endpoint, opts.AuthConfig, tlsConf)
+	ironic, err := clients.IronicClient(opts.Endpoint, opts.AuthConfig, tlsConf)
 	if err != nil {
-		fmt.Printf("could not get inspector client: %s", err)
+		fmt.Printf("could not get ironic client: %s", err)
 		os.Exit(1)
 	}
 
-	introData := introspection.GetIntrospectionData(inspector, opts.NodeID)
+	introData := nodes.GetInventory(ironic, opts.NodeID)
 	data, err := introData.Extract()
 	if err != nil {
-		fmt.Printf("could not get introspection data: %s", err)
+		fmt.Printf("could not get inspection data: %s", err)
 		os.Exit(1)
 	}
 
-	json, err := json.MarshalIndent(hardwaredetails.GetHardwareDetails(data), "", "\t")
+	json, err := json.MarshalIndent(hardwaredetails.GetHardwareDetails(data, klog.NewKlogr()), "", "\t")
 	if err != nil {
 		fmt.Printf("could not convert introspection data: %s", err)
 		os.Exit(1)
@@ -58,7 +59,7 @@ func main() {
 
 func getOptions() (o options) {
 	if len(os.Args) != 3 {
-		fmt.Println("Usage: get-hardware-details <inspector URI> <node UUID>")
+		fmt.Println("Usage: get-hardware-details <ironic URI> <node UUID>")
 		os.Exit(1)
 	}
 

diff --git a/pkg/provisioner/ironic/clients/client.go b/pkg/provisioner/ironic/clients/client.go
@@ -95,8 +95,8 @@ func IronicClient(ironicEndpoint string, auth AuthConfig, tls TLSConfig) (client
 
 	// Ensure we have a microversion high enough to get the features
 	// we need. Update docs/configuration.md when updating the version.
-	// Version 1.74 allows retrival of the BIOS Registry
-	client.Microversion = "1.74"
+	// Version 1.81 allows retrival of Node inventory
+	client.Microversion = "1.81"
 
 	return updateHTTPClient(client, tls)
 }

diff --git a/pkg/provisioner/ironic/hardwaredetails/hardwaredetails.go b/pkg/provisioner/ironic/hardwaredetails/hardwaredetails.go
@@ -6,19 +6,26 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/go-logr/logr"
 	"github.com/gophercloud/gophercloud/openstack/baremetal/inventory"
+	"github.com/gophercloud/gophercloud/openstack/baremetal/v1/nodes"
 	"github.com/gophercloud/gophercloud/openstack/baremetalintrospection/v1/introspection"
 
 	metal3api "github.com/metal3-io/baremetal-operator/apis/metal3.io/v1alpha1"
 )
 
 // GetHardwareDetails converts Ironic introspection data into BareMetalHost HardwareDetails.
-func GetHardwareDetails(data *introspection.Data) *metal3api.HardwareDetails {
+func GetHardwareDetails(data *nodes.InventoryData, logger logr.Logger) *metal3api.HardwareDetails {
+	inspectorData, err := data.PluginData.AsInspectorData()
+	if err != nil {
+		logger.Error(err, "cannot get plugin data from inventory, some fields will not be available")
+	}
+
 	details := new(metal3api.HardwareDetails)
 	details.Firmware = getFirmwareDetails(data.Inventory.SystemVendor.Firmware)
 	details.SystemVendor = getSystemVendorDetails(data.Inventory.SystemVendor)
-	details.RAMMebibytes = data.MemoryMB
-	details.NIC = getNICDetails(data.Inventory.Interfaces, data.AllInterfaces)
+	details.RAMMebibytes = data.Inventory.Memory.PhysicalMb
+	details.NIC = getNICDetails(data.Inventory.Interfaces, inspectorData.AllInterfaces)
 	details.Storage = getStorageDetails(data.Inventory.Disks)
 	details.CPU = getCPUDetails(&data.Inventory.CPU)
 	details.Hostname = data.Inventory.Hostname

diff --git a/pkg/provisioner/ironic/ironic.go b/pkg/provisioner/ironic/ironic.go
@@ -12,7 +12,6 @@ import (
 	"github.com/gophercloud/gophercloud"
 	"github.com/gophercloud/gophercloud/openstack/baremetal/v1/nodes"
 	"github.com/gophercloud/gophercloud/openstack/baremetal/v1/ports"
-	"github.com/gophercloud/gophercloud/openstack/baremetalintrospection/v1/introspection"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
@@ -844,8 +843,8 @@ func (p *ironicProvisioner) InspectHardware(data provisioner.InspectData, restar
 		return
 	}
 
-	// TODO(dtantsur): change this to use Ironic native inspection data API.
-	response := introspection.GetIntrospectionData(p.inspector, ironicNode.UUID)
+	p.log.Info("getting hardware details from inspection")
+	response := nodes.GetInventory(p.client, ironicNode.UUID)
 	introData, err := response.Extract()
 	if err != nil {
 		if _, isNotFound := err.(gophercloud.ErrDefault404); isNotFound {
@@ -860,7 +859,7 @@ func (p *ironicProvisioner) InspectHardware(data provisioner.InspectData, restar
 	// Introspection is done
 	p.log.Info("inspection finished successfully", "data", response.Body)
 
-	details = hardwaredetails.GetHardwareDetails(introData)
+	details = hardwaredetails.GetHardwareDetails(introData, p.log)
 	p.publisher("InspectionComplete", "Hardware inspection completed")
 	result, err = operationComplete()
 	return