Make NetworkFilter.IsEmpty() return true on nil receiver

This improves safety and ergonomics checking it when NetworkFilter can be be a
pointer type.

Author: mdbooth

api/v1alpha6/openstackcluster_conversion.go

@@ -162,6 +162,10 @@ func restorev1alpha6ClusterSpec(previous *OpenStackClusterSpec, dst *OpenStackCl
 func restorev1beta1ClusterSpec(previous *infrav1.OpenStackClusterSpec, dst *infrav1.OpenStackClusterSpec) {
 	// Bastion is restored separately
 
+	if dst.Network.IsEmpty() {
+		dst.Network = previous.Network
+	}
+
 	// Restore all fields except ID, which should have been copied over in conversion
 	dst.ExternalNetwork.Name = previous.ExternalNetwork.Name
 	dst.ExternalNetwork.Description = previous.ExternalNetwork.Description

api/v1alpha7/openstackcluster_conversion.go

@@ -167,6 +167,10 @@ func restorev1alpha7ClusterSpec(previous *OpenStackClusterSpec, dst *OpenStackCl
 func restorev1beta1ClusterSpec(previous *infrav1.OpenStackClusterSpec, dst *infrav1.OpenStackClusterSpec) {
 	// Bastion is restored separately
 
+	if dst.Network.IsEmpty() {
+		dst.Network = previous.Network
+	}
+
 	// Restore all fields except ID, which should have been copied over in conversion
 	dst.ExternalNetwork.Name = previous.ExternalNetwork.Name
 	dst.ExternalNetwork.Description = previous.ExternalNetwork.Description

api/v1beta1/types.go

@@ -94,6 +94,9 @@ type NetworkFilter struct {
 }
 
 func (networkFilter *NetworkFilter) IsEmpty() bool {
+	if networkFilter == nil {
+		return true
+	}
 	return networkFilter.Name == "" &&
 		networkFilter.Description == "" &&
 		networkFilter.ProjectID == "" &&

pkg/cloud/services/networking/port.go

@@ -423,7 +423,7 @@ func (s *Service) normalizePorts(ports []infrav1.PortOpts, openStackCluster *inf
 // normalizePortTarget ensures that the port has a network ID.
 func (s *Service) normalizePortTarget(port *infrav1.PortOpts, openStackCluster *infrav1.OpenStackCluster, portIdx int) error {
 	// Treat no Network and empty Network the same
-	noNetwork := port.Network == nil || port.Network.IsEmpty()
+	noNetwork := port.Network.IsEmpty()
 
 	// No network or subnets defined: use cluster defaults
 	if noNetwork && len(port.FixedIPs) == 0 {