ci: sync APISIX use 9180 as default port of admin API (#197)

tzssangglass · web-flow · commit 88e341e52a5f · 2022-09-02T11:03:02.000+08:00
diff --git a/ci/docker-compose.yml b/ci/docker-compose.yml
@@ -28,6 +28,7 @@ services:
       - etcd
     ports:
       - "9080:9080/tcp"
+      - "9180:9180/tcp"
       - "9091:9091/tcp"
       - "9443:9443/tcp"
       - "9092:9092/tcp"
diff --git a/tests/e2e/plugins/plugins_post_test.go b/tests/e2e/plugins/plugins_post_test.go
@@ -32,7 +32,7 @@ var _ = ginkgo.Describe("Post", func() {
 			tools.RunTestCase(tc)
 		},
 		table.Entry("create java runner post plugin route success", tools.HttpTestCase{
-			Object: tools.GetA6Expect(),
+			Object: tools.PutA6Conf(),
 			Method: http.MethodPut,
 			Path:   "/apisix/admin/routes/1",
 			Body: `{
diff --git a/tests/e2e/plugins/plugins_rewrite_test.go b/tests/e2e/plugins/plugins_rewrite_test.go
@@ -31,7 +31,7 @@ var _ = ginkgo.Describe("Stop", func() {
 			tools.RunTestCase(tc)
 		},
 		table.Entry("create java runner stop plugin route success", tools.HttpTestCase{
-			Object: tools.GetA6Expect(),
+			Object: tools.PutA6Conf(),
 			Method: http.MethodPut,
 			Path:   "/apisix/admin/routes/1",
 			Body: `{
diff --git a/tests/e2e/plugins/plugins_stop_test.go b/tests/e2e/plugins/plugins_stop_test.go
@@ -32,7 +32,7 @@ var _ = ginkgo.Describe("Stop", func() {
 			tools.RunTestCase(tc)
 		},
 		table.Entry("create java runner stop plugin route success", tools.HttpTestCase{
-			Object: tools.GetA6Expect(),
+			Object: tools.PutA6Conf(),
 			Method: http.MethodPut,
 			Path:   "/apisix/admin/routes/1",
 			Body: `{
diff --git a/tests/e2e/tools/tools.go b/tests/e2e/tools/tools.go
@@ -26,17 +26,23 @@ import (
 )
 
 var (
-	token  = "edd1c9f034335f136f87ad84b625c8f1"
-	A6Host = "http://127.0.0.1:9080"
+	token      = "edd1c9f034335f136f87ad84b625c8f1"
+	A6_CP_Host = "http://127.0.0.1:9180"
+	A6_DP_Host = "http://127.0.0.1:9080"
 )
 
 func GetAdminToken() string {
 	return token
 }
 
+func PutA6Conf() *httpexpect.Expect {
+	t := ginkgo.GinkgoT()
+	return httpexpect.New(t, A6_CP_Host)
+}
+
 func GetA6Expect() *httpexpect.Expect {
 	t := ginkgo.GinkgoT()
-	return httpexpect.New(t, A6Host)
+	return httpexpect.New(t, A6_DP_Host)
 }
 
 type HttpTestCase struct {

Original file line number	Diff line number	Diff line change
`@@ -26,17 +26,23 @@ import (`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`var (`
`29`		`- token = "edd1c9f034335f136f87ad84b625c8f1"`
`30`		`- A6Host = "http://127.0.0.1:9080"`
	`29`	`+ token = "edd1c9f034335f136f87ad84b625c8f1"`
	`30`	`+ A6_CP_Host = "http://127.0.0.1:9180"`
	`31`	`+ A6_DP_Host = "http://127.0.0.1:9080"`
`31`	`32`	`)`
`32`	`33`
`33`	`34`	`func GetAdminToken() string {`
`34`	`35`	`return token`
`35`	`36`	`}`
`36`	`37`
	`38`	`+func PutA6Conf() *httpexpect.Expect {`
	`39`	`+ t := ginkgo.GinkgoT()`
	`40`	`+ return httpexpect.New(t, A6_CP_Host)`
	`41`	`+}`
	`42`	`+`
`37`	`43`	`func GetA6Expect() *httpexpect.Expect {`
`38`	`44`	`t := ginkgo.GinkgoT()`
`39`		`- return httpexpect.New(t, A6Host)`
	`45`	`+ return httpexpect.New(t, A6_DP_Host)`
`40`	`46`	`}`
`41`	`47`
`42`	`48`	`type HttpTestCase struct {`