fix: r

Signed-off-by: ashing <[email protected]>

Author: ronething

test/e2e/gatewayapi/httproute.go

@@ -33,7 +33,7 @@ spec:
           value: "%s"
 `
 
-	var defautlGatewayClass = `
+	var gatewayClassYaml = `
 apiVersion: gateway.networking.k8s.io/v1
 kind: GatewayClass
 metadata:
@@ -42,7 +42,7 @@ spec:
   controllerName: %s
 `
 
-	var defautlGateway = `
+	var defaultGateway = `
 apiVersion: gateway.networking.k8s.io/v1
 kind: Gateway
 metadata:
@@ -59,7 +59,7 @@ spec:
       kind: GatewayProxy
       name: api7-proxy-config
 `
-	var defautlGatewayHTTPS = `
+	var defaultGatewayHTTPS = `
 apiVersion: gateway.networking.k8s.io/v1
 kind: Gateway
 metadata:
@@ -111,7 +111,7 @@ spec:
 
 		By("create GatewayClass")
 		gatewayClassName := fmt.Sprintf("api7-%d", time.Now().Unix())
-		err = s.CreateResourceFromStringWithNamespace(fmt.Sprintf(defautlGatewayClass, gatewayClassName, s.GetControllerName()), "")
+		err = s.CreateResourceFromStringWithNamespace(fmt.Sprintf(gatewayClassYaml, gatewayClassName, s.GetControllerName()), "")
 		Expect(err).NotTo(HaveOccurred(), "creating GatewayClass")
 		time.Sleep(5 * time.Second)
 
@@ -122,7 +122,7 @@ spec:
 		Expect(gcyaml).To(ContainSubstring("message: the gatewayclass has been accepted by the api7-ingress-controller"), "checking GatewayClass condition message")
 
 		By("create Gateway")
-		err = s.CreateResourceFromString(fmt.Sprintf(defautlGateway, gatewayClassName))
+		err = s.CreateResourceFromString(fmt.Sprintf(defaultGateway, gatewayClassName))
 		Expect(err).NotTo(HaveOccurred(), "creating Gateway")
 		time.Sleep(5 * time.Second)
 
@@ -144,7 +144,7 @@ spec:
 		createSecret(s, secretName)
 		By("create GatewayClass")
 		gatewayClassName := fmt.Sprintf("api7-%d", time.Now().Unix())
-		err = s.CreateResourceFromStringWithNamespace(fmt.Sprintf(defautlGatewayClass, gatewayClassName, s.GetControllerName()), "")
+		err = s.CreateResourceFromStringWithNamespace(fmt.Sprintf(gatewayClassYaml, gatewayClassName, s.GetControllerName()), "")
 		Expect(err).NotTo(HaveOccurred(), "creating GatewayClass")
 		time.Sleep(5 * time.Second)
 
@@ -155,7 +155,7 @@ spec:
 		Expect(gcyaml).To(ContainSubstring("message: the gatewayclass has been accepted by the api7-ingress-controller"), "checking GatewayClass condition message")
 
 		By("create Gateway")
-		err = s.CreateResourceFromString(fmt.Sprintf(defautlGatewayHTTPS, gatewayClassName))
+		err = s.CreateResourceFromString(fmt.Sprintf(defaultGatewayHTTPS, gatewayClassName))
 		Expect(err).NotTo(HaveOccurred(), "creating Gateway")
 		time.Sleep(5 * time.Second)
 
@@ -214,6 +214,7 @@ spec:
 	Context("HTTPRoute with Multiple Gateway", func() {
 		var additionalGatewayGroupID string
 		var additionalNamespace string
+		var additionalGatewayClassName string
 
 		var additionalGatewayProxyYaml = `
 apiVersion: gateway.apisix.io/v1alpha1
@@ -278,58 +279,37 @@ spec:
       port: 80
 `
 
-		var gatewayClassName string
-
 		BeforeEach(func() {
-			By("Create GatewayProxy")
-			gatewayProxy := fmt.Sprintf(gatewayProxyYaml, framework.DashboardTLSEndpoint, s.AdminKey())
-			err := s.CreateResourceFromString(gatewayProxy)
-			Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
-			time.Sleep(5 * time.Second)
-
-			By("create GatewayClass")
-			gatewayClassName = fmt.Sprintf("api7-%d", time.Now().Unix())
-			err = s.CreateResourceFromStringWithNamespace(fmt.Sprintf(defautlGatewayClass, gatewayClassName, s.GetControllerName()), "")
-			Expect(err).NotTo(HaveOccurred(), "creating GatewayClass")
-			time.Sleep(5 * time.Second)
-
-			By("check GatewayClass condition")
-			gcyaml, err := s.GetResourceYaml("GatewayClass", gatewayClassName)
-			Expect(err).NotTo(HaveOccurred(), "getting GatewayClass yaml")
-			Expect(gcyaml).To(ContainSubstring(`status: "True"`), "checking GatewayClass condition status")
-			Expect(gcyaml).To(ContainSubstring("message: the gatewayclass has been accepted by the api7-ingress-controller"), "checking GatewayClass condition message")
-
-			By("create Gateway")
-			err = s.CreateResourceFromString(fmt.Sprintf(defautlGateway, gatewayClassName))
-			Expect(err).NotTo(HaveOccurred(), "creating Gateway")
-			time.Sleep(5 * time.Second)
-
-			By("check Gateway condition")
-			gwyaml, err := s.GetResourceYaml("Gateway", "api7ee")
-			Expect(err).NotTo(HaveOccurred(), "getting Gateway yaml")
-			Expect(gwyaml).To(ContainSubstring(`status: "True"`), "checking Gateway condition status")
-			Expect(gwyaml).To(ContainSubstring("message: the gateway has been accepted by the api7-ingress-controller"), "checking Gateway condition message")
+			beforeEachHTTP()
 
 			By("Create additional gateway group")
+			var err error
 			additionalGatewayGroupID, additionalNamespace, err = s.CreateAdditionalGatewayGroup("multi-gw")
 			Expect(err).NotTo(HaveOccurred(), "creating additional gateway group")
 
-			By("Initialize dataplane client for additional gateway group")
-			err = s.InitializeDataplaneClientForGatewayGroup(additionalGatewayGroupID)
-			Expect(err).NotTo(HaveOccurred(), "initializing dataplane client")
-
 			By("Create additional GatewayProxy")
 			// Get admin key for the additional gateway group
 			resources, exists := s.GetAdditionalGatewayGroup(additionalGatewayGroupID)
 			Expect(exists).To(BeTrue(), "additional gateway group should exist")
 
+			By("Create additional GatewayClass")
+			additionalGatewayClassName = fmt.Sprintf("api7-%d", time.Now().Unix())
+			err = s.CreateResourceFromStringWithNamespace(fmt.Sprintf(gatewayClassYaml, additionalGatewayClassName, s.GetControllerName()), "")
+			Expect(err).NotTo(HaveOccurred(), "creating additional GatewayClass")
+			time.Sleep(5 * time.Second)
+			By("Check additional GatewayClass condition")
+			gcyaml, err := s.GetResourceYaml("GatewayClass", additionalGatewayClassName)
+			Expect(err).NotTo(HaveOccurred(), "getting additional GatewayClass yaml")
+			Expect(gcyaml).To(ContainSubstring(`status: "True"`), "checking additional GatewayClass condition status")
+			Expect(gcyaml).To(ContainSubstring("message: the gatewayclass has been accepted by the api7-ingress-controller"), "checking additional GatewayClass condition message")
+
 			additionalGatewayProxy := fmt.Sprintf(additionalGatewayProxyYaml, framework.DashboardTLSEndpoint, resources.AdminAPIKey)
 			err = s.CreateResourceFromStringWithNamespace(additionalGatewayProxy, additionalNamespace)
 			Expect(err).NotTo(HaveOccurred(), "creating additional GatewayProxy")
 
 			By("Create additional Gateway")
 			err = s.CreateResourceFromStringWithNamespace(
-				fmt.Sprintf(additionalGateway, gatewayClassName),
+				fmt.Sprintf(additionalGateway, additionalGatewayClassName),
 				additionalNamespace,
 			)
 			Expect(err).NotTo(HaveOccurred(), "creating additional Gateway")
@@ -359,7 +339,7 @@ spec:
 				Status(http.StatusOK)
 
 			By("Delete Additional Gateway")
-			err = s.DeleteResourceFromStringWithNamespace(fmt.Sprintf(additionalGateway, gatewayClassName), additionalNamespace)
+			err = s.DeleteResourceFromStringWithNamespace(fmt.Sprintf(additionalGateway, additionalGatewayClassName), additionalNamespace)
 			Expect(err).NotTo(HaveOccurred(), "deleting additional Gateway")
 			time.Sleep(5 * time.Second)
 

test/e2e/scaffold/scaffold.go

@@ -801,64 +801,6 @@ func (s *Scaffold) CleanupAdditionalGatewayGroup(gatewayGroupID string) error {
 	return err
 }
 
-// InitializeDataplaneClientForGatewayGroup initializes the Dashboard client for a specific Gateway group
-func (s *Scaffold) InitializeDataplaneClientForGatewayGroup(gatewayGroupID string) error {
-	resources, exists := s.additionalGatewayGroups[gatewayGroupID]
-	if !exists {
-		return fmt.Errorf("gateway group %s not found", gatewayGroupID)
-	}
-
-	// HTTP client
-	httpURL := fmt.Sprintf("http://%s/apisix/admin", resources.HttpTunnel.Endpoint())
-	clusterName := fmt.Sprintf("gateway-%s", gatewayGroupID[:8]) // Use first 8 chars of gateway group ID as identifier
-
-	err := s.apisixCli.AddCluster(context.Background(), &dashboard.ClusterOptions{
-		Name:           clusterName,
-		ControllerName: s.opts.ControllerName,
-		Labels:         map[string]string{"k8s/controller-name": s.opts.ControllerName},
-		BaseURL:        httpURL,
-		AdminKey:       resources.AdminAPIKey,
-	})
-	if err != nil {
-		return err
-	}
-
-	// HTTPS client
-	httpsURL := fmt.Sprintf("https://%s/apisix/admin", resources.HttpsTunnel.Endpoint())
-	clusterNameHTTPS := fmt.Sprintf("gateway-%s-https", gatewayGroupID[:8])
-
-	err = s.apisixCli.AddCluster(context.Background(), &dashboard.ClusterOptions{
-		Name:          clusterNameHTTPS,
-		BaseURL:       httpsURL,
-		AdminKey:      resources.AdminAPIKey,
-		SkipTLSVerify: true,
-	})
-
-	return err
-}
-
-// GetDataplaneResourceForGatewayGroup returns the dataplane resource for a specific Gateway group
-func (s *Scaffold) GetDataplaneResourceForGatewayGroup(gatewayGroupID string) (dashboard.Cluster, error) {
-	_, exists := s.additionalGatewayGroups[gatewayGroupID]
-	if !exists {
-		return nil, fmt.Errorf("gateway group %s not found", gatewayGroupID)
-	}
-
-	clusterName := fmt.Sprintf("gateway-%s", gatewayGroupID[:8])
-	return s.apisixCli.Cluster(clusterName), nil
-}
-
-// GetDataplaneResourceHTTPSForGatewayGroup returns the HTTPS dataplane resource for a specific Gateway group
-func (s *Scaffold) GetDataplaneResourceHTTPSForGatewayGroup(gatewayGroupID string) (dashboard.Cluster, error) {
-	_, exists := s.additionalGatewayGroups[gatewayGroupID]
-	if !exists {
-		return nil, fmt.Errorf("gateway group %s not found", gatewayGroupID)
-	}
-
-	clusterName := fmt.Sprintf("gateway-%s-https", gatewayGroupID[:8])
-	return s.apisixCli.Cluster(clusterName), nil
-}
-
 // GetGatewayGroupHTTPEndpoint returns the HTTP endpoint for a specific Gateway group
 func (s *Scaffold) GetGatewayGroupHTTPEndpoint(gatewayGroupID string) (string, error) {
 	resources, exists := s.additionalGatewayGroups[gatewayGroupID]