Merge pull request #626 from winiciusallan/port-host-id

mandre · web-flow · commit 270e5de006e8 · 2026-01-08T15:54:25.000Z
Port: add binding:host field
diff --git a/api/v1alpha1/port_types.go b/api/v1alpha1/port_types.go
@@ -180,6 +180,11 @@ type PortResourceSpec struct {
 	// +kubebuilder:validation:MaxLength=32
 	// +optional
 	MACAddress string `json:"macAddress,omitempty"`
+
+	// hostID is the ID of host where the port resides.
+	// +kubebuilder:validation:MaxLength=36
+	// +optional
+	HostID string `json:"hostID,omitempty"`
 }
 
 type PortResourceStatus struct {
@@ -272,6 +277,11 @@ type PortResourceStatus struct {
 	// +optional
 	PortSecurityEnabled *bool `json:"portSecurityEnabled,omitempty"`
 
+	// hostID is the ID of host where the port resides.
+	// +kubebuilder:validation:MaxLength=128
+	// +optional
+	HostID string `json:"hostID,omitempty"`
+
 	NeutronStatusMetadata `json:",inline"`
 }
 
diff --git a/cmd/models-schema/zz_generated.openapi.go b/cmd/models-schema/zz_generated.openapi.go
diff --git a/config/crd/bases/openstack.k-orc.cloud_ports.yaml b/config/crd/bases/openstack.k-orc.cloud_ports.yaml
@@ -298,6 +298,10 @@ spec:
                     maxLength: 255
                     minLength: 1
                     type: string
+                  hostID:
+                    description: hostID is the ID of host where the port resides.
+                    maxLength: 36
+                    type: string
                   macAddress:
                     description: macAddress is the MAC address of the port.
                     maxLength: 32
@@ -561,6 +565,10 @@ spec:
                     maxItems: 128
                     type: array
                     x-kubernetes-list-type: atomic
+                  hostID:
+                    description: hostID is the ID of host where the port resides.
+                    maxLength: 128
+                    type: string
                   macAddress:
                     description: macAddress is the MAC address of the port.
                     maxLength: 1024
diff --git a/internal/controllers/port/actuator.go b/internal/controllers/port/actuator.go
@@ -232,6 +232,7 @@ func (actuator portActuator) CreateResource(ctx context.Context, obj *orcv1alpha
 	portsBindingOpts := portsbinding.CreateOptsExt{
 		CreateOptsBuilder: createOpts,
 		VNICType:          resource.VNICType,
+		HostID:            resource.HostID,
 	}
 
 	portSecurityOpts := portsecurity.PortCreateOptsExt{
@@ -482,6 +483,16 @@ func handlePortBindingUpdate(updateOpts ports.UpdateOptsBuilder, resource *resou
 			}
 		}
 	}
+
+	if resource.HostID != "" {
+		if resource.HostID != osResource.HostID {
+			updateOpts = &portsbinding.UpdateOptsExt{
+				UpdateOptsBuilder: updateOpts,
+				HostID:            &resource.HostID,
+			}
+		}
+	}
+
 	return updateOpts
 }
 
diff --git a/internal/controllers/port/status.go b/internal/controllers/port/status.go
@@ -72,7 +72,8 @@ func (portStatusWriter) ApplyResourceStatus(log logr.Logger, osResource *osResou
 		WithPortSecurityEnabled(osResource.PortSecurityEnabled).
 		WithRevisionNumber(int64(osResource.RevisionNumber)).
 		WithCreatedAt(metav1.NewTime(osResource.CreatedAt)).
-		WithUpdatedAt(metav1.NewTime(osResource.UpdatedAt))
+		WithUpdatedAt(metav1.NewTime(osResource.UpdatedAt)).
+		WithHostID(osResource.HostID)
 
 	if osResource.Description != "" {
 		resourceStatus.WithDescription(osResource.Description)
diff --git a/internal/controllers/port/tests/port-create-full/00-assert.yaml b/internal/controllers/port/tests/port-create-full/00-assert.yaml
@@ -14,8 +14,9 @@ status:
     portSecurityEnabled: true
     propagateUplinkStatus: false
     status: DOWN
-    vnicType: direct
+    vnicType: macvtap
     macAddress: fa:16:3e:23:fd:d7
+    hostID: devstack
     tags:
       - tag1
 ---
diff --git a/internal/controllers/port/tests/port-create-full/00-create-resource.yaml b/internal/controllers/port/tests/port-create-full/00-create-resource.yaml
@@ -82,6 +82,7 @@ spec:
     - subnetRef: port-create-full
       ip: 192.168.155.122
     portSecurity: Enabled
-    vnicType: direct
+    vnicType: macvtap
     projectRef: port-create-full
     macAddress: fa:16:3e:23:fd:d7
+    hostID: devstack
diff --git a/internal/controllers/port/tests/port-update/00-assert.yaml b/internal/controllers/port/tests/port-update/00-assert.yaml
@@ -6,13 +6,20 @@ resourceRefs:
       kind: port
       name: port-update
       ref: port
+    - apiVersion: openstack.k-orc.cloud/v1alpha1
+      kind: port
+      name: port-update-admin
+      ref: portAdmin
 assertAll:
     - celExpr: "port.status.id != ''"
     - celExpr: "port.status.resource.createdAt != ''"
     - celExpr: "port.status.resource.updatedAt != ''"
     - celExpr: "port.status.resource.macAddress != ''"
     - celExpr: "!has(port.status.resource.fixedIPs)"
     - celExpr: "!has(port.status.resource.description)"
+    # Following the network API reference, the default value for
+    # hostID field is an empty string.
+    - celExpr: "portAdmin.status.resource.hostID == ''"
 ---
 apiVersion: openstack.k-orc.cloud/v1alpha1
 kind: Port
@@ -36,3 +43,26 @@ status:
       message: OpenStack resource is up to date
       status: "False"
       reason: Success
+---
+apiVersion: openstack.k-orc.cloud/v1alpha1
+kind: Port
+metadata:
+  name: port-update-admin
+status:
+  resource:
+    name: port-update-admin
+    adminStateUp: true
+    portSecurityEnabled: true
+    propagateUplinkStatus: false
+    revisionNumber: 1
+    status: DOWN
+    vnicType: normal
+  conditions:
+    - type: Available
+      message: OpenStack resource is available
+      status: "True"
+      reason: Success
+    - type: Progressing
+      message: OpenStack resource is up to date
+      status: "False"
+      reason: Success
diff --git a/internal/controllers/port/tests/port-update/00-minimal-resource.yaml b/internal/controllers/port/tests/port-update/00-minimal-resource.yaml
@@ -12,3 +12,17 @@ spec:
     portSecurity: Disabled
     # Need to set the default values to revert them correctly in the 02-revert-resource step.
     vnicType: normal
+---
+# This port is intended to be used only to test fields editable
+# by admin users
+apiVersion: openstack.k-orc.cloud/v1alpha1
+kind: Port
+metadata:
+  name: port-update-admin
+spec:
+  cloudCredentialsRef:
+    cloudName: openstack-admin
+    secretName: openstack-clouds
+  managementPolicy: managed
+  resource:
+    networkRef: port-update
diff --git a/internal/controllers/port/tests/port-update/01-assert.yaml b/internal/controllers/port/tests/port-update/01-assert.yaml
@@ -48,4 +48,19 @@ status:
     reason: Success
   - type: Progressing
     status: "False"
-    reason: Success 
+    reason: Success 
+---
+apiVersion: openstack.k-orc.cloud/v1alpha1
+kind: Port
+metadata:
+  name: port-update-admin
+status:
+  resource:
+    hostID: devstack
+  conditions:
+  - type: Available
+    status: "True"
+    reason: Success
+  - type: Progressing
+    status: "False"
+    reason: Success 
diff --git a/internal/controllers/port/tests/port-update/01-updated-resource.yaml b/internal/controllers/port/tests/port-update/01-updated-resource.yaml
@@ -19,4 +19,16 @@ spec:
     tags:
     - tag1
     vnicType: direct
-    portSecurity: Enabled
+    portSecurity: Enabled
+---
+apiVersion: openstack.k-orc.cloud/v1alpha1
+kind: Port
+metadata:
+  name: port-update-admin
+spec:
+  cloudCredentialsRef:
+    cloudName: openstack-admin
+    secretName: openstack-clouds
+  managementPolicy: managed
+  resource:
+    hostID: devstack
diff --git a/internal/controllers/port/tests/port-update/02-reverted-resource.yaml b/internal/controllers/port/tests/port-update/02-reverted-resource.yaml
@@ -4,4 +4,4 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
   - command: kubectl replace -f 00-minimal-resource.yaml
-    namespaced: true
+    namespaced: true
diff --git a/pkg/clients/applyconfiguration/api/v1alpha1/portresourcespec.go b/pkg/clients/applyconfiguration/api/v1alpha1/portresourcespec.go
diff --git a/pkg/clients/applyconfiguration/api/v1alpha1/portresourcestatus.go b/pkg/clients/applyconfiguration/api/v1alpha1/portresourcestatus.go
diff --git a/pkg/clients/applyconfiguration/internal/internal.go b/pkg/clients/applyconfiguration/internal/internal.go
diff --git a/website/docs/crd-reference.md b/website/docs/crd-reference.md
@@ -2171,6 +2171,7 @@ _Appears in:_
 | `portSecurity` _[PortSecurityState](#portsecuritystate)_ | portSecurity controls port security for this port.<br />When set to Enabled, port security is enabled.<br />When set to Disabled, port security is disabled and SecurityGroupRefs must be empty.<br />When set to Inherit (default), it takes the value from the network level. | Inherit | Enum: [Enabled Disabled Inherit] <br /> |
 | `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 /> |
 
 
 #### PortResourceStatus
@@ -2202,6 +2203,7 @@ _Appears in:_
 | `propagateUplinkStatus` _boolean_ | propagateUplinkStatus represents the uplink status propagation of<br />the port. |  |  |
 | `vnicType` _string_ | vnicType is the type of vNIC which this port is attached to. |  | MaxLength: 64 <br /> |
 | `portSecurityEnabled` _boolean_ | portSecurityEnabled indicates whether port security is enabled or not. |  |  |
+| `hostID` _string_ | hostID is the ID of host where the port resides. |  | MaxLength: 128 <br /> |
 | `createdAt` _[Time](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#time-v1-meta)_ | createdAt shows the date and time when the resource was created. The date and time stamp format is ISO 8601 |  |  |
 | `updatedAt` _[Time](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#time-v1-meta)_ | updatedAt shows the date and time when the resource was updated. The date and time stamp format is ISO 8601 |  |  |
 | `revisionNumber` _integer_ | revisionNumber optionally set via extensions/standard-attr-revisions |  |  |

Original file line number	Diff line number	Diff line change
`@@ -232,6 +232,7 @@ func (actuator portActuator) CreateResource(ctx context.Context, obj *orcv1alpha`
`232`	`232`	`portsBindingOpts := portsbinding.CreateOptsExt{`
`233`	`233`	`CreateOptsBuilder: createOpts,`
`234`	`234`	`VNICType: resource.VNICType,`
	`235`	`+ HostID: resource.HostID,`
`235`	`236`	`}`
`236`	`237`
`237`	`238`	`portSecurityOpts := portsecurity.PortCreateOptsExt{`
`@@ -482,6 +483,16 @@ func handlePortBindingUpdate(updateOpts ports.UpdateOptsBuilder, resource *resou`
`482`	`483`	`}`
`483`	`484`	`}`
`484`	`485`	`}`
	`486`	`+`
	`487`	`+ if resource.HostID != "" {`
	`488`	`+ if resource.HostID != osResource.HostID {`
	`489`	`+ updateOpts = &portsbinding.UpdateOptsExt{`
	`490`	`+ UpdateOptsBuilder: updateOpts,`
	`491`	`+ HostID: &resource.HostID,`
	`492`	`+ }`
	`493`	`+ }`
	`494`	`+ }`
	`495`	`+`
`485`	`496`	`return updateOpts`
`486`	`497`	`}`
`487`	`498`