[fdio] Bump compute RAM defaults for virtual PODs

Hugepage count has been recently bumped for virtual PODs via IDF
changes in Pharos, so align our FDio scenarios with the new RAM
requirements.

While at it, fix wrong pod_config template evaluation by moving it
after the templated scenario files are expanded, since pod_config
relies on scenario node definition.

Also, configure VPP to use decimal interface names by default to
align with Pharos macro for the VPP interface name string.

Change-Id: Ib3a89c294a3a2755567fdbe07e3be2b8ca1a5714
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

1 files changed, 9 insertions, 6 deletions

diff --git a/mcp/patches/salt-formula-linux/0002-network-Bring-in-basic-VPP-support.patch b/mcp/patches/salt-formula-linux/0002-network-Bring-in-basic-VPP-support.patch
index 44883ae82..6c26ae864 100644
--- a/mcp/patches/salt-formula-linux/0002-network-Bring-in-basic-VPP-support.patch
+++ b/mcp/patches/salt-formula-linux/0002-network-Bring-in-basic-VPP-support.patch
@@ -17,10 +17,10 @@ TODO:
 
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- linux/files/vpp_commands.txt |  4 ++++
- linux/files/vpp_startup.conf | 44 ++++++++++++++++++++++++++++++++++++
- linux/network/dpdk.sls       | 38 +++++++++++++++++++++++++++++++
- 3 files changed, 86 insertions(+)
+ linux/files/vpp_commands.txt |  4 +++
+ linux/files/vpp_startup.conf | 47 ++++++++++++++++++++++++++++++++++++
+ linux/network/dpdk.sls       | 38 +++++++++++++++++++++++++++++
+ 3 files changed, 89 insertions(+)
  create mode 100644 linux/files/vpp_commands.txt
  create mode 100644 linux/files/vpp_startup.conf
 
@@ -36,10 +36,10 @@ index 0000000..2ce4726
 +{%- endif %}
 diff --git a/linux/files/vpp_startup.conf b/linux/files/vpp_startup.conf
 new file mode 100644
-index 0000000..d66ecd3
+index 0000000..fcfc1fd
 --- /dev/null
 +++ b/linux/files/vpp_startup.conf
-@@ -0,0 +1,44 @@
+@@ -0,0 +1,47 @@
 +{%- from "linux/map.jinja" import network with context %}
 +unix {
 +  cli-listen /run/vpp/cli.sock
@@ -74,6 +74,9 @@ index 0000000..d66ecd3
 +{%- endif %}
 +}
 +dpdk {
++{%- if network.vpp.decimal_interface_names is defined %}
++  decimal-interface-names
++{%- endif %}
 +{%- if network.vpp.dpdk_socket_mem is defined %}
 +  socket-mem {{ network.vpp.dpdk_socket_mem }}
 +{%- endif %}