Trunk type: fix scaffolding issues + minor bugs

Author: aldokimi

api/v1alpha1/trunk_types.go

@@ -15,6 +15,43 @@ limitations under the License.
 */
 
 package v1alpha1
+// TrunkSubportSpec represents a subport to attach to a trunk.
+// It maps to gophercloud's trunks.Subport.
+type TrunkSubportSpec struct {
+	// portRef is a reference to the ORC Port that will be attached as a subport.
+	// +required
+	PortRef KubernetesNameRef `json:"portRef"`
+
+	// segmentationID is the segmentation ID for the subport (e.g. VLAN ID).
+	// +required
+	// +kubebuilder:validation:Minimum:=1
+	// +kubebuilder:validation:Maximum:=4094
+	SegmentationID int32 `json:"segmentationID"`
+
+	// segmentationType is the segmentation type for the subport (e.g. vlan).
+	// +required
+	// +kubebuilder:validation:MinLength:=1
+	// +kubebuilder:validation:MaxLength:=255
+	SegmentationType string `json:"segmentationType"`
+}
+
+// TrunkSubportStatus represents an attached subport on a trunk.
+// It maps to gophercloud's trunks.Subport.
+type TrunkSubportStatus struct {
+	// portID is the OpenStack ID of the Port attached as a subport.
+	// +kubebuilder:validation:MaxLength=1024
+	// +optional
+	PortID string `json:"portID,omitempty"`
+
+	// segmentationID is the segmentation ID for the subport (e.g. VLAN ID).
+	// +optional
+	SegmentationID int32 `json:"segmentationID,omitempty"`
+
+	// segmentationType is the segmentation type for the subport (e.g. vlan).
+	// +kubebuilder:validation:MaxLength=1024
+	// +optional
+	SegmentationType string `json:"segmentationType,omitempty"`
+}
 
 // TrunkResourceSpec contains the desired state of the resource.
 type TrunkResourceSpec struct {
@@ -24,10 +61,8 @@ type TrunkResourceSpec struct {
 	Name *OpenStackName `json:"name,omitempty"`
 
 	// description is a human-readable description for the resource.
-	// +kubebuilder:validation:MinLength:=1
-	// +kubebuilder:validation:MaxLength:=255
 	// +optional
-	Description *string `json:"description,omitempty"`
+	Description *NeutronDescription `json:"description,omitempty"`
 
 	// portRef is a reference to the ORC Port which this resource is associated with.
 	// +required
@@ -39,13 +74,30 @@ type TrunkResourceSpec struct {
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="projectRef is immutable"
 	ProjectRef *KubernetesNameRef `json:"projectRef,omitempty"`
 
-	// TODO(scaffolding): Add more types.
-	// To see what is supported, you can take inspiration from the CreateOpts structure from
-	// github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/trunks
+	// adminStateUp is the administrative state of the trunk. If false (down),
+	// the trunk does not forward packets.
+	// +optional
+	AdminStateUp *bool `json:"adminStateUp,omitempty"`
+
+	// subports is the list of ports to attach to the trunk.
 	//
-	// Until you have implemented mutability for the field, you must add a CEL validation
-	// preventing the field being modified:
-	// `// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="<fieldname> is immutable"`
+	// NOTE: ORC currently does not implement reconcile logic for subport updates
+	// (Neutron uses dedicated add/remove subport APIs). This field is immutable
+	// until that behavior is implemented in the controller.
+	// +optional
+	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="subports is immutable"
+	// +kubebuilder:validation:MaxItems:=1024
+	// +listType=atomic
+	Subports []TrunkSubportSpec `json:"subports,omitempty"`
+
+	// tags is a list of Neutron tags to apply to the trunk.
+	//
+	// NOTE: ORC does not currently reconcile tag updates for Trunk.
+	// +kubebuilder:validation:MaxItems:=64
+	// +listType=set
+	// +optional
+	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="tags is immutable"
+	Tags []NeutronTag `json:"tags,omitempty"`
 }
 
 // TrunkFilter defines an existing resource by its properties
@@ -56,10 +108,8 @@ type TrunkFilter struct {
 	Name *OpenStackName `json:"name,omitempty"`
 
 	// description of the existing resource
-	// +kubebuilder:validation:MinLength:=1
-	// +kubebuilder:validation:MaxLength:=255
 	// +optional
-	Description *string `json:"description,omitempty"`
+	Description *NeutronDescription `json:"description,omitempty"`
 
 	// portRef is a reference to the ORC Port which this resource is associated with.
 	// +optional
@@ -69,9 +119,16 @@ type TrunkFilter struct {
 	// +optional
 	ProjectRef *KubernetesNameRef `json:"projectRef,omitempty"`
 
-	// TODO(scaffolding): Add more types.
-	// To see what is supported, you can take inspiration from the ListOpts structure from
-	// github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/trunks
+	// status indicates whether the trunk is currently operational. Possible values include
+	// `ACTIVE', `DOWN', `BUILD', `DEGRADED' or `ERROR'. Plug-ins might define additional values.
+	// +optional
+	Status *string `json:"status,omitempty"`
+
+	// adminStateUp is the administrative state of the trunk.
+	// +optional
+	AdminStateUp *bool `json:"adminStateUp,omitempty"`
+
+	FilterByNeutronTags `json:",inline"`
 }
 
 // TrunkResourceStatus represents the observed state of the resource.
@@ -96,7 +153,32 @@ type TrunkResourceStatus struct {
 	// +optional
 	ProjectID string `json:"projectID,omitempty"`
 
-	// TODO(scaffolding): Add more types.
-	// To see what is supported, you can take inspiration from the Trunk structure from
-	// github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/trunks
+	// tenantID is the project owner of the trunk (alias of projectID in some deployments).
+	// +kubebuilder:validation:MaxLength=1024
+	// +optional
+	TenantID string `json:"tenantID,omitempty"`
+
+	// status indicates whether the trunk is currently operational.
+	// +kubebuilder:validation:MaxLength=1024
+	// +optional
+	Status string `json:"status,omitempty"`
+
+	// tags is the list of tags on the resource.
+	// +kubebuilder:validation:MaxItems=64
+	// +kubebuilder:validation:items:MaxLength=1024
+	// +listType=atomic
+	// +optional
+	Tags []string `json:"tags,omitempty"`
+
+	NeutronStatusMetadata `json:",inline"`
+
+	// adminStateUp is the administrative state of the trunk.
+	// +optional
+	AdminStateUp *bool `json:"adminStateUp,omitempty"`
+
+	// subports is a list of ports associated with the trunk.
+	// +kubebuilder:validation:MaxItems=1024
+	// +listType=atomic
+	// +optional
+	Subports []TrunkSubportStatus `json:"subports,omitempty"`
 }