-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
3 changed files
with
248 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,221 @@ | ||
| package aws | ||
|
|
||
| import ( | ||
| "reflect" | ||
| "testing" | ||
|
|
||
| "github.com/davecgh/go-spew/spew" | ||
| "github.com/openshift/installer/pkg/asset/installconfig/aws" | ||
| "github.com/openshift/installer/pkg/ipnet" | ||
| "github.com/openshift/installer/pkg/types" | ||
| awstypes "github.com/openshift/installer/pkg/types/aws" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| ) | ||
|
|
||
| var ( | ||
| stubDefaultCIDR = "10.0.0.0/16" | ||
| stubInstallConfigZones = &types.InstallConfig{ | ||
| TypeMeta: metav1.TypeMeta{ | ||
| APIVersion: types.InstallConfigVersion, | ||
| }, | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "test-cluster", | ||
| }, | ||
| Networking: &types.Networking{ | ||
| MachineNetwork: []types.MachineNetworkEntry{ | ||
| { | ||
| CIDR: *ipnet.MustParseCIDR(stubDefaultCIDR), | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| stubInstallConfigCustomZonesPoolControl = &types.MachinePool{ | ||
| Name: "master", | ||
| Platform: types.MachinePoolPlatform{ | ||
| AWS: &awstypes.MachinePool{ | ||
| Zones: []string{"a", "b"}, | ||
| }, | ||
| }, | ||
| } | ||
| stubInstallConfigCustomZonesPoolCompute = []types.MachinePool{ | ||
| { | ||
| Name: "worker", | ||
| Platform: types.MachinePoolPlatform{ | ||
| AWS: &awstypes.MachinePool{ | ||
| Zones: []string{"b", "c"}, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| ) | ||
|
|
||
| func Test_extractZonesFromInstallConfig(t *testing.T) { | ||
| type args struct { | ||
| in *zoneConfigInput | ||
| } | ||
| tests := []struct { | ||
| name string | ||
| args args | ||
| want []*aws.Zone | ||
| wantErr bool | ||
| }{ | ||
| { | ||
| name: "empty install config", | ||
| args: args{ | ||
| in: &zoneConfigInput{ | ||
| Config: nil, | ||
| }, | ||
| }, | ||
| wantErr: true, | ||
| }, | ||
| { | ||
| name: "default zones", | ||
| args: args{ | ||
| in: &zoneConfigInput{ | ||
| Config: stubInstallConfigZones, | ||
| }, | ||
| }, | ||
| want: nil, | ||
| }, | ||
| { | ||
| name: "custom zones control plane pool", | ||
| args: args{ | ||
| in: &zoneConfigInput{ | ||
| Config: func() *types.InstallConfig { | ||
| config := types.InstallConfig{ | ||
| ControlPlane: stubInstallConfigCustomZonesPoolControl, | ||
| Compute: nil, | ||
| } | ||
| return &config | ||
| }(), | ||
| }, | ||
| }, | ||
| want: []*aws.Zone{{Name: "a"}, {Name: "b"}}, | ||
| }, | ||
| { | ||
| name: "custom zones compute pool", | ||
| args: args{ | ||
| in: &zoneConfigInput{ | ||
| Config: func() *types.InstallConfig { | ||
| config := types.InstallConfig{ | ||
| ControlPlane: nil, | ||
| Compute: stubInstallConfigCustomZonesPoolCompute, | ||
| } | ||
| return &config | ||
| }(), | ||
| }, | ||
| }, | ||
| want: []*aws.Zone{{Name: "b"}, {Name: "c"}}, | ||
| }, | ||
| { | ||
| name: "custom zones control plane and compute pools", | ||
| args: args{ | ||
| in: &zoneConfigInput{ | ||
| Config: func() *types.InstallConfig { | ||
| c := &types.InstallConfig{} | ||
| c.ControlPlane = stubInstallConfigCustomZonesPoolControl | ||
| c.Compute = stubInstallConfigCustomZonesPoolCompute | ||
| return c | ||
| }(), | ||
| }, | ||
| }, | ||
| want: []*aws.Zone{{Name: "a"}, {Name: "b"}, {Name: "c"}}, | ||
| }, | ||
| } | ||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| got, err := extractZonesFromInstallConfig(tt.args.in) | ||
| if (err != nil) != tt.wantErr { | ||
| t.Errorf("extractZonesFromInstallConfig() error = %v, wantErr %v", err, tt.wantErr) | ||
| return | ||
| } | ||
| if !reflect.DeepEqual(got, tt.want) { | ||
| spew.Printf("Got: %v\n", got) | ||
| t.Errorf("extractZonesFromInstallConfig() = %v, want %v", got, tt.want) | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| // var stubAwsCluster = &capa.AWSCluster{ | ||
| // ObjectMeta: metav1.ObjectMeta{ | ||
| // Name: "infraId", | ||
| // Namespace: capiutils.Namespace, | ||
| // }, | ||
| // Spec: capa.AWSClusterSpec{}, | ||
| // } | ||
|
|
||
| // func getStubInstallConfig() *installconfig.InstallConfig { | ||
| // ic := &installconfig.InstallConfig{} | ||
| // ic.Config = stubInstallConfigZones | ||
| // ic.Config.ControlPlane = stubInstallConfigCustomZonesPoolControl | ||
| // ic.Config.Compute = stubInstallConfigCustomZonesPoolCompute | ||
| // return ic | ||
| // } | ||
|
|
||
| // func Test_setZonesManagedVPC(t *testing.T) { | ||
| // type args struct { | ||
| // in *zoneConfigInput | ||
| // } | ||
| // tests := []struct { | ||
| // name string | ||
| // args args | ||
| // wantErr bool | ||
| // want *capa.AWSCluster | ||
| // }{ | ||
| // // TODO: Add test cases. | ||
| // { | ||
| // name: "empty clusterx", | ||
| // args: args{ | ||
| // in: &zoneConfigInput{ | ||
| // ClusterID: func() *installconfig.ClusterID { | ||
| // return &installconfig.ClusterID{ | ||
| // InfraID: "infra-id", | ||
| // } | ||
| // }(), | ||
| // Config: func() *types.InstallConfig { | ||
| // c := stubInstallConfigZones | ||
| // c.ControlPlane = stubInstallConfigCustomZonesPoolControl | ||
| // c.Compute = nil | ||
| // return c | ||
| // }(), | ||
| // Cluster: stubAwsCluster, | ||
| // InstallConfig: func() *installconfig.InstallConfig { | ||
| // ic := &installconfig.InstallConfig{} | ||
| // ic.Config = stubInstallConfigZones | ||
| // ic.Config.ControlPlane = stubInstallConfigCustomZonesPoolControl | ||
| // ic.Config.Compute = nil | ||
| // return ic | ||
| // }(), | ||
| // }, | ||
| // }, | ||
| // want: func() *capa.AWSCluster { | ||
| // c := stubAwsCluster | ||
| // c.Spec.NetworkSpec.VPC = capa.VPCSpec{CidrBlock: stubDefaultCIDR} | ||
| // c.Spec.NetworkSpec.Subnets = append(c.Spec.NetworkSpec.Subnets, capa.SubnetSpec{ | ||
| // ID: "infra-id-subnet-a", | ||
| // AvailabilityZone: "a", | ||
| // IsPublic: true, | ||
| // CidrBlock: "10.0.0.0/18x", | ||
| // }) | ||
| // return nil | ||
| // }(), | ||
| // }, | ||
| // } | ||
| // for _, tt := range tests { | ||
| // t.Run(tt.name, func(t *testing.T) { | ||
| // // if err := setZonesManagedVPC(tt.args.in); (err != nil) != tt.wantErr { | ||
| // // t.Errorf("setZonesManagedVPC() error = %v, wantErr %v", err, tt.wantErr) | ||
| // // } | ||
| // var got *capa.AWSCluster | ||
| // if tt.args.in.Cluster != nil { | ||
| // got = tt.args.in.Cluster | ||
| // } | ||
| // spew.Printf("\nWant: %v, \nGot: %v\n", tt.want, got) | ||
| // if !reflect.DeepEqual(got, tt.want) { | ||
| // // spew.Printf("\nGot: %v\n", got) | ||
| // t.Errorf("setZonesManagedVPC() = %v, want %v", got, tt.want) | ||
| // } | ||
| // }) | ||
| // } | ||
| // } |