diff --git a/pkg/controller/infrastructure/infraflow/ensurer.go b/pkg/controller/infrastructure/infraflow/ensurer.go index 132dfb457..7a6843f43 100644 --- a/pkg/controller/infrastructure/infraflow/ensurer.go +++ b/pkg/controller/infrastructure/infraflow/ensurer.go @@ -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, }, diff --git a/test/integration/infrastructure/infrastructure_test.go b/test/integration/infrastructure/infrastructure_test.go index a689e8401..d8e9d687f 100644 --- a/test/integration/infrastructure/infrastructure_test.go +++ b/test/integration/infrastructure/infrastructure_test.go @@ -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() { @@ -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) @@ -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() { @@ -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{ @@ -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() { @@ -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{