Port: add propagationUplinkStatus field

.github/workflows/e2e.yaml

@@ -36,7 +36,9 @@ jobs:
       with:
         enable_workaround_docker_io: 'false'
         branch: ${{ matrix.openstack_version }}
-        enabled_services: "openstack-cli-server"
+        enabled_services: "openstack-cli-server,neutron-uplink-status-propagation"
+        conf_overrides: |
+            enable_plugin neutron https://opendev.org/openstack/neutron.git ${{ matrix.openstack_version }}
 
     - name: Deploy a Kind Cluster
       uses: helm/kind-action@92086f6be054225fa813e0a4b13787fc9088faab

api/v1alpha1/port_types.go

@@ -185,6 +185,12 @@ type PortResourceSpec struct {
 	// +kubebuilder:validation:MaxLength=36
 	// +optional
 	HostID string `json:"hostID,omitempty"`
+
+	// propagateUplinkStatus represents the uplink status propagation of
+	// the port.
+	// +optional
+	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="propagateUplinkStatus is immutable"
+	PropagateUplinkStatus *bool `json:"propagateUplinkStatus,omitempty"`
 }
 
 type PortResourceStatus struct {

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

@@ -347,6 +347,14 @@ spec:
                     x-kubernetes-validations:
                     - message: projectRef is immutable
                       rule: self == oldSelf
+                  propagateUplinkStatus:
+                    description: |-
+                      propagateUplinkStatus represents the uplink status propagation of
+                      the port.
+                    type: boolean
+                    x-kubernetes-validations:
+                    - message: propagateUplinkStatus is immutable
+                      rule: self == oldSelf
                   securityGroupRefs:
                     description: |-
                       securityGroupRefs are the names of the security groups associated

internal/controllers/port/actuator.go

@@ -171,12 +171,13 @@ func (actuator portActuator) CreateResource(ctx context.Context, obj *orcv1alpha
 	}
 
 	createOpts := ports.CreateOpts{
-		NetworkID:    *network.Status.ID,
-		Name:         getResourceName(obj),
-		Description:  string(ptr.Deref(resource.Description, "")),
-		ProjectID:    projectID,
-		AdminStateUp: resource.AdminStateUp,
-		MACAddress:   resource.MACAddress,
+		NetworkID:             *network.Status.ID,
+		Name:                  getResourceName(obj),
+		Description:           string(ptr.Deref(resource.Description, "")),
+		ProjectID:             projectID,
+		AdminStateUp:          resource.AdminStateUp,
+		MACAddress:            resource.MACAddress,
+		PropagateUplinkStatus: resource.PropagateUplinkStatus,
 	}
 
 	if len(resource.AllowedAddressPairs) > 0 {

internal/controllers/port/status.go

@@ -67,7 +67,6 @@ func (portStatusWriter) ApplyResourceStatus(log logr.Logger, osResource *osResou
 		WithNetworkID(osResource.NetworkID).
 		WithTags(osResource.Tags...).
 		WithSecurityGroups(osResource.SecurityGroups...).
-		WithPropagateUplinkStatus(osResource.PropagateUplinkStatus).
 		WithVNICType(osResource.VNICType).
 		WithPortSecurityEnabled(osResource.PortSecurityEnabled).
 		WithRevisionNumber(int64(osResource.RevisionNumber)).
@@ -104,5 +103,9 @@ func (portStatusWriter) ApplyResourceStatus(log logr.Logger, osResource *osResou
 		resourceStatus.WithFixedIPs(fixedIPs...)
 	}
 
+	if osResource.PropagateUplinkStatusPtr != nil {
+		resourceStatus.WithPropagateUplinkStatus(*osResource.PropagateUplinkStatusPtr)
+	}
+
 	statusApply.WithResource(resourceStatus)
 }

internal/controllers/port/tests/port-create-full/00-create-resource.yaml

@@ -86,3 +86,4 @@ spec:
     projectRef: port-create-full
     macAddress: fa:16:3e:23:fd:d7
     hostID: devstack
+    propagateUplinkStatus: false

internal/controllers/port/tests/port-create-minimal/00-assert.yaml

@@ -8,7 +8,7 @@ status:
     name: port-create-minimal
     adminStateUp: true
     portSecurityEnabled: true
-    propagateUplinkStatus: false
+    propagateUplinkStatus: true
     revisionNumber: 1
     status: DOWN
     vnicType: normal

internal/controllers/port/tests/port-create-sriov/00-assert.yaml

@@ -9,7 +9,7 @@ status:
     description: Port from "create sriov" test
     adminStateUp: true
     portSecurityEnabled: false
-    propagateUplinkStatus: false
+    propagateUplinkStatus: true
     status: DOWN
     vnicType: direct
     tags:
@@ -35,4 +35,4 @@ assertAll:
     - celExpr: "port.status.resource.fixedIPs[0].subnetID == subnet.status.id"
     - celExpr: "port.status.resource.fixedIPs[0].ip == '192.168.155.122'"
     - celExpr: "!has(port.status.resource.allowedAddressPairs)"
-    - celExpr: "!has(port.status.resource.securityGroups)"
+    - celExpr: "!has(port.status.resource.securityGroups)"

internal/controllers/port/tests/port-update/00-assert.yaml

@@ -30,7 +30,7 @@ status:
     name: port-update
     adminStateUp: true
     portSecurityEnabled: false
-    propagateUplinkStatus: false
+    propagateUplinkStatus: true
     revisionNumber: 1
     status: DOWN
     vnicType: normal
@@ -53,7 +53,7 @@ status:
     name: port-update-admin
     adminStateUp: true
     portSecurityEnabled: true
-    propagateUplinkStatus: false
+    propagateUplinkStatus: true
     revisionNumber: 1
     status: DOWN
     vnicType: normal

internal/controllers/port/tests/port-update/01-assert.yaml

@@ -34,7 +34,6 @@ status:
     description: port-update-updated
     adminStateUp: true
     portSecurityEnabled: true
-    propagateUplinkStatus: false
     status: DOWN
     vnicType: direct
     allowedAddressPairs:
@@ -63,4 +62,4 @@ status:
     reason: Success
   - type: Progressing
     status: "False"
-    reason: Success 
+    reason: Success

internal/controllers/port/tests/port-update/02-assert.yaml

@@ -24,7 +24,7 @@ status:
     name: port-update
     adminStateUp: true
     portSecurityEnabled: false
-    propagateUplinkStatus: false
+    propagateUplinkStatus: true
     status: DOWN
     vnicType: normal
   conditions:
@@ -35,4 +35,4 @@ status:
     - type: Progressing
       message: OpenStack resource is up to date
       status: "False"
-      reason: Success
+      reason: Success

internal/osclients/networking.go

@@ -18,6 +18,7 @@ package osclients
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"iter"
 
@@ -56,6 +57,24 @@ type PortExt struct {
 	ports.Port
 	portsecurity.PortSecurityExt
 	portsbinding.PortsBindingExt
+
+	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
+	}
+
+	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 {
@@ -172,13 +191,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))

website/docs/crd-reference.md

@@ -2172,6 +2172,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 /> |
 | `macAddress` _string_ | macAddress is the MAC address of the port. |  | MaxLength: 32 <br /> |
 | `hostID` _string_ | hostID is the ID of host where the port resides. |  | MaxLength: 36 <br /> |
+| `propagateUplinkStatus` _boolean_ | propagateUplinkStatus represents the uplink status propagation of<br />the port. |  |  |
 
 
 #### PortResourceStatus