Merge pull request #4997 from natali-rs1985/T8261

vpp: T8261: Refactor resource settings into 'resource-allocation' section

1 files changed, 130 insertions, 149 deletions

diff --git a/interface-definitions/vpp.xml.in b/interface-definitions/vpp.xml.in
index abe88b3db..86568c1e9 100644
--- a/interface-definitions/vpp.xml.in
+++ b/interface-definitions/vpp.xml.in
@@ -545,51 +545,148 @@
                 </properties>
                 <defaultValue>1</defaultValue>
               </leafNode>
-            </children>
-          </node>
-          <node name="buffers">
-            <properties>
-              <help>Buffer settings</help>
-            </properties>
-            <children>
-              <leafNode name="buffers-per-numa">
+              <node name="buffers">
                 <properties>
-                  <help>Number of buffers per numa node</help>
-                  <valueHelp>
-                    <format>u32:16384-4294967295</format>
-                    <description>Number of buffers</description>
-                  </valueHelp>
-                  <valueHelp>
-                     <format>auto</format>
-                     <description>Auto calculate number of buffers per numa node</description>
-                   </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 16384-4294967295"/>
-                    <regex>(auto)</regex>
-                  </constraint>
+                  <help>Buffer settings</help>
                 </properties>
-                <defaultValue>auto</defaultValue>
-              </leafNode>
-              <leafNode name="data-size">
+                <children>
+                  <leafNode name="buffers-per-numa">
+                    <properties>
+                      <help>Number of buffers per numa node</help>
+                      <completionHelp>
+                        <list>auto</list>
+                      </completionHelp>
+                      <valueHelp>
+                        <format>u32:16384-4294967295</format>
+                        <description>Number of buffers</description>
+                      </valueHelp>
+                      <valueHelp>
+                        <format>auto</format>
+                        <description>Auto calculate number of buffers per numa node</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="numeric" argument="--range 16384-4294967295"/>
+                        <regex>(auto)</regex>
+                      </constraint>
+                    </properties>
+                    <defaultValue>auto</defaultValue>
+                  </leafNode>
+                  <leafNode name="data-size">
+                    <properties>
+                      <help>Size of buffer data area</help>
+                      <valueHelp>
+                        <format>u32</format>
+                        <description>Size of buffer data area</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="numeric" argument="--range 0-4294967295"/>
+                      </constraint>
+                    </properties>
+                    <defaultValue>2048</defaultValue>
+                  </leafNode>
+                  <leafNode name="page-size">
+                    <properties>
+                      <help>Set the page-size for buffer allocation</help>
+                      #include <include/unformat_log2_page_size.xml.i>
+                    </properties>
+                    <defaultValue>2M</defaultValue>
+                  </leafNode>
+                </children>
+              </node>
+              <node name="ipv6">
+                <properties>
+                  <help>IPv6 settings</help>
+                </properties>
+                <children>
+                  <leafNode name="heap-size">
+                    <properties>
+                      <help>IPv6 heap size</help>
+                      #include <include/unformat_memory_size.xml.i>
+                    </properties>
+                    <defaultValue>32M</defaultValue>
+                  </leafNode>
+                  <leafNode name="hash-buckets">
+                    <properties>
+                      <help>IPv6 forwarding table hash buckets</help>
+                      <valueHelp>
+                        <format>u32:1-4294967295</format>
+                        <description>IPv6 forwarding table hash buckets</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="numeric" argument="--range 1-4294967295"/>
+                      </constraint>
+                    </properties>
+                    <defaultValue>65536</defaultValue>
+                  </leafNode>
+                </children>
+              </node>
+              <leafNode name="mac-limit">
                 <properties>
-                  <help>Size of buffer data area</help>
+                  <help>Number of MAC addresses in the L2 FIB</help>
                   <valueHelp>
-                    <format>u32:0-4294967295</format>
-                    <description>Size of buffer data area</description>
+                    <format>u32:1-4294967295</format>
+                    <description>Number of MAC addresses in the L2 FIB</description>
                   </valueHelp>
                   <constraint>
-                    <validator name="numeric" argument="--range 0-4294967295"/>
+                    <validator name="numeric" argument="--range 1-4294967295"/>
                   </constraint>
                 </properties>
-                <defaultValue>2048</defaultValue>
+                <defaultValue>4194304</defaultValue>
               </leafNode>
-              <leafNode name="page-size">
+              <leafNode name="ignore-kernel-routes">
                 <properties>
-                  <help>Set the page-size for buffer allocation</help>
-                  #include <include/unformat_log2_page_size.xml.i>
+                  <help>Ignore kernel routes</help>
+                  <valueless/>
                 </properties>
-                <defaultValue>2M</defaultValue>
               </leafNode>
+              <node name="memory">
+                <properties>
+                  <help>Memory settings</help>
+                </properties>
+                <children>
+                  <leafNode name="main-heap-size">
+                    <properties>
+                      <help>Main heap size</help>
+                      #include <include/unformat_memory_size.xml.i>
+                    </properties>
+                    <defaultValue>3G</defaultValue>
+                  </leafNode>
+                  <leafNode name="main-heap-page-size">
+                    <properties>
+                      <help>Main heap page size</help>
+                      #include <include/unformat_log2_page_size.xml.i>
+                    </properties>
+                    <defaultValue>2M</defaultValue>
+                  </leafNode>
+                  <leafNode name="physmem-max-size">
+                    <properties>
+                      <help>Memory size for protectable memory allocator (pmalloc) memory space</help>
+                      #include <include/unformat_memory_size.xml.i>
+                    </properties>
+                  </leafNode>
+                  <node name="stats">
+                    <properties>
+                      <help>Stats settings</help>
+                    </properties>
+                    <children>
+                      <leafNode name="size">
+                        <properties>
+                          <help>Size of stats segment</help>
+                          #include <include/unformat_memory_size.xml.i>
+                        </properties>
+                        <defaultValue>128M</defaultValue>
+                      </leafNode>
+                      <leafNode name="page-size">
+                        <properties>
+                          <help>Stats page size</help>
+                          #include <include/unformat_log2_page_size.xml.i>
+                        </properties>
+                        <defaultValue>2M</defaultValue>
+                      </leafNode>
+                    </children>
+                  </node>
+                </children>
+              </node>
             </children>
           </node>
           <tagNode name="interface">
@@ -660,73 +757,12 @@
               </leafNode>
             </children>
           </tagNode>
-          <node name="ipv6">
-            <properties>
-              <help>IPv6 settings</help>
-            </properties>
-            <children>
-              <leafNode name="heap-size">
-                <properties>
-                  <help>IPv6 heap size</help>
-                  #include <include/unformat_memory_size.xml.i>
-                </properties>
-                <defaultValue>32M</defaultValue>
-              </leafNode>
-              <leafNode name="hash-buckets">
-                <properties>
-                  <help>IPv6 forwarding table hash buckets</help>
-                  <valueHelp>
-                    <format>u32:1-4294967295</format>
-                    <description>IPv6 forwarding table hash buckets</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 1-4294967295"/>
-                  </constraint>
-                </properties>
-                <defaultValue>65536</defaultValue>
-              </leafNode>
-            </children>
-          </node>
           <leafNode name="ipsec-acceleration">
             <properties>
               <help>Enable IPsec acceleration</help>
               <valueless/>
             </properties>
           </leafNode>
-          <node name="l2learn">
-            <properties>
-              <help>Level 2 MAC address learning settings</help>
-            </properties>
-            <children>
-              <leafNode name="limit">
-                <properties>
-                  <help>Number of MAC addresses in the L2 FIB</help>
-                  <valueHelp>
-                    <format>u32:1-4294967295</format>
-                    <description>Number of concurent entries</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 1-4294967295"/>
-                  </constraint>
-                </properties>
-                <defaultValue>4194304</defaultValue>
-              </leafNode>
-            </children>
-          </node>
-          <node name="lcp">
-            <properties>
-              <help>Linux control plane setting</help>
-            </properties>
-            <children>
-              #include <include/vpp/netlink.xml.i>
-            <leafNode name="ignore-kernel-routes">
-              <properties>
-                <help>Ignore kernel routes</help>
-                <valueless/>
-              </properties>
-            </leafNode>
-          </children>
-        </node>
         <node name="logging">
           <properties>
             <help>Logging settings</help>
@@ -781,61 +817,6 @@
             </leafNode>
           </children>
         </node>
-        <node name="memory">
-          <properties>
-            <help>Memory settings</help>
-          </properties>
-          <children>
-            <leafNode name="main-heap-size">
-              <properties>
-                <help>Main heap size</help>
-                #include <include/unformat_memory_size.xml.i>
-              </properties>
-              <defaultValue>3G</defaultValue>
-            </leafNode>
-            <leafNode name="main-heap-page-size">
-              <properties>
-                <help>Main heap page size</help>
-                #include <include/unformat_log2_page_size.xml.i>
-              </properties>
-              <defaultValue>2M</defaultValue>
-            </leafNode>
-          </children>
-        </node>
-        <node name="physmem">
-          <properties>
-            <help>Physical memory settings</help>
-          </properties>
-          <children>
-            <leafNode name="max-size">
-              <properties>
-                <help>Set memory size for protectable memory allocator (pmalloc) memory space</help>
-                #include <include/unformat_memory_size.xml.i>
-              </properties>
-            </leafNode>
-          </children>
-        </node>
-        <node name="statseg">
-          <properties>
-            <help>Stats settings</help>
-          </properties>
-          <children>
-            <leafNode name="size">
-              <properties>
-                <help>Size of stats segment</help>
-                #include <include/unformat_memory_size.xml.i>
-              </properties>
-              <defaultValue>128M</defaultValue>
-            </leafNode>
-            <leafNode name="page-size">
-              <properties>
-                <help>Stats page size</help>
-                #include <include/unformat_log2_page_size.xml.i>
-              </properties>
-              <defaultValue>2M</defaultValue>
-            </leafNode>
-          </children>
-        </node>
         <leafNode name="poll-sleep-usec">
           <properties>
             <help>Add a fixed-sleep between main loop poll</help>