Rename Network type and embed NetworkStatus

Renames the Network type to NetworkStatusWithSubnets, and embeds
NetworkStatus. This is a pure Go change with no implications for the
CRDs.

Author: mdbooth

api/v1alpha5/conversion.go

@@ -212,26 +212,6 @@ func Convert_v1alpha7_PortOpts_To_v1alpha5_PortOpts(in *infrav1.PortOpts, out *P
 	return nil
 }
 
-func Convert_Slice_v1alpha5_Network_To_Slice_v1alpha7_Network(in *[]Network, out *[]infrav1.Network, s conversion.Scope) error {
-	*out = make([]infrav1.Network, len(*in))
-	for i := range *in {
-		if err := Convert_v1alpha5_Network_To_v1alpha7_Network(&(*in)[i], &(*out)[i], s); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func Convert_Slice_v1alpha7_Network_To_Slice_v1alpha5_Network(in *[]infrav1.Network, out *[]Network, s conversion.Scope) error {
-	*out = make([]Network, len(*in))
-	for i := range *in {
-		if err := Convert_v1alpha7_Network_To_v1alpha5_Network(&(*in)[i], &(*out)[i], s); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 func Convert_v1alpha5_OpenStackMachineSpec_To_v1alpha7_OpenStackMachineSpec(in *OpenStackMachineSpec, out *infrav1.OpenStackMachineSpec, s conversion.Scope) error {
 	return autoConvert_v1alpha5_OpenStackMachineSpec_To_v1alpha7_OpenStackMachineSpec(in, out, s)
 }
@@ -280,9 +260,26 @@ func Convert_v1alpha7_BastionStatus_To_v1alpha5_Instance(in *infrav1.BastionStat
 	return nil
 }
 
-func Convert_v1alpha5_Network_To_v1alpha7_Network(in *Network, out *infrav1.Network, s conversion.Scope) error {
+func Convert_v1alpha5_Network_To_v1alpha7_NetworkStatusWithSubnets(in *Network, out *infrav1.NetworkStatusWithSubnets, s conversion.Scope) error {
 	// PortOpts has been removed in v1alpha7
-	return autoConvert_v1alpha5_Network_To_v1alpha7_Network(in, out, s)
+	err := Convert_v1alpha5_Network_To_v1alpha7_NetworkStatus(in, &out.NetworkStatus, s)
+	if err != nil {
+		return err
+	}
+
+	out.Subnet = (*infrav1.Subnet)(in.Subnet)
+	return nil
+}
+
+func Convert_v1alpha7_NetworkStatusWithSubnets_To_v1alpha5_Network(in *infrav1.NetworkStatusWithSubnets, out *Network, s conversion.Scope) error {
+	// PortOpts has been removed in v1alpha7
+	err := Convert_v1alpha7_NetworkStatus_To_v1alpha5_Network(&in.NetworkStatus, out, s)
+	if err != nil {
+		return err
+	}
+
+	out.Subnet = (*Subnet)(in.Subnet)
+	return nil
 }
 
 func Convert_v1alpha5_Network_To_v1alpha7_NetworkStatus(in *Network, out *infrav1.NetworkStatus, _ conversion.Scope) error {

api/v1alpha5/zz_generated.conversion.go

@@ -427,26 +427,6 @@ func Convert_v1alpha6_PortOpts_To_v1alpha7_PortOpts(in *PortOpts, out *infrav1.P
 	return nil
 }
 
-func Convert_Slice_v1alpha6_Network_To_Slice_v1alpha7_Network(in *[]Network, out *[]infrav1.Network, s conversion.Scope) error {
-	*out = make([]infrav1.Network, len(*in))
-	for i := range *in {
-		if err := Convert_v1alpha6_Network_To_v1alpha7_Network(&(*in)[i], &(*out)[i], s); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func Convert_Slice_v1alpha7_Network_To_Slice_v1alpha6_Network(in *[]infrav1.Network, out *[]Network, s conversion.Scope) error {
-	*out = make([]Network, len(*in))
-	for i := range *in {
-		if err := Convert_v1alpha7_Network_To_v1alpha6_Network(&(*in)[i], &(*out)[i], s); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 func Convert_v1alpha7_PortOpts_To_v1alpha6_PortOpts(in *infrav1.PortOpts, out *PortOpts, s conversion.Scope) error {
 	// value specs and propagate uplink status have been added in v1alpha7 but have no equivalent in v1alpha5
 	err := autoConvert_v1alpha7_PortOpts_To_v1alpha6_PortOpts(in, out, s)
@@ -486,9 +466,26 @@ func Convert_v1alpha7_BastionStatus_To_v1alpha6_Instance(in *infrav1.BastionStat
 	return nil
 }
 
-func Convert_v1alpha6_Network_To_v1alpha7_Network(in *Network, out *infrav1.Network, s conversion.Scope) error {
+func Convert_v1alpha6_Network_To_v1alpha7_NetworkStatusWithSubnets(in *Network, out *infrav1.NetworkStatusWithSubnets, s conversion.Scope) error {
 	// PortOpts has been removed in v1alpha7
-	return autoConvert_v1alpha6_Network_To_v1alpha7_Network(in, out, s)
+	err := Convert_v1alpha6_Network_To_v1alpha7_NetworkStatus(in, &out.NetworkStatus, s)
+	if err != nil {
+		return err
+	}
+
+	out.Subnet = (*infrav1.Subnet)(in.Subnet)
+	return nil
+}
+
+func Convert_v1alpha7_NetworkStatusWithSubnets_To_v1alpha6_Network(in *infrav1.NetworkStatusWithSubnets, out *Network, s conversion.Scope) error {
+	// PortOpts has been removed in v1alpha7
+	err := Convert_v1alpha7_NetworkStatus_To_v1alpha6_Network(&in.NetworkStatus, out, s)
+	if err != nil {
+		return err
+	}
+
+	out.Subnet = (*Subnet)(in.Subnet)
+	return nil
 }
 
 func Convert_v1alpha6_Network_To_v1alpha7_NetworkStatus(in *Network, out *infrav1.NetworkStatus, _ conversion.Scope) error {

api/v1alpha6/conversion.go

@@ -156,7 +156,7 @@ type OpenStackClusterStatus struct {
 	Ready bool `json:"ready"`
 
 	// Network contains information about the created OpenStack Network.
-	Network *Network `json:"network,omitempty"`
+	Network *NetworkStatusWithSubnets `json:"network,omitempty"`
 
 	// externalNetwork contains information about the external network used for default ingress and egress traffic.
 	ExternalNetwork *NetworkStatus `json:"externalNetwork,omitempty"`

api/v1alpha6/zz_generated.conversion.go

@@ -163,24 +163,20 @@ type RootVolume struct {
 	AvailabilityZone string `json:"availabilityZone,omitempty"`
 }
 
-// Network represents basic information about an OpenStack Neutron Network associated with an instance's port.
-type Network struct {
+// NetworkStatus contains basic information about an existing neutron network.
+type NetworkStatus struct {
 	Name string `json:"name"`
 	ID   string `json:"id"`
 
 	//+optional
 	Tags []string `json:"tags,omitempty"`
-
-	Subnet *Subnet `json:"subnet,omitempty"`
 }
 
-// NetworkStatus contains basic information about an existing neutron network.
-type NetworkStatus struct {
-	Name string `json:"name"`
-	ID   string `json:"id"`
+// NetworkStatusWithSubnets represents basic information about an existing neutron network and an associated set of subnets.
+type NetworkStatusWithSubnets struct {
+	NetworkStatus `json:",inline"`
 
-	//+optional
-	Tags []string `json:"tags,omitempty"`
+	Subnet *Subnet `json:"subnet,omitempty"`
 }
 
 // Subnet represents basic information about the associated OpenStack Neutron Subnet.