Merge 0b8f59f8f9 into 61aa82865d

discovery/openstack/instance.go

@@ -25,6 +25,7 @@ import (
 	"github.com/gophercloud/gophercloud/v2/openstack/compute/v2/servers"
 	"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/layer3/floatingips"
 	"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/ports"
+	"github.com/gophercloud/gophercloud/v2/openstack/utils"
 	"github.com/gophercloud/gophercloud/v2/pagination"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/common/promslog"
@@ -72,6 +73,27 @@ func newInstanceDiscovery(provider *gophercloud.ProviderClient, opts *gopherclou
 	}
 }
 
+type SupportedFeatures struct {
+	flavorOriginalName bool // Available from 2.47
+}
+
+func getSupportedFeatures(minMinor, minMajor, maxMinor, maxMajor int) SupportedFeatures {
+	features := SupportedFeatures{}
+
+	// Feature: 'flavor.original_name' is supported from microversion 2.47 onwards
+	if maxMajor > 2 || (maxMajor == 2 && maxMinor >= 47) {
+		features.flavorOriginalName = true
+	}
+
+	return features
+}
+
+func setClientMicroversion(sc *gophercloud.ServiceClient, microversion string) *gophercloud.ServiceClient {
+	microversioned := *sc
+	microversioned.Microversion = microversion
+	return &microversioned
+}
+
 type floatingIPKey struct {
 	deviceID string
 	fixed    string
@@ -90,6 +112,20 @@ func (i *InstanceDiscovery) refresh(ctx context.Context) ([]*targetgroup.Group,
 		return nil, fmt.Errorf("could not create OpenStack compute session: %w", err)
 	}
 
+	supportedVersions, err := utils.GetSupportedMicroversions(ctx, client)
+	if err != nil {
+		return nil, fmt.Errorf("failed to fetch supported microversions: %w", err)
+	}
+
+	// Determine available features
+	features := getSupportedFeatures(supportedVersions.MinMinor, supportedVersions.MinMajor, supportedVersions.MaxMinor, supportedVersions.MaxMajor)
+
+	minMicroversion := fmt.Sprintf("%d.%d", supportedVersions.MaxMajor, supportedVersions.MaxMinor)
+	client = setClientMicroversion(client, minMicroversion)
+
+	maxMicroversion := fmt.Sprintf("%d.%d", supportedVersions.MaxMajor, supportedVersions.MaxMinor)
+	clientLatest := setClientMicroversion(client, maxMicroversion)
+
 	networkClient, err := openstack.NewNetworkV2(i.provider, gophercloud.EndpointOpts{
 		Region: i.region, Availability: i.availability,
 	})
@@ -157,6 +193,27 @@ func (i *InstanceDiscovery) refresh(ctx context.Context) ([]*targetgroup.Group,
 		AllTenants: i.allTenants,
 	}
 	pager := servers.List(client, opts)
+
+	var latestServers []servers.Server
+	if features.flavorOriginalName {
+		// Fetch the server list using the client with the latest microversion
+		allPages, err := servers.List(clientLatest, opts).AllPages(ctx)
+		if err != nil {
+			i.logger.Warn("Failed to fetch server list with latest microversion, falling back to flavor.id")
+		} else {
+			latestServers, err = servers.ExtractServers(allPages)
+			if err != nil {
+				i.logger.Warn("Failed to extract servers with latest microversion, falling back to flavor.id")
+			}
+		}
+	}
+	latestServerMap := make(map[string]servers.Server)
+	if len(latestServers) > 0 {
+		for _, server := range latestServers {
+			latestServerMap[server.ID] = server
+		}
+	}
+
 	tg := &targetgroup.Group{
 		Source: "OS_" + i.region,
 	}
@@ -183,17 +240,26 @@ func (i *InstanceDiscovery) refresh(ctx context.Context) ([]*targetgroup.Group,
 				openstackLabelUserID:         model.LabelValue(s.UserID),
 			}
 
-			flavorName, nameOk := s.Flavor["original_name"].(string)
-			// "original_name" is only available for microversion >= 2.47. It was added in favor of "id".
-			if !nameOk {
+			// Check if we have enriched data for this server in the latestServerMap
+			if features.flavorOriginalName {
+				if latestServer, ok := latestServerMap[s.ID]; ok {
+					flavorName, nameOk := latestServer.Flavor["original_name"].(string)
+					if nameOk {
+						labels[openstackLabelInstanceFlavor] = model.LabelValue(flavorName)
+					} else {
+						i.logger.Warn("flavor.original_name not found for server, falling back to flavor.id", "instance", s.ID)
+					}
+				}
+			}
+
+			// Fallback to using flavor.id from the original server list if flavor.original_name wasn't set
+			if _, exists := labels[openstackLabelInstanceFlavor]; !exists {
 				flavorID, idOk := s.Flavor["id"].(string)
 				if !idOk {
-					i.logger.Warn("Invalid type for both flavor original_name and flavor id, expected string")
+					i.logger.Warn("Invalid type for both flavor.original_name and flavor.id in server, expected string", "instance", s.ID)
 					continue
 				}
 				labels[openstackLabelInstanceFlavor] = model.LabelValue(flavorID)
-			} else {
-				labels[openstackLabelInstanceFlavor] = model.LabelValue(flavorName)
 			}
 
 			imageID, ok := s.Image["id"].(string)

discovery/openstack/mock_test.go

@@ -86,6 +86,38 @@ func (m *SDMock) HandleVersionsSuccessfully() {
                         }
                 `, m.Endpoint()+"v3/", m.Endpoint()+"v2.0/")
 	})
+
+	// Compute API
+	m.Mux.HandleFunc("/compute/", func(w http.ResponseWriter, r *http.Request) {
+		fmt.Fprintf(w, `
+			{
+				"version": {
+					"id": "v2.1",
+					"status": "CURRENT",
+					"version": "2.96",
+					"min_version": "2.1",
+					"updated": "2013-07-23T11:33:21Z",
+					"links": [
+						{
+							"rel": "self",
+							"href": "%s"
+						},
+						{
+							"rel": "describedby",
+							"type": "text/html",
+							"href": "http://docs.openstack.org/"
+						}
+					],
+					"media-types": [
+						{
+							"base": "application/json",
+							"type": "application/vnd.openstack.compute+json;version=2.1"
+						}
+					]
+				}
+			}
+		`, m.Endpoint()+"v2.1/")
+	})
 }
 
 // HandleAuthSuccessfully mocks auth call.
@@ -131,7 +163,7 @@ func (m *SDMock) HandleAuthSuccessfully() {
                         "interface": "public",
                         "region": "RegionOne",
                         "region_id": "RegionOne",
-                        "url": "%s"
+                        "url": "%s/compute/v2.1/"
                     }
                 ],
                 "id": "b7f2a5b1a019459cb956e43a8cb41e31",
@@ -263,7 +295,7 @@ const hypervisorListBody = `
 
 // HandleHypervisorListSuccessfully mocks os-hypervisors detail call.
 func (m *SDMock) HandleHypervisorListSuccessfully() {
-	m.Mux.HandleFunc("/os-hypervisors/detail", func(w http.ResponseWriter, r *http.Request) {
+	m.Mux.HandleFunc("/compute/v2.1/os-hypervisors/detail", func(w http.ResponseWriter, r *http.Request) {
 		testMethod(m.t, r, http.MethodGet)
 		testHeader(m.t, r, "X-Auth-Token", tokenID)
 
@@ -645,7 +677,7 @@ const serverListBody = `
 
 // HandleServerListSuccessfully mocks server detail call.
 func (m *SDMock) HandleServerListSuccessfully() {
-	m.Mux.HandleFunc("/servers/detail", func(w http.ResponseWriter, r *http.Request) {
+	m.Mux.HandleFunc("/compute/v2.1/servers/detail", func(w http.ResponseWriter, r *http.Request) {
 		testMethod(m.t, r, http.MethodGet)
 		testHeader(m.t, r, "X-Auth-Token", tokenID)