Add e2e test for IPBlocksInfo (#983) (#999)

Signed-off-by: Yanjun Zhou <[email protected]>
vmware-tanzu · Jan 14, 2025 · a4c4291 · a4c4291
1 parent f2caf19
commit a4c4291
Show file tree

Hide file tree

Showing 11 changed files with 200 additions and 86 deletions.
diff --git a/pkg/apis/vpc/v1alpha1/ipblocksinfo_types.go b/pkg/apis/vpc/v1alpha1/ipblocksinfo_types.go
@@ -8,6 +8,7 @@ import (
 )
 
 // +genclient
+// +genclient:nonNamespaced
 //+kubebuilder:object:root=true
 //+kubebuilder:resource:scope="Cluster",path=ipblocksinfos
 

diff --git a/pkg/client/clientset/versioned/typed/vpc/v1alpha1/fake/fake_ipblocksinfo.go b/pkg/client/clientset/versioned/typed/vpc/v1alpha1/fake/fake_ipblocksinfo.go
diff --git a/pkg/client/clientset/versioned/typed/vpc/v1alpha1/fake/fake_vpc_client.go b/pkg/client/clientset/versioned/typed/vpc/v1alpha1/fake/fake_vpc_client.go
diff --git a/pkg/client/clientset/versioned/typed/vpc/v1alpha1/ipblocksinfo.go b/pkg/client/clientset/versioned/typed/vpc/v1alpha1/ipblocksinfo.go
diff --git a/pkg/client/clientset/versioned/typed/vpc/v1alpha1/vpc_client.go b/pkg/client/clientset/versioned/typed/vpc/v1alpha1/vpc_client.go
diff --git a/pkg/client/informers/externalversions/vpc/v1alpha1/interface.go b/pkg/client/informers/externalversions/vpc/v1alpha1/interface.go
diff --git a/pkg/client/informers/externalversions/vpc/v1alpha1/ipblocksinfo.go b/pkg/client/informers/externalversions/vpc/v1alpha1/ipblocksinfo.go
diff --git a/pkg/client/listers/vpc/v1alpha1/expansion_generated.go b/pkg/client/listers/vpc/v1alpha1/expansion_generated.go
diff --git a/pkg/client/listers/vpc/v1alpha1/ipblocksinfo.go b/pkg/client/listers/vpc/v1alpha1/ipblocksinfo.go
diff --git a/test/e2e/framework.go b/test/e2e/framework.go
@@ -643,15 +643,12 @@ func deleteYAML(filename string, ns string) error {
 // tags should be present in pairs, the first tag is the scope, the second tag is the value
 // caller should transform the response to the expected resource type
 func (data *TestData) queryResource(resourceType string, tags []string) (model.SearchResponse, error) {
-	tagScopeClusterKey := strings.Replace(common.TagScopeNamespace, "/", "\\/", -1)
-	tagScopeClusterValue := strings.Replace(tags[0], ":", "\\:", -1)
-	tagParam := fmt.Sprintf("tags.scope:%s AND tags.tag:%s", tagScopeClusterKey, tagScopeClusterValue)
 	resourceParam := fmt.Sprintf("%s:%s", common.ResourceType, resourceType)
-	queryParam := resourceParam + " AND " + tagParam
+	queryParam := resourceParam
 	if len(tags) >= 2 {
 		tagscope := strings.Replace(tags[0], "/", "\\/", -1)
 		tagtag := strings.Replace(tags[1], ":", "\\:", -1)
-		tagParam = fmt.Sprintf("tags.scope:%s AND tags.tag:%s", tagscope, tagtag)
+		tagParam := fmt.Sprintf("tags.scope:%s AND tags.tag:%s", tagscope, tagtag)
 		queryParam = resourceParam + " AND " + tagParam
 	}
 	queryParam += " AND marked_for_delete:false"