From cd7ccc171642f38d5576336d4f35f2e45677f29c Mon Sep 17 00:00:00 2001 From: Matthew Long <61910737+thatmattlong@users.noreply.github.com> Date: Fri, 6 Aug 2021 14:23:59 -0700 Subject: [PATCH 1/2] fix: broken multitenant crd unit test --- .../multitenantcrdreconciler_test.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/cns/multitenantcontroller/multitenantoperator/multitenantcrdreconciler_test.go b/cns/multitenantcontroller/multitenantoperator/multitenantcrdreconciler_test.go index b71fe02763..49fa26b060 100644 --- a/cns/multitenantcontroller/multitenantoperator/multitenantcrdreconciler_test.go +++ b/cns/multitenantcontroller/multitenantoperator/multitenantcrdreconciler_test.go @@ -115,6 +115,10 @@ var _ = Describe("multiTenantCrdReconciler", func() { }, Status: ncapi.MultiTenantNetworkContainerStatus{ State: "Initialized", + MultiTenantInfo: ncapi.MultiTenantInfo{ + EncapType: "Vlan", + ID: 1, + }, }, } @@ -145,6 +149,10 @@ var _ = Describe("multiTenantCrdReconciler", func() { Status: ncapi.MultiTenantNetworkContainerStatus{ State: "Initialized", IPSubnet: "1.2.3.4.5", + MultiTenantInfo: ncapi.MultiTenantInfo{ + EncapType: "Vlan", + ID: 1, + }, }, } @@ -176,6 +184,10 @@ var _ = Describe("multiTenantCrdReconciler", func() { Status: ncapi.MultiTenantNetworkContainerStatus{ State: "Initialized", IPSubnet: "1.2.3.0/24", + MultiTenantInfo: ncapi.MultiTenantInfo{ + EncapType: "Vlan", + ID: 1, + }, }, } From aba7ef60179a2ccab3e44baff30ba60cb464eac3 Mon Sep 17 00:00:00 2001 From: Matthew Long <61910737+thatmattlong@users.noreply.github.com> Date: Fri, 6 Aug 2021 15:16:08 -0700 Subject: [PATCH 2/2] fix: failing test --- .../multitenantoperator/multitenantcrdreconciler_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cns/multitenantcontroller/multitenantoperator/multitenantcrdreconciler_test.go b/cns/multitenantcontroller/multitenantoperator/multitenantcrdreconciler_test.go index 49fa26b060..cfb499ee4d 100644 --- a/cns/multitenantcontroller/multitenantoperator/multitenantcrdreconciler_test.go +++ b/cns/multitenantcontroller/multitenantoperator/multitenantcrdreconciler_test.go @@ -208,6 +208,10 @@ var _ = Describe("multiTenantCrdReconciler", func() { }, GatewayIPAddress: nc.Status.Gateway, }, + MultiTenancyInfo: cns.MultiTenancyInfo{ + EncapType: "Vlan", + ID: 1, + }, } kubeClient.EXPECT().Get(gomock.Any(), namespacedName, gomock.Any()).SetArg(2, nc)