From 6d37926e32dcd89ef999cedf9adcb13cbf717964 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Wed, 8 May 2019 22:17:23 +0200
Subject: [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>
(cherry picked from commit b381277ae274473ae4e05a1aa9dd171dbab461d6)
---
 mcp/config/scenario/os-nosdn-fdio-ha.yaml   |  4 ++--
 mcp/config/scenario/os-nosdn-fdio-noha.yaml | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'mcp/config/scenario')

diff --git a/mcp/config/scenario/os-nosdn-fdio-ha.yaml b/mcp/config/scenario/os-nosdn-fdio-ha.yaml
index 384771298..6415d0499 100644
--- a/mcp/config/scenario/os-nosdn-fdio-ha.yaml
+++ b/mcp/config/scenario/os-nosdn-fdio-ha.yaml
@@ -40,8 +40,8 @@ virtual:
   cmp001:
     disks: 100G;100G
     vcpus: 4
-    ram: 8192
+    ram: 12288
   cmp002:
     disks: 100G;100G
     vcpus: 4
-    ram: 8192
+    ram: 12288
diff --git a/mcp/config/scenario/os-nosdn-fdio-noha.yaml b/mcp/config/scenario/os-nosdn-fdio-noha.yaml
index 187b5bf48..028f3132a 100644
--- a/mcp/config/scenario/os-nosdn-fdio-noha.yaml
+++ b/mcp/config/scenario/os-nosdn-fdio-noha.yaml
@@ -25,36 +25,36 @@ virtual:
     ram: 14336
   gtw01:
     vcpus: 8
-    ram: 8192
+    ram: 12288
     cpu_topology:
       sockets: 1
       cores: 4
       threads: 2
     numa:
       cell0:
-        memory: 8388608
+        memory: 12582912
         cpus: 0-7
   cmp001:
     disks: 100G;100G
     vcpus: 8
-    ram: 8192
+    ram: 12288
     cpu_topology:
       sockets: 1
       cores: 4
       threads: 2
     numa:
       cell0:
-        memory: 8388608
+        memory: 12582912
         cpus: 0-7
   cmp002:
     disks: 100G;100G
     vcpus: 8
-    ram: 8192
+    ram: 12288
     cpu_topology:
       sockets: 1
       cores: 4
       threads: 2
     numa:
       cell0:
-        memory: 8388608
+        memory: 12582912
         cpus: 0-7
-- 
cgit 1.2.3-korg