Merge pull request #618 from winiciusallan/port-macaddress

mandre · web-flow · commit 67fdd10e32c4 · 2026-01-03T14:06:25.000Z
Port: add MACAddress field
diff --git a/api/v1alpha1/port_types.go b/api/v1alpha1/port_types.go
@@ -41,6 +41,11 @@ type PortFilter struct {
 	// +optional
 	AdminStateUp *bool `json:"adminStateUp,omitempty"`
 
+	// macAddress is the MAC address of the port.
+	// +kubebuilder:validation:MaxLength=32
+	// +optional
+	MACAddress string `json:"macAddress,omitempty"`
+
 	FilterByNeutronTags `json:",inline"`
 }
 
@@ -170,6 +175,11 @@ type PortResourceSpec struct {
 	// +optional
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="projectRef is immutable"
 	ProjectRef *KubernetesNameRef `json:"projectRef,omitempty"`
+
+	// macAddress is the MAC address of the port.
+	// +kubebuilder:validation:MaxLength=32
+	// +optional
+	MACAddress string `json:"macAddress,omitempty"`
 }
 
 type PortResourceStatus struct {
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
@@ -105,6 +105,10 @@ spec:
                         maxLength: 255
                         minLength: 1
                         type: string
+                      macAddress:
+                        description: macAddress is the MAC address of the port.
+                        maxLength: 32
+                        type: string
                       name:
                         description: name of the existing resource
                         maxLength: 255
@@ -294,6 +298,10 @@ spec:
                     maxLength: 255
                     minLength: 1
                     type: string
+                  macAddress:
+                    description: macAddress is the MAC address of the port.
+                    maxLength: 32
+                    type: string
                   name:
                     description: name is a human-readable name of the port. If not
                       set, the object's name will be used.
diff --git a/internal/controllers/port/actuator.go b/internal/controllers/port/actuator.go
@@ -141,6 +141,7 @@ func (actuator portActuator) ListOSResourcesForImport(ctx context.Context, obj o
 		NotTags:      tags.Join(filter.NotTags),
 		NotTagsAny:   tags.Join(filter.NotTagsAny),
 		AdminStateUp: filter.AdminStateUp,
+		MACAddress:   filter.MACAddress,
 	}
 
 	return actuator.osClient.ListPort(ctx, listOpts), nil
@@ -197,6 +198,7 @@ func (actuator portActuator) CreateResource(ctx context.Context, obj *orcv1alpha
 		Description:  string(ptr.Deref(resource.Description, "")),
 		ProjectID:    projectID,
 		AdminStateUp: resource.AdminStateUp,
+		MACAddress:   resource.MACAddress,
 	}
 
 	if len(resource.AllowedAddressPairs) > 0 {
diff --git a/internal/controllers/port/status.go b/internal/controllers/port/status.go
@@ -72,8 +72,7 @@ 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)).
-		WithAdminStateUp(osResource.AdminStateUp)
+		WithUpdatedAt(metav1.NewTime(osResource.UpdatedAt))
 
 	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
@@ -15,6 +15,7 @@ status:
     propagateUplinkStatus: false
     status: DOWN
     vnicType: direct
+    macAddress: fa:16:3e:23:fd:d7
     tags:
       - tag1
 ---
@@ -41,7 +42,6 @@ assertAll:
     - celExpr: "port.status.id != ''"
     - celExpr: "port.status.resource.createdAt != ''"
     - celExpr: "port.status.resource.updatedAt != ''"
-    - celExpr: "port.status.resource.macAddress != ''"
     - celExpr: "port.status.resource.revisionNumber > 0"
     - celExpr: "port.status.resource.fixedIPs[0].subnetID == subnet.status.id"
     - celExpr: "port.status.resource.fixedIPs[0].ip == '192.168.155.122'"
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
@@ -84,3 +84,4 @@ spec:
     portSecurity: Enabled
     vnicType: direct
     projectRef: port-create-full
+    macAddress: fa:16:3e:23:fd:d7
diff --git a/internal/controllers/port/tests/port-import/00-import-resource.yaml b/internal/controllers/port/tests/port-import/00-import-resource.yaml
@@ -13,5 +13,6 @@ spec:
       name: port-import-external
       description: Port from "port-import" test
       adminStateUp: false
+      macAddress: fa:16:3e:23:fd:d7
       tags:
         - tag1
diff --git a/internal/controllers/port/tests/port-import/02-assert.yaml b/internal/controllers/port/tests/port-import/02-assert.yaml
@@ -31,5 +31,6 @@ status:
     name: port-import-external
     description: Port from "port-import" test
     adminStateUp: false
+    macAddress: fa:16:3e:23:fd:d7
     tags:
     - tag1
diff --git a/internal/controllers/port/tests/port-import/02-create-resource.yaml b/internal/controllers/port/tests/port-import/02-create-resource.yaml
@@ -12,5 +12,6 @@ spec:
     networkRef: port-import
     description: Port from "port-import" test
     adminStateUp: false
+    macAddress: fa:16:3e:23:fd:d7
     tags:
       - tag1
diff --git a/pkg/clients/applyconfiguration/api/v1alpha1/portfilter.go b/pkg/clients/applyconfiguration/api/v1alpha1/portfilter.go
diff --git a/pkg/clients/applyconfiguration/api/v1alpha1/portresourcespec.go b/pkg/clients/applyconfiguration/api/v1alpha1/portresourcespec.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
@@ -2070,6 +2070,7 @@ _Appears in:_
 | `networkRef` _[KubernetesNameRef](#kubernetesnameref)_ | networkRef is a reference to the ORC Network which this port is associated with. |  | MaxLength: 253 <br />MinLength: 1 <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 /> |
 | `adminStateUp` _boolean_ | adminStateUp is the administrative state of the port,<br />which is up (true) or down (false). |  |  |
+| `macAddress` _string_ | macAddress is the MAC address of the port. |  | MaxLength: 32 <br /> |
 | `tags` _[NeutronTag](#neutrontag) array_ | tags is a list of tags to filter by. If specified, the resource must<br />have all of the tags specified to be included in the result. |  | MaxItems: 64 <br />MaxLength: 255 <br />MinLength: 1 <br /> |
 | `tagsAny` _[NeutronTag](#neutrontag) array_ | tagsAny is a list of tags to filter by. If specified, the resource<br />must have at least one of the tags specified to be included in the<br />result. |  | MaxItems: 64 <br />MaxLength: 255 <br />MinLength: 1 <br /> |
 | `notTags` _[NeutronTag](#neutrontag) array_ | notTags is a list of tags to filter by. If specified, resources which<br />contain all of the given tags will be excluded from the result. |  | MaxItems: 64 <br />MaxLength: 255 <br />MinLength: 1 <br /> |
@@ -2169,6 +2170,7 @@ _Appears in:_
 | `vnicType` _string_ | vnicType specifies the type of vNIC which this port should be<br />attached to. This is used to determine which mechanism driver(s) to<br />be used to bind the port. The valid values are normal, macvtap,<br />direct, baremetal, direct-physical, virtio-forwarder, smart-nic and<br />remote-managed, although these values will not be validated in this<br />API to ensure compatibility with future neutron changes or custom<br />implementations. What type of vNIC is actually available depends on<br />deployments. If not specified, the Neutron default value is used. |  | MaxLength: 64 <br /> |
 | `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 /> |
 
 
 #### PortResourceStatus

Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,7 @@ func (actuator portActuator) ListOSResourcesForImport(ctx context.Context, obj o`
`141`	`141`	`NotTags: tags.Join(filter.NotTags),`
`142`	`142`	`NotTagsAny: tags.Join(filter.NotTagsAny),`
`143`	`143`	`AdminStateUp: filter.AdminStateUp,`
	`144`	`+ MACAddress: filter.MACAddress,`
`144`	`145`	`}`
`145`	`146`
`146`	`147`	`return actuator.osClient.ListPort(ctx, listOpts), nil`
`@@ -197,6 +198,7 @@ func (actuator portActuator) CreateResource(ctx context.Context, obj *orcv1alpha`
`197`	`198`	`Description: string(ptr.Deref(resource.Description, "")),`
`198`	`199`	`ProjectID: projectID,`
`199`	`200`	`AdminStateUp: resource.AdminStateUp,`
	`201`	`+ MACAddress: resource.MACAddress,`
`200`	`202`	`}`
`201`	`203`
`202`	`204`	`if len(resource.AllowedAddressPairs) > 0 {`