feat(core): Infra model condition

Signed-off-by: Peter Mikus <[email protected]>
Change-Id: I7a367a152d46bb7a165428dbfc931d7063f3757a

diff --git a/resources/libraries/python/VppConfigGenerator.py b/resources/libraries/python/VppConfigGenerator.py
index 849a329..7021d7f 100644 (file)
--- a/resources/libraries/python/VppConfigGenerator.py
+++ b/resources/libraries/python/VppConfigGenerator.py
@@ -827,20 +827,24 @@ class VppInitConfig:
                 vpp_config.add_unix_cli_listen()
                 vpp_config.add_unix_cli_no_pager()
                 vpp_config.add_socksvr(socket=Constants.SOCKSVR_PATH)
-                vpp_config.add_main_heap_size("2G")
-                vpp_config.add_main_heap_page_size(huge_size)
-                vpp_config.add_default_hugepage_size(huge_size)
-                vpp_config.add_statseg_size("2G")
-                vpp_config.add_statseg_page_size(huge_size)
                 vpp_config.add_statseg_per_node_counters("on")
                 vpp_config.add_plugin("disable", "default")
-                vpp_config.add_plugin("enable", "dpdk_plugin.so")
-                vpp_config.add_dpdk_dev(
-                    *[node["interfaces"][interface].get("pci_address") \
-                        for interface in node["interfaces"]]
-                )
-                vpp_config.add_ip6_hash_buckets(2000000)
-                vpp_config.add_ip6_heap_size("4G")
+                vpp_config.add_buffers_per_numa(107520)
+                if Topology.get_node_model_bool(node, "Marvel-Octeon"):
+                    vpp_config.add_plugin("enable", "dev_octeon_plugin.so")
+                else:
+                    vpp_config.add_main_heap_size("2G")
+                    vpp_config.add_main_heap_page_size(huge_size)
+                    vpp_config.add_default_hugepage_size(huge_size)
+                    vpp_config.add_statseg_size("2G")
+                    vpp_config.add_statseg_page_size(huge_size)
+                    vpp_config.add_ip6_hash_buckets(2000000)
+                    vpp_config.add_ip6_heap_size("4G")
+                    vpp_config.add_plugin("enable", "dpdk_plugin.so")
+                    vpp_config.add_dpdk_dev(
+                        *[node["interfaces"][interface].get("pci_address") \
+                            for interface in node["interfaces"]]
+                    )
                 vpp_config.apply_config()
 
     @staticmethod

diff --git a/resources/libraries/python/topology.py b/resources/libraries/python/topology.py
index 5a3dc2a..aacc277 100644 (file)
--- a/resources/libraries/python/topology.py
+++ b/resources/libraries/python/topology.py
@@ -995,7 +995,7 @@ class Topology:
             return "x86_64"
 
     @staticmethod
-    def get_node_model(node):
+    def get_node_model_bool(node, model=""):
         """Get node model (vendor/type).
 
         :param node: Node to get model (vendor/type) from.
@@ -1004,7 +1004,7 @@ class Topology:
         :rtype: str
         """
         try:
-            return node["model"]
+            return bool(model.lower() in node["model"].lower())
         except KeyError:
             return None