MEDIUM: balance: balance parameter reworked

Author: gitforbit

build/haproxy_spec.yaml

@@ -2975,18 +2975,81 @@ definitions:
           - source
           - uri
           - url_param
+          - hdr
           - random
+          - rdp-cookie
+          type: string
+        hdr_name:
+          pattern: ^[^\s]+$
           type: string
-        arguments:
-          items:
-            pattern: ^[^\s]+$
-            type: string
-          type: array
           x-dependency:
             algorithm:
-              value:
-              - uri
-              - url_param
+              required: true
+              value: hdr
+          x-display-name: Header Name
+        hdr_use_domain_only:
+          type: boolean
+          x-dependency:
+            algorithm:
+              value: hdr
+          x-display-name: Header Use Domain Only
+        random_draws:
+          type: integer
+          x-dependency:
+            algorithm:
+              value: random
+          x-display-name: Random Draws
+          x-nullable: false
+        rdp_cookie_name:
+          pattern: ^[^\s]+$
+          type: string
+          x-dependency:
+            algorithm:
+              value: rdp-cookie
+          x-display-name: Rdp Cookie Name
+        uri_depth:
+          pattern: ^[^\d+$]
+          type: integer
+          x-dependency:
+            algorithm:
+              value: uri
+          x-display-name: Uri Depth
+        uri_len:
+          pattern: ^[^\d+$]
+          type: integer
+          x-dependency:
+            algorithm:
+              value: uri
+          x-display-name: Uri Len
+        uri_whole:
+          type: boolean
+          x-dependency:
+            algorithm:
+              value: uri
+          x-display-name: Uri Whole
+        url_param:
+          pattern: ^[^\s]+$
+          type: string
+          x-dependency:
+            algorithm:
+              required: true
+              value: url_param
+          x-display-name: Url Param
+        url_param_check_post:
+          type: integer
+          x-dependency:
+            algorithm:
+              value: url_param
+          x-display-name: Url Param Check Post
+        url_param_max_wait:
+          pattern: ^[^\d+$]
+          type: integer
+          x-dependency:
+            algorithm:
+              value: url_param
+          x-display-name: Url Param Max Weight
+      required:
+      - algorithm
       type: object
   forwardfor:
       properties:

models/configuration.yaml

@@ -1425,18 +1425,81 @@ forwardfor:
       type: boolean
 balance:
   type: object
+  required:
+    - algorithm
   properties:
     algorithm:
       type: string
-      enum: [roundrobin, static-rr, leastconn, first, source, uri, url_param, random]
-    arguments:
-      type: array
-      items:
-        type: string
-        pattern: '^[^\s]+$'
-      x-dependency: 
-        algorithm: 
-          value: [uri, url_param]
+      enum: [roundrobin, static-rr, leastconn, first, source, uri, url_param, hdr, random, rdp-cookie]
+    uri_whole:
+      type: boolean
+      x-display-name: Uri Whole
+      x-dependency:
+        algorithm:
+          value: uri
+    uri_len:
+      type: integer
+      x-display-name: Uri Len
+      pattern: '^[^\d+$]'
+      x-dependency:
+        algorithm:
+          value: uri
+    uri_depth:
+      type: integer
+      x-display-name: Uri Depth
+      pattern: '^[^\d+$]'
+      x-dependency:
+        algorithm:
+          value: uri
+    url_param:
+      type: string
+      x-display-name: Url Param
+      pattern: '^[^\s]+$'
+      x-dependency:
+        algorithm:
+          value: url_param
+          required: true
+    url_param_check_post:
+      type: integer
+      x-display-name: Url Param Check Post
+      x-dependency:
+        algorithm:
+          value: url_param
+    url_param_max_wait:
+      type: integer
+      x-display-name: Url Param Max Weight
+      pattern: '^[^\d+$]'
+      x-dependency:
+        algorithm:
+          value: url_param
+    hdr_name:
+      type: string
+      x-display-name: Header Name
+      pattern: '^[^\s]+$'
+      x-dependency:
+        algorithm:
+          value: hdr
+          required: true
+    hdr_use_domain_only:
+      type: boolean
+      x-display-name: Header Use Domain Only
+      x-dependency:
+        algorithm:
+          value: hdr
+    random_draws:
+      type: integer
+      x-display-name: Random Draws
+      x-nullable: false
+      x-dependency:
+        algorithm:
+          value: random
+    rdp_cookie_name:
+      type: string
+      x-display-name: Rdp Cookie Name
+      pattern: '^[^\s]+$'
+      x-dependency:
+        algorithm:
+          value: rdp-cookie
 httpchk:
   type: object
   x-display-name: HTTP Check