remove temp struct and add new Unmarshal logic

Author: winiciusallan

api/v1alpha1/port_types.go

@@ -213,6 +213,9 @@ type PortResourceSpec struct {
 
 	// propagateUplinkStatus represents the uplink status propagation of
 	// the port.
+	// The field is now immutable due to a limitation on
+	// Dalmatian (2024.2) release, we should address this later.
+	// https://github.com/k-orc/openstack-resource-controller/pull/641#discussion_r2905989136
 	// +optional
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="propagateUplinkStatus is immutable"
 	PropagateUplinkStatus *bool `json:"propagateUplinkStatus,omitempty"`

cmd/models-schema/zz_generated.openapi.go

@@ -381,6 +381,9 @@ spec:
                     description: |-
                       propagateUplinkStatus represents the uplink status propagation of
                       the port.
+                      The field is now immutable due to a limitation on
+                      Dalmatian (2024.2) release, we should address this later.
+                      https://github.com/k-orc/openstack-resource-controller/pull/641#discussion_r2905989136
                     type: boolean
                     x-kubernetes-validations:
                     - message: propagateUplinkStatus is immutable

config/crd/bases/openstack.k-orc.cloud_ports.yaml

@@ -18,6 +18,7 @@ package osclients
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"iter"
 
@@ -52,19 +53,34 @@ type NetworkExt struct {
 	provider.NetworkProviderExt
 }
 
-// NOTE(winiciusallan): This is a temporary extension struct to
-// workaround a missing pointer on Gophercloud and must be
-// removed in future releases.
-// See https://github.com/gophercloud/gophercloud/issues/3605
-type PortTmpExt struct {
-	PropagateUplinkStatusPtr *bool `json:"propagate_uplink_status,omitempty"`
-}
-
 type PortExt struct {
 	ports.Port
 	portsecurity.PortSecurityExt
 	portsbinding.PortsBindingExt
-	PortTmpExt //nolint:govet
+
+	PropagateUplinkStatusPtr *bool `json:"propagate_uplink_status,omitempty"`
+}
+
+func (p *PortExt) UnmarshalJSON(b []byte) error {
+	if err := json.Unmarshal(b, &p.Port); err != nil {
+		return err
+	}
+	if err := json.Unmarshal(b, &p.PortSecurityExt); err != nil {
+		return err
+	}
+	if err := json.Unmarshal(b, &p.PortsBindingExt); err != nil {
+		return err
+	}
+
+	var tmp struct {
+		PropagateUplinkStatusPtr *bool `json:"propagate_uplink_status"`
+	}
+	if err := json.Unmarshal(b, &tmp); err != nil {
+		return err
+	}
+
+	p.PropagateUplinkStatusPtr = tmp.PropagateUplinkStatusPtr
+	return nil
 }
 
 type NetworkClient interface {
@@ -189,13 +205,30 @@ func (c networkClient) UpdateFloatingIP(ctx context.Context, id string, opts flo
 
 func (c networkClient) ListPort(ctx context.Context, opts ports.ListOptsBuilder) iter.Seq2[*PortExt, error] {
 	extractPortExt := func(p pagination.Page) ([]PortExt, error) {
-		var resources []PortExt
-		err := ports.ExtractPortsInto(p, &resources)
+		bodyMap, ok := p.(ports.PortPage).Body.(map[string]interface{})
+		if !ok {
+			return nil, fmt.Errorf("unexpected body type: %T", p.(ports.PortPage).Body)
+		}
+
+		portsData, ok := bodyMap["ports"]
+		if !ok {
+			return nil, fmt.Errorf("ports key not found in response")
+		}
+
+		// Marshal and unmarshal to trigger UnmarshalJSON
+		jsonData, err := json.Marshal(portsData)
 		if err != nil {
 			return nil, err
 		}
+
+		var resources []PortExt
+		if err := json.Unmarshal(jsonData, &resources); err != nil {
+			return nil, err
+		}
+
 		return resources, nil
 	}
+
 	pager := ports.List(c.serviceClient, opts)
 	return func(yield func(*PortExt, error) bool) {
 		_ = pager.EachPage(ctx, yieldPage(extractPortExt, yield))

internal/osclients/networking.go

@@ -2739,7 +2739,7 @@ _Appears in:_
 | `projectRef` _[KubernetesNameRef](#kubernetesnameref)_ | projectRef is a reference to the ORC Project this resource is associated with.<br />Typically, only used by admin. |  | MaxLength: 253 <br />MinLength: 1 <br />Optional: \{\} <br /> |
 | `macAddress` _string_ | macAddress is the MAC address of the port. |  | MaxLength: 32 <br />Optional: \{\} <br /> |
 | `hostID` _[HostID](#hostid)_ | hostID specifies the host where the port will be bound.<br />Note that when the port is attached to a server, OpenStack may<br />rebind the port to the server's actual compute host, which may<br />differ from the specified hostID if no matching scheduler hint<br />is used. In this case the port's status will reflect the actual<br />binding host, not the value specified here. |  | MaxProperties: 1 <br />MinProperties: 1 <br />Optional: \{\} <br /> |
-| `propagateUplinkStatus` _boolean_ | propagateUplinkStatus represents the uplink status propagation of<br />the port. |  | Optional: \{\} <br /> |
+| `propagateUplinkStatus` _boolean_ | propagateUplinkStatus represents the uplink status propagation of<br />the port.<br />The field is now immutable due to a limitation on<br />Dalmatian (2024.2) release, we should address this later.<br />https://github.com/k-orc/openstack-resource-controller/pull/641#discussion_r2905989136 |  | Optional: \{\} <br /> |
 
 
 #### PortResourceStatus