From eec18669f310896e87057afbf7a040afde2c8098 Mon Sep 17 00:00:00 2001 From: Wenqi Qiu Date: Thu, 15 Aug 2024 16:40:53 +0800 Subject: [PATCH] test subnet Signed-off-by: Wenqi Qiu --- pkg/apis/vpc/v1alpha1/subnet_types.go | 7 +++++++ pkg/apis/vpc/v1alpha1/vpcnetworkconfiguration_types.go | 7 ------- test/e2e/manifest/testSubnet/subnetset-dhcp.yaml | 1 + test/e2e/manifest/testSubnet/subnetset-static.yaml | 1 + test/e2e/nsx_subnet_test.go | 1 - 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkg/apis/vpc/v1alpha1/subnet_types.go b/pkg/apis/vpc/v1alpha1/subnet_types.go index 391ed8ae2..fc3af4d13 100644 --- a/pkg/apis/vpc/v1alpha1/subnet_types.go +++ b/pkg/apis/vpc/v1alpha1/subnet_types.go @@ -9,6 +9,13 @@ import ( type AccessMode string +const ( + AccessModePublic string = "Public" + AccessModePrivate string = "Private" + AccessModeProject string = "PrivateTGW" + AccessModeProjectInNSX string = "Private_TGW" +) + // SubnetSpec defines the desired state of Subnet. type SubnetSpec struct { // Size of Subnet based upon estimated workload count. diff --git a/pkg/apis/vpc/v1alpha1/vpcnetworkconfiguration_types.go b/pkg/apis/vpc/v1alpha1/vpcnetworkconfiguration_types.go index 6d3364f51..629f3f31d 100644 --- a/pkg/apis/vpc/v1alpha1/vpcnetworkconfiguration_types.go +++ b/pkg/apis/vpc/v1alpha1/vpcnetworkconfiguration_types.go @@ -8,13 +8,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -const ( - AccessModePublic string = "Public" - AccessModePrivate string = "Private" - AccessModeProject string = "PrivateTGW" - AccessModeProjectInNSX string = "Private_TGW" -) - // VPCNetworkConfigurationSpec defines the desired state of VPCNetworkConfiguration. // There is a default VPCNetworkConfiguration that applies to Namespaces // do not have a VPCNetworkConfiguration assigned. When a field is not set diff --git a/test/e2e/manifest/testSubnet/subnetset-dhcp.yaml b/test/e2e/manifest/testSubnet/subnetset-dhcp.yaml index cad5eb79a..7a5e12ab8 100644 --- a/test/e2e/manifest/testSubnet/subnetset-dhcp.yaml +++ b/test/e2e/manifest/testSubnet/subnetset-dhcp.yaml @@ -4,5 +4,6 @@ metadata: name: user-pod-subnetset-dhcp namespace: subnet-e2e spec: + accessMode: PrivateTGW DHCPConfig: enableDHCP: true diff --git a/test/e2e/manifest/testSubnet/subnetset-static.yaml b/test/e2e/manifest/testSubnet/subnetset-static.yaml index 9bab268fd..c1e3385ab 100644 --- a/test/e2e/manifest/testSubnet/subnetset-static.yaml +++ b/test/e2e/manifest/testSubnet/subnetset-static.yaml @@ -4,6 +4,7 @@ metadata: name: user-pod-subnetset-static namespace: subnet-e2e spec: + accessMode: Private advancedConfig: staticIPAllocation: enable: true diff --git a/test/e2e/nsx_subnet_test.go b/test/e2e/nsx_subnet_test.go index 0994bdcd2..7ac33e8f0 100644 --- a/test/e2e/nsx_subnet_test.go +++ b/test/e2e/nsx_subnet_test.go @@ -69,7 +69,6 @@ func TestSubnetSet(t *testing.T) { teardownTest(t, E2ENamespaceTarget, SubnetDeletionTimeout) }) - t.Skip("Skip test") t.Run("case=DefaultSubnetSet", defaultSubnetSet) t.Run("case=UserSubnetSet", UserSubnetSet) t.Run("case=SharedSubnetSet", sharedSubnetSet)