CLEANUP: refactor server params

haproxytech · Jul 19, 2022 · 0bfca6f · 0bfca6f
1 parent 6dd40bd
commit 0bfca6f
Show file tree

Hide file tree

Showing 6 changed files with 1,539 additions and 3,649 deletions.
diff --git a/e2e/tests/servers/data/put.json b/e2e/tests/servers/data/put.json
@@ -1,8 +1,8 @@
 {
-  "address": "10.1.1.2",
   "check": "enabled",
-  "name": "server_01",
-  "port": 8081,
   "proxy-v2-options": null,
-  "weight": 10
+  "weight": 10,
+  "address": "10.1.1.2",
+  "name": "server_01",
+  "port": 8081
 }
diff --git a/e2e/tests/sites/data/post.json b/e2e/tests/sites/data/post.json
@@ -8,18 +8,18 @@
       "name": "site_backend",
       "servers": [
         {
+          "proxy-v2-options": null,
+          "weight": 30,
           "address": "127.0.1.1",
           "name": "site_server_01",
-          "port": 4567,
-          "proxy-v2-options": null,
-          "weight": 30
+          "port": 4567
         },
         {
+          "proxy-v2-options": null,
+          "weight": 70,
           "address": "127.0.1.2",
           "name": "site_server_02",
-          "port": 4567,
-          "proxy-v2-options": null,
-          "weight": 70
+          "port": 4567
         }
       ],
       "use_as": "default"

diff --git a/e2e/tests/sites/data/put.json b/e2e/tests/sites/data/put.json
@@ -8,18 +8,18 @@
       "name": "tcp_backend",
       "servers": [
         {
+          "proxy-v2-options": null,
+          "weight": 30,
           "address": "127.0.1.1",
           "name": "tcp_server_01",
-          "port": 4567,
-          "proxy-v2-options": null,
-          "weight": 30
+          "port": 4567
         },
         {
+          "proxy-v2-options": null,
+          "weight": 70,
           "address": "127.0.1.2",
           "name": "tcp_server_02",
-          "port": 4567,
-          "proxy-v2-options": null,
-          "weight": 70
+          "port": 4567
         }
       ],
       "use_as": "default"