From 79919c3c1a98f694c705851c87b459a46b21b4d7 Mon Sep 17 00:00:00 2001 From: Arif Awate Date: Thu, 26 Sep 2024 17:01:12 +0530 Subject: [PATCH] multitenancy fix --- .../multitenancy_infrasetting_evh_test.go | 58 +++++++++++-------- .../multitenancy_infrasetting_ingress_test.go | 23 +++++--- 2 files changed, 48 insertions(+), 33 deletions(-) diff --git a/tests/multitenancytests/multitenancy_infrasetting_evh_test.go b/tests/multitenancytests/multitenancy_infrasetting_evh_test.go index 2aeb7c38c..2e2156b2b 100644 --- a/tests/multitenancytests/multitenancy_infrasetting_evh_test.go +++ b/tests/multitenancytests/multitenancy_infrasetting_evh_test.go @@ -18,9 +18,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -func tearDownTestForIngress(t *testing.T) { - integrationtest.DelSVC(t, "default", "avisvc") - integrationtest.DelEP(t, "default", "avisvc") +func tearDownTestForIngress(t *testing.T, svcName string) { + integrationtest.DelSVC(t, "default", svcName) + integrationtest.DelEP(t, "default", svcName) } func verifyEvhNodeDeletionFromVsNode(g *gomega.WithT, modelName string, parentVSKey, evhVsKey cache.NamespaceName) { @@ -66,7 +66,9 @@ func TestMultiTenancyWithNSAviInfraSettingEVH(t *testing.T) { modelName := "admin/cluster--Shared-L7-EVH-1" settingModelName := "nonadmin/cluster--Shared-L7-EVH-0" - ingresstests.SetUpTestForIngress(t, modelName) + svcName := objNameMap.GenerateName("avisvc") + + ingresstests.SetUpTestForIngress(t, svcName, modelName) vsKey := cache.NamespaceName{Namespace: "nonadmin", Name: "cluster--Shared-L7-EVH-0"} evhKey := cache.NamespaceName{Namespace: "nonadmin", Name: lib.Encode("cluster--baz.com", lib.EVHVS)} @@ -82,7 +84,7 @@ func TestMultiTenancyWithNSAviInfraSettingEVH(t *testing.T) { Namespace: ns, ClassName: ingClassName, DnsNames: []string{"baz.com", "bar.com"}, - ServiceName: "avisvc", + ServiceName: svcName, TlsSecretDNS: map[string][]string{ secretName: {"baz.com"}, }, @@ -94,8 +96,8 @@ func TestMultiTenancyWithNSAviInfraSettingEVH(t *testing.T) { secureVsName := "cluster--baz.com" insecureVsName := "cluster--bar.com" - insecurePoolName := "cluster--default-bar.com_foo-" + ingressName + "-avisvc" - securePoolName := "cluster--default-baz.com_foo-" + ingressName + "-avisvc" + insecurePoolName := "cluster--default-bar.com_foo-" + ingressName + "-" + svcName + securePoolName := "cluster--default-baz.com_foo-" + ingressName + "-" + svcName insecurePGName := "cluster--default-bar.com_foo-" + ingressName securePGName := "cluster--default-baz.com_foo-" + ingressName @@ -134,7 +136,7 @@ func TestMultiTenancyWithNSAviInfraSettingEVH(t *testing.T) { integrationtest.DeleteSecret(secretName, ns) integrationtest.RemoveAnnotateAKONamespaceWithInfraSetting(t, ns) integrationtest.TeardownAviInfraSetting(t, settingName) - tearDownTestForIngress(t) + tearDownTestForIngress(t, svcName) integrationtest.TeardownIngressClass(t, ingClassName) waitAndVerify(t, ingClassName) verifyEvhNodeDeletionFromVsNode(g, settingModelName, vsKey, evhKey) @@ -152,7 +154,9 @@ func TestMultiTenancyWithIngressClassAviInfraSettingEVH(t *testing.T) { secretName := objNameMap.GenerateName("my-secret") modelName := "admin/cluster--Shared-L7-EVH-1" - ingresstests.SetUpTestForIngress(t, modelName) + svcName := objNameMap.GenerateName("avisvc") + + ingresstests.SetUpTestForIngress(t, svcName, modelName) settingModelName := "nonadmin/cluster--Shared-L7-EVH-" + settingName + "-0" vsKey := cache.NamespaceName{Namespace: "nonadmin", Name: "cluster--Shared-L7-EVH-" + settingName + "-0"} @@ -168,7 +172,7 @@ func TestMultiTenancyWithIngressClassAviInfraSettingEVH(t *testing.T) { Namespace: ns, ClassName: ingClassName, DnsNames: []string{"baz.com", "bar.com"}, - ServiceName: "avisvc", + ServiceName: svcName, TlsSecretDNS: map[string][]string{ secretName: {"baz.com"}, }, @@ -180,8 +184,8 @@ func TestMultiTenancyWithIngressClassAviInfraSettingEVH(t *testing.T) { secureVsName := "cluster--" + settingName + "-baz.com" insecureVsName := "cluster--" + settingName + "-bar.com" - insecurePoolName := "cluster--" + settingName + "-default-bar.com_foo-" + ingressName + "-avisvc" - securePoolName := "cluster--" + settingName + "-default-baz.com_foo-" + ingressName + "-avisvc" + insecurePoolName := "cluster--" + settingName + "-default-bar.com_foo-" + ingressName + "-" + svcName + securePoolName := "cluster--" + settingName + "-default-baz.com_foo-" + ingressName + "-" + svcName insecurePGName := "cluster--" + settingName + "-default-bar.com_foo-" + ingressName securePGName := "cluster--" + settingName + "-default-baz.com_foo-" + ingressName @@ -219,7 +223,7 @@ func TestMultiTenancyWithIngressClassAviInfraSettingEVH(t *testing.T) { integrationtest.DeleteSecret(secretName, ns) integrationtest.TeardownAviInfraSetting(t, settingName) integrationtest.RemoveAnnotateAKONamespaceWithInfraSetting(t, ns) - tearDownTestForIngress(t) + tearDownTestForIngress(t, svcName) integrationtest.TeardownIngressClass(t, ingClassName) waitAndVerify(t, ingClassName) verifyEvhNodeDeletionFromVsNode(g, settingModelName, vsKey, evhKey) @@ -238,7 +242,9 @@ func TestMultiTenancyWithInfraSettingAdditionEVH(t *testing.T) { modelName := "admin/cluster--Shared-L7-EVH-1" settingModelName := "nonadmin/cluster--Shared-L7-EVH-0" - ingresstests.SetUpTestForIngress(t, modelName, settingModelName) + svcName := objNameMap.GenerateName("avisvc") + + ingresstests.SetUpTestForIngress(t, svcName, modelName, settingModelName) integrationtest.SetupIngressClass(t, ingClassName, lib.AviIngressController, "") waitAndVerify(t, ingClassName) @@ -249,7 +255,7 @@ func TestMultiTenancyWithInfraSettingAdditionEVH(t *testing.T) { Namespace: ns, ClassName: ingClassName, DnsNames: []string{"baz.com", "bar.com"}, - ServiceName: "avisvc", + ServiceName: svcName, TlsSecretDNS: map[string][]string{ secretName: {"baz.com"}, }, @@ -261,8 +267,8 @@ func TestMultiTenancyWithInfraSettingAdditionEVH(t *testing.T) { secureVsName := "cluster--baz.com" insecureVsName := "cluster--bar.com" - insecurePoolName := "cluster--default-bar.com_foo-" + ingressName + "-avisvc" - securePoolName := "cluster--default-baz.com_foo-" + ingressName + "-avisvc" + insecurePoolName := "cluster--default-bar.com_foo-" + ingressName + "-" + svcName + securePoolName := "cluster--default-baz.com_foo-" + ingressName + "-" + svcName insecurePGName := "cluster--default-bar.com_foo-" + ingressName securePGName := "cluster--default-baz.com_foo-" + ingressName @@ -339,7 +345,7 @@ func TestMultiTenancyWithInfraSettingAdditionEVH(t *testing.T) { t.Fatalf("Couldn't DELETE the Ingress %v", err) } integrationtest.DeleteSecret(secretName, ns) - tearDownTestForIngress(t) + tearDownTestForIngress(t, svcName) integrationtest.TeardownIngressClass(t, ingClassName) waitAndVerify(t, ingClassName) verifyPoolDeletionFromVsNode(g, modelName) @@ -362,7 +368,9 @@ func TestMultiTenancyWithTenantDeannotationInNSEVH(t *testing.T) { modelName := "admin/cluster--Shared-L7-EVH-1" settingModelName := "nonadmin/cluster--Shared-L7-EVH-0" - ingresstests.SetUpTestForIngress(t, modelName) + svcName := objNameMap.GenerateName("avisvc") + + ingresstests.SetUpTestForIngress(t, svcName, modelName) vsKey := cache.NamespaceName{Namespace: "nonadmin", Name: "cluster--Shared-L7-EVH-0"} evhKey := cache.NamespaceName{Namespace: "nonadmin", Name: lib.Encode("cluster--baz.com", lib.EVHVS)} @@ -378,7 +386,7 @@ func TestMultiTenancyWithTenantDeannotationInNSEVH(t *testing.T) { Namespace: ns, ClassName: ingClassName, DnsNames: []string{"baz.com", "bar.com"}, - ServiceName: "avisvc", + ServiceName: svcName, TlsSecretDNS: map[string][]string{ secretName: {"baz.com"}, }, @@ -390,8 +398,8 @@ func TestMultiTenancyWithTenantDeannotationInNSEVH(t *testing.T) { secureVsName := "cluster--baz.com" insecureVsName := "cluster--bar.com" - insecurePoolName := "cluster--default-bar.com_foo-" + ingressName + "-avisvc" - securePoolName := "cluster--default-baz.com_foo-" + ingressName + "-avisvc" + insecurePoolName := "cluster--default-bar.com_foo-" + ingressName + "-" + svcName + securePoolName := "cluster--default-baz.com_foo-" + ingressName + "-" + svcName insecurePGName := "cluster--default-bar.com_foo-" + ingressName securePGName := "cluster--default-baz.com_foo-" + ingressName @@ -435,8 +443,8 @@ func TestMultiTenancyWithTenantDeannotationInNSEVH(t *testing.T) { secureVsName = "cluster--baz.com" insecureVsName = "cluster--bar.com" - insecurePoolName = "cluster--default-bar.com_foo-" + ingressName + "-avisvc" - securePoolName = "cluster--default-baz.com_foo-" + ingressName + "-avisvc" + insecurePoolName = "cluster--default-bar.com_foo-" + ingressName + "-" + svcName + securePoolName = "cluster--default-baz.com_foo-" + ingressName + "-" + svcName insecurePGName = "cluster--default-bar.com_foo-" + ingressName securePGName = "cluster--default-baz.com_foo-" + ingressName @@ -472,7 +480,7 @@ func TestMultiTenancyWithTenantDeannotationInNSEVH(t *testing.T) { t.Fatalf("Couldn't DELETE the Ingress %v", err) } integrationtest.DeleteSecret(secretName, ns) - tearDownTestForIngress(t) + tearDownTestForIngress(t, svcName) integrationtest.TeardownIngressClass(t, ingClassName) waitAndVerify(t, ingClassName) integrationtest.TeardownAviInfraSetting(t, settingName) diff --git a/tests/multitenancytests/multitenancy_infrasetting_ingress_test.go b/tests/multitenancytests/multitenancy_infrasetting_ingress_test.go index d576607df..311887808 100644 --- a/tests/multitenancytests/multitenancy_infrasetting_ingress_test.go +++ b/tests/multitenancytests/multitenancy_infrasetting_ingress_test.go @@ -174,7 +174,9 @@ func TestMultiTenancyWithNSAviInfraSettingForIngress(t *testing.T) { secretName := objNameMap.GenerateName("my-secret") modelName := "nonadmin/cluster--Shared-L7-1" - ingresstests.SetUpTestForIngress(t, modelName) + svcName := objNameMap.GenerateName("avisvc") + + ingresstests.SetUpTestForIngress(t, svcName, modelName) settingModelName := "nonadmin/cluster--Shared-L7-0" integrationtest.SetupAviInfraSetting(t, settingName, "SMALL") @@ -189,7 +191,7 @@ func TestMultiTenancyWithNSAviInfraSettingForIngress(t *testing.T) { Namespace: ns, ClassName: ingClassName, DnsNames: []string{"baz.com", "bar.com"}, - ServiceName: "avisvc", + ServiceName: svcName, TlsSecretDNS: map[string][]string{ secretName: {"baz.com"}, }, @@ -255,7 +257,9 @@ func TestMultiTenancyWithIngressClassAviInfraSetting(t *testing.T) { modelName := "nonadmin/cluster--Shared-L7-1" nsSettingName := "ns-my-infrasetting" - ingresstests.SetUpTestForIngress(t, modelName) + svcName := objNameMap.GenerateName("avisvc") + + ingresstests.SetUpTestForIngress(t, svcName, modelName) settingModelName := "nonadmin/cluster--Shared-L7-" + settingName + "-0" integrationtest.SetupAviInfraSetting(t, settingName, "SMALL") @@ -272,7 +276,7 @@ func TestMultiTenancyWithIngressClassAviInfraSetting(t *testing.T) { Namespace: ns, ClassName: ingClassName, DnsNames: []string{"baz.com", "bar.com"}, - ServiceName: "avisvc", + ServiceName: svcName, TlsSecretDNS: map[string][]string{ secretName: {"baz.com"}, }, @@ -335,7 +339,9 @@ func TestMultiTenancyWithInfraSettingAdditionForIngress(t *testing.T) { secretName := objNameMap.GenerateName("my-secret") modelName := "admin/cluster--Shared-L7-1" - ingresstests.SetUpTestForIngress(t, modelName) + svcName := objNameMap.GenerateName("avisvc") + + ingresstests.SetUpTestForIngress(t, svcName, modelName) integrationtest.SetupIngressClass(t, ingClassName, lib.AviIngressController, "") waitAndVerify(t, ingClassName) @@ -346,7 +352,7 @@ func TestMultiTenancyWithInfraSettingAdditionForIngress(t *testing.T) { Namespace: ns, ClassName: ingClassName, DnsNames: []string{"baz.com", "bar.com"}, - ServiceName: "avisvc", + ServiceName: svcName, TlsSecretDNS: map[string][]string{ secretName: {"baz.com"}, }, @@ -448,8 +454,9 @@ func TestMultiTenancyWithTenantDeannotationInNSForIngress(t *testing.T) { settingName := objNameMap.GenerateName("my-infrasetting") secretName := objNameMap.GenerateName("my-secret") modelName := "nonadmin/cluster--Shared-L7-1" + svcName := objNameMap.GenerateName("avisvc") - ingresstests.SetUpTestForIngress(t, modelName) + ingresstests.SetUpTestForIngress(t, svcName, modelName) settingModelName := "nonadmin/cluster--Shared-L7-0" integrationtest.SetupAviInfraSetting(t, settingName, "SMALL") @@ -464,7 +471,7 @@ func TestMultiTenancyWithTenantDeannotationInNSForIngress(t *testing.T) { Namespace: ns, ClassName: ingClassName, DnsNames: []string{"baz.com", "bar.com"}, - ServiceName: "avisvc", + ServiceName: svcName, TlsSecretDNS: map[string][]string{ secretName: {"baz.com"}, },