membphis commented on a change in pull request #972: URL: https://github.com/apache/apisix-dashboard/pull/972#discussion_r538189408
########## File path: api/test/e2e/balancer_test.go ########## @@ -0,0 +1,262 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package e2e + +import ( + "io/ioutil" + "net/http" + "testing" + "time" + + "github.com/stretchr/testify/assert" +) + +func TestBalancer_roundrobin_with_weight(t *testing.T) { + tests := []HttpTestCase{ + { + caseDesc: "create upstream (roundrobin with same weight)", + Object: ManagerApiExpect(t), + Method: http.MethodPut, + Path: "/apisix/admin/upstreams/1", + Body: `{ + "nodes": [{ + "host": "172.16.238.20", + "port": 1980, + "weight": 1 + }, + { + "host": "172.16.238.20", + "port": 1981, + "weight": 1 + }, + { + "host": "172.16.238.20", + "port": 1982, + "weight": 1 + }], + "type": "roundrobin" + }`, + Headers: map[string]string{"Authorization": token}, + ExpectStatus: http.StatusOK, + }, + { + caseDesc: "create route using the upstream just created", + Object: ManagerApiExpect(t), + Method: http.MethodPut, + Path: "/apisix/admin/routes/1", + Body: `{ + "uri": "/server_port", + "upstream_id": "1" + }`, + Headers: map[string]string{"Authorization": token}, + ExpectStatus: http.StatusOK, + Sleep: sleepTime, + }, + } + + for _, tc := range tests { + testCaseCheck(tc) + } + + //hit routes Review comment: code style ########## File path: api/test/e2e/balancer_test.go ########## @@ -0,0 +1,262 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package e2e + +import ( + "io/ioutil" + "net/http" + "testing" + "time" + + "github.com/stretchr/testify/assert" +) + +func TestBalancer_roundrobin_with_weight(t *testing.T) { + tests := []HttpTestCase{ + { + caseDesc: "create upstream (roundrobin with same weight)", + Object: ManagerApiExpect(t), + Method: http.MethodPut, + Path: "/apisix/admin/upstreams/1", + Body: `{ + "nodes": [{ + "host": "172.16.238.20", + "port": 1980, + "weight": 1 + }, + { + "host": "172.16.238.20", + "port": 1981, + "weight": 1 + }, + { + "host": "172.16.238.20", + "port": 1982, + "weight": 1 + }], + "type": "roundrobin" + }`, + Headers: map[string]string{"Authorization": token}, + ExpectStatus: http.StatusOK, + }, + { + caseDesc: "create route using the upstream just created", + Object: ManagerApiExpect(t), + Method: http.MethodPut, + Path: "/apisix/admin/routes/1", + Body: `{ + "uri": "/server_port", + "upstream_id": "1" + }`, + Headers: map[string]string{"Authorization": token}, + ExpectStatus: http.StatusOK, + Sleep: sleepTime, + }, + } + + for _, tc := range tests { + testCaseCheck(tc) + } + + //hit routes + time.Sleep(200 * time.Millisecond) + basepath := "http://127.0.0.1:9080/"; + request, err := http.NewRequest("GET", basepath+"/server_port", nil) + request.Header.Add("Authorization", token) + var resp *http.Response + var respBody []byte + res := map[string]int{} + for i := 0; i < 18; i++ { + resp, err = http.DefaultClient.Do(request) + assert.Nil(t, err) + respBody, err = ioutil.ReadAll(resp.Body) + body := string(respBody) + if _, ok := res[body]; !ok { + res[body] = 1 + } else { + res[body] += 1 + } + resp.Body.Close() + } + assert.True(t, res["1982"] == res["1981"] && res["1981"] == res["1980"] && res["1980"] == 6) Review comment: code style ########## File path: api/test/e2e/balancer_test.go ########## @@ -0,0 +1,262 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package e2e + +import ( + "io/ioutil" + "net/http" + "testing" + "time" + + "github.com/stretchr/testify/assert" +) + +func TestBalancer_roundrobin_with_weight(t *testing.T) { + tests := []HttpTestCase{ + { + caseDesc: "create upstream (roundrobin with same weight)", + Object: ManagerApiExpect(t), + Method: http.MethodPut, + Path: "/apisix/admin/upstreams/1", + Body: `{ + "nodes": [{ + "host": "172.16.238.20", + "port": 1980, + "weight": 1 + }, + { + "host": "172.16.238.20", + "port": 1981, + "weight": 1 + }, + { + "host": "172.16.238.20", + "port": 1982, + "weight": 1 + }], + "type": "roundrobin" + }`, + Headers: map[string]string{"Authorization": token}, + ExpectStatus: http.StatusOK, + }, + { + caseDesc: "create route using the upstream just created", + Object: ManagerApiExpect(t), + Method: http.MethodPut, + Path: "/apisix/admin/routes/1", + Body: `{ + "uri": "/server_port", + "upstream_id": "1" + }`, + Headers: map[string]string{"Authorization": token}, + ExpectStatus: http.StatusOK, + Sleep: sleepTime, + }, + } + + for _, tc := range tests { + testCaseCheck(tc) + } + + //hit routes + time.Sleep(200 * time.Millisecond) + basepath := "http://127.0.0.1:9080/"; + request, err := http.NewRequest("GET", basepath+"/server_port", nil) + request.Header.Add("Authorization", token) + var resp *http.Response + var respBody []byte + res := map[string]int{} + for i := 0; i < 18; i++ { + resp, err = http.DefaultClient.Do(request) + assert.Nil(t, err) + respBody, err = ioutil.ReadAll(resp.Body) + body := string(respBody) + if _, ok := res[body]; !ok { + res[body] = 1 + } else { + res[body] += 1 + } + resp.Body.Close() + } + assert.True(t, res["1982"] == res["1981"] && res["1981"] == res["1980"] && res["1980"] == 6) + + tests = []HttpTestCase{ + { + caseDesc: "create upstream (roundrobin with different weight)", + Object: ManagerApiExpect(t), + Method: http.MethodPut, + Path: "/apisix/admin/upstreams/1", + Body: `{ + "nodes": [{ + "host": "172.16.238.20", + "port": 1980, + "weight": 1 + }, + { + "host": "172.16.238.20", + "port": 1981, + "weight": 2 + }, + { + "host": "172.16.238.20", + "port": 1982, + "weight": 3 + }], + "type": "roundrobin" + }`, + Headers: map[string]string{"Authorization": token}, + ExpectStatus: http.StatusOK, + }, + } + for _, tc := range tests { + testCaseCheck(tc) + } + + //hit routes + time.Sleep(200 * time.Millisecond) + res = map[string]int{} + for i := 0; i < 18; i++ { + resp, err = http.DefaultClient.Do(request) + assert.Nil(t, err) + respBody, err = ioutil.ReadAll(resp.Body) + body := string(respBody) + if _, ok := res[body]; !ok { + res[body] = 1 + } else { + res[body] += 1 + } + resp.Body.Close() + } + assert.True(t, res["1980"] == 3 && res["1981"] == 6 && res["1982"] == 9) Review comment: ditto ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
