From 5c4c052d81aa13383a2d67ac8aa2b333d8e43813 Mon Sep 17 00:00:00 2001
From: Andre Puschmann <andre@softwareradiosystems.com>
Date: Thu, 9 Jul 2020 15:55:04 +0200
Subject: [PATCH] amarisoft_{mme,enb}: make sure mcc/mnc are zero padded

same as for srsEPC this is also required for Amarisoft MME and eNB to support, i.e. 001/01

Note that the 3 digit MNC isn't covered by this.

Change-Id: I80a84e01ec9530c285634452d7c18c17bdd595ce
---
 src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl    | 2 +-
 src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
index 7896ecb5..64d16f99 100644
--- a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
@@ -93,7 +93,7 @@
   cell_default: {
     /* Broadcasted PLMN identities */
     plmn_list: [
-      "${enb.mcc}${enb.mnc}",
+      "${'{0:03}'.format(int(enb.mcc))}${'{0:02}'.format(int(enb.mnc))}",
     ],
 
 % if int(enb.get('transmission_mode')) == 1:
diff --git a/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl
index fb3ec984..3c83bedc 100644
--- a/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl
@@ -39,7 +39,7 @@
 
   s1ap_bind_addr: "${epc.run_addr}",
 
-  plmn: "${epc.mcc}${epc.mnc}",
+  plmn: "${'{0:03}'.format(int(epc.mcc))}${'{0:02}'.format(int(epc.mnc))}",
   mme_group_id: 32769,
   mme_code: 1,