Merge pull request #4360 from sever-sever/T7190

T7190: Add haproxy default timeout options configurable

6 files changed, 90 insertions, 36 deletions

diff --git a/interface-definitions/include/haproxy/timeout-check.xml.i b/interface-definitions/include/haproxy/timeout-check.xml.i
new file mode 100644
index 000000000..d1217fac3
--- /dev/null
+++ b/interface-definitions/include/haproxy/timeout-check.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from haproxy/timeout-check.xml.i -->
+<leafNode name="check">
+  <properties>
+    <help>Timeout in seconds for established connections</help>
+    <valueHelp>
+      <format>u32:1-3600</format>
+      <description>Check timeout in seconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-3600"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/haproxy/timeout-client.xml.i b/interface-definitions/include/haproxy/timeout-client.xml.i
new file mode 100644
index 000000000..2250ccdef
--- /dev/null
+++ b/interface-definitions/include/haproxy/timeout-client.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from haproxy/timeout-client.xml.i -->
+<leafNode name="client">
+  <properties>
+    <help>Maximum inactivity time on the client side</help>
+    <valueHelp>
+      <format>u32:1-3600</format>
+      <description>Timeout in seconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-3600"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/haproxy/timeout-connect.xml.i b/interface-definitions/include/haproxy/timeout-connect.xml.i
new file mode 100644
index 000000000..da4f983af
--- /dev/null
+++ b/interface-definitions/include/haproxy/timeout-connect.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from haproxy/timeout-connect.xml.i -->
+<leafNode name="connect">
+  <properties>
+    <help>Set the maximum time to wait for a connection attempt to a server to succeed</help>
+    <valueHelp>
+      <format>u32:1-3600</format>
+      <description>Connect timeout in seconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-3600"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/haproxy/timeout-server.xml.i b/interface-definitions/include/haproxy/timeout-server.xml.i
new file mode 100644
index 000000000..f27d415c1
--- /dev/null
+++ b/interface-definitions/include/haproxy/timeout-server.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from haproxy/timeout-server.xml.i -->
+<leafNode name="server">
+  <properties>
+    <help>Set the maximum inactivity time on the server side</help>
+    <valueHelp>
+      <format>u32:1-3600</format>
+      <description>Server timeout in seconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-3600"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/haproxy/timeout.xml.i b/interface-definitions/include/haproxy/timeout.xml.i
index 79e7303b1..a3a5a8a3e 100644
--- a/interface-definitions/include/haproxy/timeout.xml.i
+++ b/interface-definitions/include/haproxy/timeout.xml.i
@@ -4,42 +4,9 @@
     <help>Timeout options</help>
   </properties>
   <children>
-    <leafNode name="check">
-      <properties>
-        <help>Timeout in seconds for established connections</help>
-        <valueHelp>
-          <format>u32:1-3600</format>
-          <description>Check timeout in seconds</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 1-3600"/>
-        </constraint>
-      </properties>
-    </leafNode>
-    <leafNode name="connect">
-      <properties>
-        <help>Set the maximum time to wait for a connection attempt to a server to succeed</help>
-        <valueHelp>
-          <format>u32:1-3600</format>
-          <description>Connect timeout in seconds</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 1-3600"/>
-        </constraint>
-      </properties>
-    </leafNode>
-    <leafNode name="server">
-      <properties>
-        <help>Set the maximum inactivity time on the server side</help>
-        <valueHelp>
-          <format>u32:1-3600</format>
-          <description>Server timeout in seconds</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 1-3600"/>
-        </constraint>
-      </properties>
-    </leafNode>
+    #include <include/haproxy/timeout-check.xml.i>
+    #include <include/haproxy/timeout-connect.xml.i>
+    #include <include/haproxy/timeout-server.xml.i>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/load-balancing_haproxy.xml.in b/interface-definitions/load-balancing_haproxy.xml.in
index ca089d3f0..b95e02337 100644
--- a/interface-definitions/load-balancing_haproxy.xml.in
+++ b/interface-definitions/load-balancing_haproxy.xml.in
@@ -48,6 +48,14 @@
                   <valueless/>
                 </properties>
               </leafNode>
+              <node name="timeout">
+                <properties>
+                  <help>Timeout options</help>
+                </properties>
+                <children>
+                  #include <include/haproxy/timeout-client.xml.i>
+                </children>
+              </node>
               <node name="http-compression">
                 <properties>
                   <help>Compress HTTP responses</help>
@@ -368,6 +376,29 @@
               </leafNode>
             </children>
           </node>
+          <node name="timeout">
+            <properties>
+              <help>Timeout options</help>
+            </properties>
+            <children>
+              #include <include/haproxy/timeout-check.xml.i>
+              <leafNode name="check">
+                <defaultValue>5</defaultValue>
+              </leafNode>
+              #include <include/haproxy/timeout-connect.xml.i>
+              <leafNode name="connect">
+                <defaultValue>10</defaultValue>
+              </leafNode>
+              #include <include/haproxy/timeout-client.xml.i>
+              <leafNode name="client">
+                <defaultValue>50</defaultValue>
+              </leafNode>
+              #include <include/haproxy/timeout-server.xml.i>
+              <leafNode name="server">
+                <defaultValue>50</defaultValue>
+              </leafNode>
+            </children>
+          </node>
           #include <include/interface/vrf.xml.i>
         </children>
       </node>