test: support apisix standalone (part 2)

test/e2e/apisix/basic.go

@@ -34,5 +34,19 @@ var _ = Describe("APISIX Standalone Basic Tests", func() {
 				Expect().
 				Status(404).Body().Contains("404 Route Not Found")
 		})
+
+		It("should handle basic HTTP requests with additional gateway", func() {
+			additionalGatewayID, _, err := s.Deployer.CreateAdditionalGateway("additional-gw")
+			Expect(err).NotTo(HaveOccurred())
+
+			httpClient, err := s.NewAPISIXClientForGateway(additionalGatewayID)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(httpClient).NotTo(BeNil())
+
+			httpClient.GET("/anything").
+				Expect().
+				Status(404).Body().Contains("404 Route Not Found")
+		})
+
 	})
 })

test/e2e/crds/consumer.go

@@ -476,13 +476,13 @@ spec:
 
 			By("create additional gateway group to get new admin key")
 			var err error
-			additionalGatewayGroupID, _, err = s.CreateAdditionalGatewayGroup("gateway-proxy-update")
+			additionalGatewayGroupID, _, err = s.Deployer.CreateAdditionalGateway("gateway-proxy-update")
 			Expect(err).NotTo(HaveOccurred(), "creating additional gateway group")
 
-			resources, exists := s.GetAdditionalGatewayGroup(additionalGatewayGroupID)
+			resources, exists := s.GetAdditionalGateway(additionalGatewayGroupID)
 			Expect(exists).To(BeTrue(), "additional gateway group should exist")
 
-			client, err := s.NewAPISIXClientForGatewayGroup(additionalGatewayGroupID)
+			client, err := s.NewAPISIXClientForGateway(additionalGatewayGroupID)
 			Expect(err).NotTo(HaveOccurred(), "creating APISIX client for additional gateway group")
 
 			By("Consumer not found for additional gateway group")

test/e2e/framework/api7_consts.go

@@ -38,161 +38,6 @@ var (
 	TestServerKey string
 )
 
-const (
-	TestCACert = `-----BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIUBB5PHXyymeboPDVdYeYihYnm5XIwDQYJKoZIhvcNAQEL
-BQAwXTELMAkGA1UEBhMCQ04xDjAMBgNVBAgMBVN0YXRlMQ0wCwYDVQQHDARDaXR5
-MRUwEwYDVQQKDAxPcmdhbml6YXRpb24xGDAWBgNVBAMMD3d3dy5leGFtcGxlLmNv
-bTAeFw0yNDA2MjYxNTQ5NTBaFw0zNDA2MjQxNTQ5NTBaMF0xCzAJBgNVBAYTAkNO
-MQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UECgwMT3JnYW5p
-emF0aW9uMRgwFgYDVQQDDA93d3cuZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCutPQZr71VAdVvLd65agMsj9xD46jdZxWzP1unfv34
-6VFhCFPJp39TuBkwcXmSEmSzCcQXyCvWhRV+PErr+N4dadUpoci2E/CcKAlOisxz
-OaPz52yS+h5kf8wpVS3Tk9JHONZp6P3HLY2yeUtRl/Bw3Fyo7nIJCtwx5jJ2cFgE
-dvqfruiZYTSU5vxvS2QDXvX0gcOuR4uP+RRBcwlY+oD+G0pP4vsUcLpCQpD58p1c
-RSLwoX6dPb3eohCXufCnskIwiIxC3jQcVrI1gOggJkZuGXNRh0aS5O7L0iu37l57
-UStFB4kjbnCWterNz/NRRhD2Ad8RTALnJMeGKb7uH9OzAgMBAAGjLzAtMAwGA1Ud
-EwQFMAMBAf8wHQYDVR0OBBYEFH78Ns0zkjTuK1EhiLMNYnXUZatxMA0GCSqGSIb3
-DQEBCwUAA4IBAQCVhAzUb32Qyjn5oZHsDYKaQIHfXe+/W2oM41dDTSxjFlbvBjaq
-JWxgAYBA5l28b+e9zUK2BTcSNzVbrfm5/qoykAQNaR4Vvhy3LxFyOd6G87as3+hv
-jlerjSa/gh8XCPFzs2t6wyhZqEgcNZBK6oagnaxKstoS2jXjAL+7dx4PRBdw7MTq
-joQ+TzLgsB9kFMnihmR+LpDFfQCqAfp5X0z9RLgnH0zVcBrRXKKb8AaOWBdkdK6g
-BLIW7+4ZxW5BzYmi6ZuDDjP96wLpWT7boJPi3BqnCEQIzywNMBbqZO9LiWdGf0TH
-EpkzMRsCTGGar43HkQgDZdjicRKiuWYFO47O
------END CERTIFICATE-----`
-
-	TestCAKey = `-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCutPQZr71VAdVv
-Ld65agMsj9xD46jdZxWzP1unfv346VFhCFPJp39TuBkwcXmSEmSzCcQXyCvWhRV+
-PErr+N4dadUpoci2E/CcKAlOisxzOaPz52yS+h5kf8wpVS3Tk9JHONZp6P3HLY2y
-eUtRl/Bw3Fyo7nIJCtwx5jJ2cFgEdvqfruiZYTSU5vxvS2QDXvX0gcOuR4uP+RRB
-cwlY+oD+G0pP4vsUcLpCQpD58p1cRSLwoX6dPb3eohCXufCnskIwiIxC3jQcVrI1
-gOggJkZuGXNRh0aS5O7L0iu37l57UStFB4kjbnCWterNz/NRRhD2Ad8RTALnJMeG
-Kb7uH9OzAgMBAAECggEAQb6h73qlZrSCc8zQuHivChl3G+sz1GGjFmm83YraG03+
-DGRcV5IbRc+NVyAUzkXytDd0Hjj7WkaJwJAC58snFu2JRJn31KErVjBw1ChCaQgj
-bTlFMAhE4LABDfrafHjv1FKMyZ1exxIa9TNVBzcEygv7KK1Wp5V5KKQGkHCVhtP5
-PDqKwyiUqFpsM7Codr8TmavHykSfVRhxPifDNXMDMXsSUT/2dFj0QXljA3tjzk6d
-UHzx4z44cODbjWE74ZeQw2SFslKHgK0ZVYivE6+f3L/p7fSqq7hJ6T0BXpKolbHZ
-yU7Xh6BBy0WKqACkUWALZ6tglcb+KoTqhZ/fTZW6mQKBgQDr6ivPmQI4deIbWGyi
-EGfzrLfiVEuqCsz5gX88nvBRoGevKi7kCbIf/IoNGIm5SJ8gJDs6eSPKFwAEd29H
-N2muFXmune8g7lVZjQ8GPGUu4IvJMS7OAcbLmpI4pUaVGtJsh2fmXnaTSR5D5y64
-XtPGdkluLr/B5vz/X0D0NG80GQKBgQC9lL04p1D6kJj+JwyNm7bZ1OhgpH5Pup82
-Ia+5GH8m7VLS4/PrpllOmhgccaCJK7M36EXLELHRHpmOoLzUiemgtnoQ0JMmeWfN
-pVigWdIsCMSS1wJLNklr17eDDgvdcs0W3cujja4/2LlksNY8/zh7LJ/k/YUTnlkG
-VsSeLfEfqwKBgQCNinmunAaRCWkXLv4+XcmAkWfiCuE6rDA+oktMe6+DydFrbsuj
-VY3hUwsgwFAhMkkGZ7aBZpzqatI/28iP2dc18vyGn4sRHu1mRRN2klXCwkYb9741
-KyuyjJKeGcs3Olh1dOgJdzN9OqlF5DZLt9kngWCdEr9J/uRb8zJtUehGQQKBgEuD
-yM+dThNQr7Bk64oooXApb5q3Sx0FEFAmoPFQwa1G0Tvx0wJl06MMnFgQJssc3hmB
-6vMVJk9PKgl3G2BpwubiaMLz4flsWJ3ApAnTXXVu1KZNALvm1t4fIhkQ6kb+aJUY
-KfpvAB6sfESQb/YCD4R45QP4vB5xb7Kns0/yqt5bAoGAQ0kPRvAbdmBURLscsOpN
-f4sdXsJLqxAppIqrYolUVqIQPAFYT7oWLpSMmIqzjFzRFBj3ZUf3fZCNCi2kkRvs
-60VyICYZobrnbcbkCx7qydIuhr2+8301lcginh8DIN58c0IZmoIRv/Z44SPfl1ku
-zDGD28KCK1oiIZOe9sgcgf4=
------END PRIVATE KEY-----`
-
-	TESTCert1 = `-----BEGIN CERTIFICATE-----
-MIIDxDCCAqygAwIBAgIUO1cgq5OMm6h5eb5U+r3DftaM7e0wDQYJKoZIhvcNAQEL
-BQAwXTELMAkGA1UEBhMCQ04xDjAMBgNVBAgMBVN0YXRlMQ0wCwYDVQQHDARDaXR5
-MRUwEwYDVQQKDAxPcmdhbml6YXRpb24xGDAWBgNVBAMMD3d3dy5leGFtcGxlLmNv
-bTAeFw0yNDA2MjYxNzA4MzFaFw0yODExMTIxNzA4MzFaMGAxCzAJBgNVBAYTAkNO
-MQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UECgwMT3JnYW5p
-emF0aW9uMRswGQYDVQQDDBJzZXJ2ZXIuZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC+nRQiu87exjwtnTb1+dBFdMffucW84qPZ3TZY
-e3beLJkIjM2eeptzEVf5eFAxo9lXpi9DKJQopI9aRc3SvyWRg9bj8wm88UdA/2LO
-8q1oRaDzKHlMfSVqjdZ8qTalbd4FzhUWw9TWKGQxhA5yypisuQjOrVDC6bvk3WMk
-BoD+2zil+q05nRjUSCbGkKO0HecXt2M2jq1nyN68J5ymtmooUbSM7TAC+ymBggJc
-JsgJ3DrquMNqQykjsSotVaz+y857DedzJoMoMgIvJy1cNexpY6e/PK2oO9OB+OTg
-Rq/XtC/wQ5ZJ0/rY1q1yU8t5JmlVkrV6RPUT5SuoVeA8Fdu7AgMBAAGjeTB3MDUG
-A1UdEQQuMCyCEnNlcnZlci5leGFtcGxlLmNvbYIWd3d3LnNlcnZlci5leGFtcGxl
-LmNvbTAdBgNVHQ4EFgQUZ3hBoewum8wvVnSPLiaAI1S22cwwHwYDVR0jBBgwFoAU
-fvw2zTOSNO4rUSGIsw1iddRlq3EwDQYJKoZIhvcNAQELBQADggEBAC2LQ/nLc1PP
-ioPeqxKwF094yrifdhZGCmCSFpsnPbxhgxTRKSSMe7+XPadS4xd4VeRkbmuyDuUg
-kYCAr3eTpSKfc3cTHP4S/+DDPefUn8u5lbPEE1Aq2JMNubXwCUMy+hNgX7dHWzBW
-sqR+GErLzGGsfkTWhIxwH8Vx/hhKS/Kv5EEvZ42HrvL3570/04zq1tUYPlqPoQBc
-t+6M2fJQx6lYdVjtYssm/6MnjNIM59NmmmwwrLZZyB96kDAW8xFndzcJQv4uojdb
-UjWkMt/J7i6TWZY9DrSmAwCo2ZDCUZT5vQUkmILc9st/ie8v3755lJxoAOIyxEmi
-Z+TO4JGixxQ=
------END CERTIFICATE-----`
-	TestKey1 = `-----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC+nRQiu87exjwt
-nTb1+dBFdMffucW84qPZ3TZYe3beLJkIjM2eeptzEVf5eFAxo9lXpi9DKJQopI9a
-Rc3SvyWRg9bj8wm88UdA/2LO8q1oRaDzKHlMfSVqjdZ8qTalbd4FzhUWw9TWKGQx
-hA5yypisuQjOrVDC6bvk3WMkBoD+2zil+q05nRjUSCbGkKO0HecXt2M2jq1nyN68
-J5ymtmooUbSM7TAC+ymBggJcJsgJ3DrquMNqQykjsSotVaz+y857DedzJoMoMgIv
-Jy1cNexpY6e/PK2oO9OB+OTgRq/XtC/wQ5ZJ0/rY1q1yU8t5JmlVkrV6RPUT5Suo
-VeA8Fdu7AgMBAAECggEASdlzxq06zebBw+5oL86UmYRQN+ayrKamUq848fkLqbJf
-rAdZVrAr793lVrr9Xu4bM7EoGH3tQP3YqGHpB2CVPpZ0uCYePLzCHXWUo5c0BfUM
-EYk5zZ+i0nCXi/7HNDqnzVn1o7dFi59kiiaermy90BV0Sxas9oc2C8qWMYvviE1d
-GS0/Prmma+H0gZDTiQTrQsR++HmSQ3jvu9LYvVx4AkNveYNbPgF1o52PgEryTH2Y
-4tvHuyp7KpjSSNKoRuXw25OpVLsPXaxDFnSoe8YK6ltIA4kG6f7G7JbufKdaiCbY
-c4d6co5xTJa77NMGzY3j55gTFU3mfhMC9QvrvcVycQKBgQDv7LvV2LNf6ixlBWXO
-t3TAEOMM2x6awmDDPDU8i1uIhHHA7ZqsHREIC33Sily+1NwOm/iuLWTlHv0+4cww
-y75Xvl8e2mDPtkoT8wNeHdKXTp4CLzrIvEHzG0qf063ob0hP24ymqy+PgO/WW8Pl
-K/iWTpTzc9UKUuhiNPzp2XIMYwKBgQDLYotPuKkQHwGrhI8mZKKTcefzN9Ton2Kw
-7qJ3qDPrbDS0yjbU5+TKaNjKlZ+fsPQkHb5aWkGK+hYU6x7X8V/MZrc5MSwtNjPI
-QfhTPKsxNSAPqRoTwP+QVXECQhCdjRZCpE6+4aaB/31VbIjTWdhxUyc6zrPLDimX
-p0hhEcH2yQKBgAnBna3HfxvSYPXGr2oliajZxvHZ4ze12ct2ok+Q9yro/9sxjk2b
-bPrfxMEQAU99RmmNrCIhFG5AwVmSQwRk9JuK0UFm7fLkXcTL6AImwk6G0uQR2Zka
-FrB1FqbDK9o81DrzGZgZc/io7JfR6XhjPluWXHY96pbd4jdEIli8D+gzAoGAAn0o
-O0eFOh9HA/RRVCTzIF7Ked17C4W3zXZ+Iny6de0TEAtRdHWKBTgXPxNpqqidtDtw
-8uYb2zmIP6VI8VeQ1o2DPH3vjnYVWCQGh+48IhQGWmq1WPyJpBiHk4F/do4dcZ9V
-H1zfjsOzovH7EqsMzQY5eqzA4oE/3Q09A4MWHpECgYAU3uxxs5g7QwdK01BPXznk
-H1y7bdn2LYS5otllOgAfZRX6BUQNFE8RtwA4HNe764SSEkk7EtTckx0d7ar8V1V2
-pfxfd8A0pNI54NtnFk8OS0BVkW5SGoBCWRh2nlV1r0B/7np0X61GgE95JDMslRn0
-0AOPIR/qFJ1YYT0a7yKyjQ==
------END PRIVATE KEY-----`
-
-	TESTCert2 = `-----BEGIN CERTIFICATE-----
-MIIDRDCCAiwCFDtXIKuTjJuoeXm+VPq9w37WjO3rMA0GCSqGSIb3DQEBCwUAMF0x
-CzAJBgNVBAYTAkNOMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMG
-A1UECgwMT3JnYW5pemF0aW9uMRgwFgYDVQQDDA93d3cuZXhhbXBsZS5jb20wHhcN
-MjQwNjI2MTcwNTM1WhcNMjgxMTEyMTcwNTM1WjBgMQswCQYDVQQGEwJDTjEOMAwG
-A1UECAwFU3RhdGUxDTALBgNVBAcMBENpdHkxFTATBgNVBAoMDE9yZ2FuaXphdGlv
-bjEbMBkGA1UEAwwSY2xpZW50LmV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAihDdGYkyQUHVPCAVho2bJFIYMkCALqNbBoLcuQ4UsCzr
-rOZlff5CgPEwNshyH2k7jUp0D6i4PArN/y70BxhU6R/I2eKUhhlPdFxtNiEae9jn
-/ndOA7eb4WB9eFSHkqncMjc6X4/Fe9x5E2uaIv17atvyQwuT6yL3SOmGRp6LowgC
-4IhDwHLGdVEmOGlkbTaXw6Vbpv9ckjObNJ4/IRhIiifdK4NJSJIIaE/Im3SuciFP
-6mRIZKPeSrmKaVrpb9ElTx6NcFxAy0OKZQ3I2wnxNkIq0y3HSgkVFNKRdeHq/JQu
-+mOad2TAts/YuhY/jwmEz00eUVHZmAmBk33K5o6cjwIDAQABMA0GCSqGSIb3DQEB
-CwUAA4IBAQATI/7xbZyGqMT4jqCiWgpj8z5FxPQ7mYyh8AIvmar6tIt1EoRDC9gk
-1uAaFMYfdpQpfdM2/0B1aFl7cDArEyOCumlDJmmyURkacqzw0a23ELJnthg40VsN
-Zvg9n+z8jcj+dLKCZJuebp978XRKucZaaxI4Z4h7OzKhiJbUpwQUxM4sPuazLPDL
-I6BwMatU7saBQM7SVMZJcGsc0XPJXmh292HL6ZqWf/qPWmJklXAldB3rxY8CTxx7
-ucWSym43eXOgsTtgH8xHiRLWpMVjFzl1AZxgl9iCAXXh2s4QjP778VCX7QQFPvsR
-0iZCSG0R5BbpDa0NKV5SklBIj8NdMLrA
------END CERTIFICATE-----`
-
-	TestKey2 = `-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCKEN0ZiTJBQdU8
-IBWGjZskUhgyQIAuo1sGgty5DhSwLOus5mV9/kKA8TA2yHIfaTuNSnQPqLg8Cs3/
-LvQHGFTpH8jZ4pSGGU90XG02IRp72Of+d04Dt5vhYH14VIeSqdwyNzpfj8V73HkT
-a5oi/Xtq2/JDC5PrIvdI6YZGnoujCALgiEPAcsZ1USY4aWRtNpfDpVum/1ySM5s0
-nj8hGEiKJ90rg0lIkghoT8ibdK5yIU/qZEhko95KuYppWulv0SVPHo1wXEDLQ4pl
-DcjbCfE2QirTLcdKCRUU0pF14er8lC76Y5p3ZMC2z9i6Fj+PCYTPTR5RUdmYCYGT
-fcrmjpyPAgMBAAECggEALMvr8S0isSm7FhcS5OVtQQuh7iwfawJ1tlcfZqu66q6o
-iSD4LTkiOtQG4L+Ix8hNGjreDXag0FpxHCsP4n1yj3FQqeFqb1gm/4o9pSJ4hVaL
-b3UmSu54FVhJXZGPq3aRi3l/5yGu4dFXN4XiLRgxwyo6IKbRB6oAsheTCbbHd83X
-kjAMHC+85D4k94oQ2pxTlzz3rRTAPnnVd+A1zZP54pIOtdMWncOBBVtOsaFiLl5o
-gHryvLW3i1GUQJAsaPFhGrIleiG/gCSaHNcN33Ky9mnjm8/LlEuJQPxR/gOPlTtJ
-raEWD6XsUkg8KgBNERFSA0G51k7XunkNVN0mf11YAQKBgQDB7uhpZTYlhcrhkOUt
-6D80iW7zsyhLL26xrc0eHd39yJmGBanoLAe58utR3nZrSLrc2ygb73183VBOAFFL
-/VBX2vn3b7hvJfyxpsfqIeIoCmDBUZfZbHRy4z7APXdieUVeseiDjqfDpshwrZ6P
-65IgZXlOGxV6AZB+MMaC/Xr7zwKBgQC2QLO2xBNMIdwRij+6zBRNnECg2Uz8vGle
-C3fHRodx+RTHKUt08RPbKVlvdJCcvF3kJPXTkJf6jXhEFuzzP60tnw8zztr8lBVp
-Mgbx6FeHLwAclGwKUzB/XscFGuCkVnzdRjt6fOp/LdTDtjavnz9+XOBedz0q44OD
-gcuP/prDQQKBgEj48JLX9qvf0BtYPiQsA7xtCkbA3ySLUIei8k+mxWU9GieH8gre
-pnmdolZH8x8jWszH2ivIzdsyG4l+LRj+1EB6sRwd+bQ5AwCF1SuQXFzcqtOTNCQn
-3xlr0KzddBKltyiOoQL/prjEBSAA9G0LIwz1odN19XrXI9uX1tprLt+ZAoGBAIfH
-MlxSPbI1c5eZsJsA2YtsgnWTDpkn4TQQRR8wO0487C7oY+/ufwWDC79OT0KFz0le
-A8qnaaJfbR8FGWirouBfJNtLG7iatkzV2Xi1ySfMaz/fj5Itoe7ydEEoYf3s9T+A
-yGUb1TQEuANKp/k1If+JQBsAqJBgSaVauIZBf5lBAoGBALew21wK6TvLOxXGRShr
-uQTHPT5zwebLvFSoc+7fmdoCuGI04OyGUrJR/uCqXMyyP3xFk7FmkjyavpQc9c+R
-+tO3iJEqGvyWC24Bzpy5z9NhdapkXKdju6vmftgBn8SOLOMH9am+EAhwKqfwyNIn
-jLSA1vUeTvzS6lIWMGpWq2+q
------END PRIVATE KEY-----`
-)
-
 const (
 	TestCert = `-----BEGIN CERTIFICATE-----
 MIIC1TCCAb2gAwIBAgIJANm/NDY0xwZUMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV

test/e2e/framework/api7_dashboard.go

@@ -404,11 +404,11 @@ func (f *Framework) setDpManagerEndpoints() {
 }
 
 func (f *Framework) GetDashboardEndpoint() string {
-	return f.dashboardHTTPTunnel.Endpoint()
+	return _dashboardHTTPTunnel.Endpoint()
 }
 
 func (f *Framework) GetDashboardEndpointHTTPS() string {
-	return f.dashboardHTTPSTunnel.Endpoint()
+	return _dashboardHTTPSTunnel.Endpoint()
 }
 
 func (f *Framework) DashboardHTTPClient() *httpexpect.Expect {

test/e2e/framework/api7_framework.go

@@ -66,7 +66,7 @@ func (f *Framework) BeforeSuite() {
 
 	time.Sleep(1 * time.Minute)
 	err := f.newDashboardTunnel()
-	f.Logf("Dashboard HTTP Tunnel:" + f.dashboardHTTPTunnel.Endpoint())
+	f.Logf("Dashboard HTTP Tunnel:" + _dashboardHTTPTunnel.Endpoint())
 	Expect(err).ShouldNot(HaveOccurred(), "creating dashboard tunnel")
 
 	f.UploadLicense()
@@ -84,15 +84,6 @@ func (f *Framework) DeployComponents() {
 	f.initDashboard()
 }
 
-func (f *Framework) shutdownDashboardTunnel() {
-	if f.dashboardHTTPTunnel != nil {
-		f.dashboardHTTPTunnel.Close()
-	}
-	if f.dashboardHTTPSTunnel != nil {
-		f.dashboardHTTPSTunnel.Close()
-	}
-}
-
 func (f *Framework) UploadLicense() {
 	payload := map[string]any{"data": API7EELicense}
 	payloadBytes, err := json.Marshal(payload)
@@ -169,6 +160,11 @@ func (f *Framework) initDashboard() {
 	time.Sleep(5 * time.Second)
 }
 
+var (
+	_dashboardHTTPTunnel  *k8s.Tunnel
+	_dashboardHTTPSTunnel *k8s.Tunnel
+)
+
 func (f *Framework) newDashboardTunnel() error {
 	var (
 		httpNodePort  int
@@ -190,17 +186,26 @@ func (f *Framework) newDashboardTunnel() error {
 		}
 	}
 
-	f.dashboardHTTPTunnel = k8s.NewTunnel(f.kubectlOpts, k8s.ResourceTypeService, "api7ee3-dashboard",
+	_dashboardHTTPTunnel = k8s.NewTunnel(f.kubectlOpts, k8s.ResourceTypeService, "api7ee3-dashboard",
 		httpNodePort, httpPort)
-	f.dashboardHTTPSTunnel = k8s.NewTunnel(f.kubectlOpts, k8s.ResourceTypeService, "api7ee3-dashboard",
+	_dashboardHTTPSTunnel = k8s.NewTunnel(f.kubectlOpts, k8s.ResourceTypeService, "api7ee3-dashboard",
 		httpsNodePort, httpsPort)
 
-	if err := f.dashboardHTTPTunnel.ForwardPortE(f.GinkgoT); err != nil {
+	if err := _dashboardHTTPTunnel.ForwardPortE(f.GinkgoT); err != nil {
 		return err
 	}
-	if err := f.dashboardHTTPSTunnel.ForwardPortE(f.GinkgoT); err != nil {
+	if err := _dashboardHTTPSTunnel.ForwardPortE(f.GinkgoT); err != nil {
 		return err
 	}
 
 	return nil
 }
+
+func (f *Framework) shutdownDashboardTunnel() {
+	if _dashboardHTTPTunnel != nil {
+		_dashboardHTTPTunnel.Close()
+	}
+	if _dashboardHTTPSTunnel != nil {
+		_dashboardHTTPSTunnel.Close()
+	}
+}

test/e2e/framework/framework.go

@@ -53,10 +53,6 @@ type Framework struct {
 	clientset   *kubernetes.Clientset
 	restConfig  *rest.Config
 	K8sClient   client.Client
-
-	// TODO: remove these tunnels
-	dashboardHTTPTunnel  *k8s.Tunnel
-	dashboardHTTPSTunnel *k8s.Tunnel
 }
 
 // NewFramework create a global framework with special settings.

test/e2e/gatewayapi/httproute.go

@@ -303,12 +303,12 @@ spec:
 
 			By("Create additional gateway group")
 			var err error
-			additionalGatewayGroupID, additionalNamespace, err = s.CreateAdditionalGatewayGroup("multi-gw")
+			additionalGatewayGroupID, additionalNamespace, err = s.Deployer.CreateAdditionalGateway("multi-gw")
 			Expect(err).NotTo(HaveOccurred(), "creating additional gateway group")
 
 			By("Create additional GatewayProxy")
 			// Get admin key for the additional gateway group
-			resources, exists := s.GetAdditionalGatewayGroup(additionalGatewayGroupID)
+			resources, exists := s.GetAdditionalGateway(additionalGatewayGroupID)
 			Expect(exists).To(BeTrue(), "additional gateway group should exist")
 
 			By("Create additional GatewayClass")
@@ -348,7 +348,7 @@ spec:
 				Status(http.StatusOK)
 
 			By("Access through additional gateway")
-			client, err := s.NewAPISIXClientForGatewayGroup(additionalGatewayGroupID)
+			client, err := s.NewAPISIXClientForGateway(additionalGatewayGroupID)
 			Expect(err).NotTo(HaveOccurred(), "creating client for additional gateway")
 
 			client.
@@ -370,7 +370,7 @@ spec:
 				Status(http.StatusOK)
 
 			By("HTTPRoute should not be accessible through additional gateway")
-			client, err = s.NewAPISIXClientForGatewayGroup(additionalGatewayGroupID)
+			client, err = s.NewAPISIXClientForGateway(additionalGatewayGroupID)
 			Expect(err).NotTo(HaveOccurred(), "creating client for additional gateway")
 
 			client.
@@ -1671,13 +1671,13 @@ spec:
 
 			By("create additional gateway group to get new admin key")
 			var err error
-			additionalGatewayGroupID, _, err = s.CreateAdditionalGatewayGroup("gateway-proxy-update")
+			additionalGatewayGroupID, _, err = s.Deployer.CreateAdditionalGateway("gateway-proxy-update")
 			Expect(err).NotTo(HaveOccurred(), "creating additional gateway group")
 
-			resources, exists := s.GetAdditionalGatewayGroup(additionalGatewayGroupID)
+			resources, exists := s.GetAdditionalGateway(additionalGatewayGroupID)
 			Expect(exists).To(BeTrue(), "additional gateway group should exist")
 
-			client, err := s.NewAPISIXClientForGatewayGroup(additionalGatewayGroupID)
+			client, err := s.NewAPISIXClientForGateway(additionalGatewayGroupID)
 			Expect(err).NotTo(HaveOccurred(), "creating APISIX client for additional gateway group")
 
 			By("HTTPRoute not found for additional gateway group")

test/e2e/ingress/ingress.go

@@ -831,10 +831,10 @@ spec:
 				Status(200)
 
 			By("create additional gateway group to get new admin key")
-			additionalGatewayGroupID, _, err = s.CreateAdditionalGatewayGroup("gateway-proxy-update")
+			additionalGatewayGroupID, _, err = s.Deployer.CreateAdditionalGateway("gateway-proxy-update")
 			Expect(err).NotTo(HaveOccurred(), "creating additional gateway group")
 
-			client, err := s.NewAPISIXClientForGatewayGroup(additionalGatewayGroupID)
+			client, err := s.NewAPISIXClientForGateway(additionalGatewayGroupID)
 			Expect(err).NotTo(HaveOccurred(), "creating APISIX client for additional gateway group")
 
 			By("Ingress not found for additional gateway group")
@@ -844,7 +844,7 @@ spec:
 				Expect().
 				Status(404)
 
-			resources, exists := s.GetAdditionalGatewayGroup(additionalGatewayGroupID)
+			resources, exists := s.GetAdditionalGateway(additionalGatewayGroupID)
 			Expect(exists).To(BeTrue(), "additional gateway group should exist")
 
 			By("update GatewayProxy with new admin key")
@@ -965,10 +965,10 @@ spec:
 				Expect().Header("X-Proxy-Test").IsEqual("enabled")
 
 			By("create additional gateway group to get new admin key")
-			additionalGatewayGroupID, _, err = s.CreateAdditionalGatewayGroup("gateway-proxy-update")
+			additionalGatewayGroupID, _, err = s.Deployer.CreateAdditionalGateway("gateway-proxy-update")
 			Expect(err).NotTo(HaveOccurred(), "creating additional gateway group")
 
-			client, err := s.NewAPISIXClientForGatewayGroup(additionalGatewayGroupID)
+			client, err := s.NewAPISIXClientForGateway(additionalGatewayGroupID)
 			Expect(err).NotTo(HaveOccurred(), "creating APISIX client for additional gateway group")
 
 			By("Ingress not found for additional gateway group")
@@ -978,7 +978,7 @@ spec:
 				Expect().
 				Status(http.StatusNotFound)
 
-			resources, exists := s.GetAdditionalGatewayGroup(additionalGatewayGroupID)
+			resources, exists := s.GetAdditionalGateway(additionalGatewayGroupID)
 			Expect(exists).To(BeTrue(), "additional gateway group should exist")
 
 			By("update secret")