Skip to content

Commit

Permalink
fix status issue +tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@kon-angelo
kon-angelo committed Mar 25, 2024
1 parent a14d6a6 commit 6f285b1
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 13 deletions.
2 changes: 1 addition & 1 deletion pkg/controller/infrastructure/infraflow/ensurer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ func (f *FlowContext) GetInfrastructureStatus(_ context.Context) (*v1alpha1.Infr
TypeMeta: infrastructure.StatusTypeMeta,
Networks: v1alpha1.NetworkStatus{
VNet: v1alpha1.VNetStatus{
Name: f.adapter.VirtualNetworkConfig().ResourceGroup,
Name: f.adapter.VirtualNetworkConfig().Name,
},
Layout: v1alpha1.NetworkLayoutSingleSubnet,
},
Expand Down
30 changes: 18 additions & 12 deletions test/integration/infrastructure/infrastructure_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,8 @@ var _ = Describe("Infrastructure tests", func() {
It("should successfully create and delete AvailabilitySet cluster using existing vNet and existing identity", func() {
foreignName, err := generateName()
Expect(err).ToNot(HaveOccurred())
foreignNameVnet := foreignName + "-vnet"
foreignNameId := foreignName + "-id"

var cleanupHandle framework.CleanupActionHandle
cleanupHandle = framework.AddCleanupAction(func() {
Expand All @@ -262,15 +264,15 @@ var _ = Describe("Infrastructure tests", func() {
})

Expect(prepareNewResourceGroup(ctx, log, clientSet, foreignName, *region)).To(Succeed())
Expect(prepareNewVNet(ctx, log, clientSet, foreignName, foreignName, *region, VNetCIDR)).To(Succeed())
Expect(prepareNewIdentity(ctx, log, clientSet, foreignName, foreignName, *region)).To(Succeed())
Expect(prepareNewVNet(ctx, log, clientSet, foreignName, foreignNameVnet, *region, VNetCIDR)).To(Succeed())
Expect(prepareNewIdentity(ctx, log, clientSet, foreignName, foreignNameId, *region)).To(Succeed())

vnetConfig := &azurev1alpha1.VNet{
Name: pointer.String(foreignName),
Name: pointer.String(foreignNameVnet),
ResourceGroup: pointer.String(foreignName),
}
identityConfig := &azurev1alpha1.IdentityConfig{
Name: foreignName,
Name: foreignNameId,
ResourceGroup: foreignName,
}
providerConfig := newInfrastructureConfig(vnetConfig, nil, identityConfig, false)
Expand Down Expand Up @@ -300,6 +302,8 @@ var _ = Describe("Infrastructure tests", func() {
It("should successfully create and delete a zonal cluster with NatGateway using an existing vNet and identity", func() {
foreignName, err := generateName()
Expect(err).ToNot(HaveOccurred())
foreignNameVnet := foreignName + "-vnet"
foreignNameId := foreignName + "-id"

var cleanupHandle framework.CleanupActionHandle
cleanupHandle = framework.AddCleanupAction(func() {
Expand All @@ -308,15 +312,15 @@ var _ = Describe("Infrastructure tests", func() {
})

Expect(prepareNewResourceGroup(ctx, log, clientSet, foreignName, *region)).To(Succeed())
Expect(prepareNewVNet(ctx, log, clientSet, foreignName, foreignName, *region, VNetCIDR)).To(Succeed())
Expect(prepareNewIdentity(ctx, log, clientSet, foreignName, foreignName, *region)).To(Succeed())
Expect(prepareNewVNet(ctx, log, clientSet, foreignName, foreignNameVnet, *region, VNetCIDR)).To(Succeed())
Expect(prepareNewIdentity(ctx, log, clientSet, foreignName, foreignNameId, *region)).To(Succeed())

vnetConfig := &azurev1alpha1.VNet{
Name: pointer.String(foreignName),
Name: pointer.String(foreignNameVnet),
ResourceGroup: pointer.String(foreignName),
}
identityConfig := &azurev1alpha1.IdentityConfig{
Name: foreignName,
Name: foreignNameId,
ResourceGroup: foreignName,
}
natGatewayConfig := &azurev1alpha1.NatGatewayConfig{
Expand Down Expand Up @@ -437,6 +441,8 @@ var _ = Describe("Infrastructure tests", func() {
It("should successfully create and delete VMO cluster with NatGateway using an existing vNet and identity", func() {
foreignName, err := generateName()
Expect(err).ToNot(HaveOccurred())
foreignNameVnet := foreignName + "-vnet"
foreignNameId := foreignName + "-id"

var cleanupHandle framework.CleanupActionHandle
cleanupHandle = framework.AddCleanupAction(func() {
Expand All @@ -445,15 +451,15 @@ var _ = Describe("Infrastructure tests", func() {
})

Expect(prepareNewResourceGroup(ctx, log, clientSet, foreignName, *region)).To(Succeed())
Expect(prepareNewVNet(ctx, log, clientSet, foreignName, foreignName, *region, VNetCIDR)).To(Succeed())
Expect(prepareNewIdentity(ctx, log, clientSet, foreignName, foreignName, *region)).To(Succeed())
Expect(prepareNewVNet(ctx, log, clientSet, foreignName, foreignNameVnet, *region, VNetCIDR)).To(Succeed())
Expect(prepareNewIdentity(ctx, log, clientSet, foreignName, foreignNameId, *region)).To(Succeed())

vnetConfig := &azurev1alpha1.VNet{
Name: pointer.String(foreignName),
Name: pointer.String(foreignNameVnet),
ResourceGroup: pointer.String(foreignName),
}
identityConfig := &azurev1alpha1.IdentityConfig{
Name: foreignName,
Name: foreignNameId,
ResourceGroup: foreignName,
}
natGatewayConfig := &azurev1alpha1.NatGatewayConfig{
Expand Down

0 comments on commit 6f285b1

Please sign in to comment.