software/ors-amarisoft: Merge gnb.jinja2.cfg into enb.jinja2.cfg

In MultiRU there will be only one ENB which supports all TDD, FDD, LTE and NR
cells and different types of radio units - all at the same time. This patch is
preparatory step for that: it merges gnb configuration template into enb
configuration template, so that enb.jinja2.cfg now serves both enb and gnb
instances.

In this patch for now we only move code from gnb.jinja2.cfg without changing
it(*) and wrap parts with `if do_lte` and `if do_nr` correspondingly.

The end result of rendered enb.cfg and gnb.cfg stays the same modulo space
changes and added innoccent `#define TDD` as Appendix shows.

(*) the only exception is set up of gtp_addr which has practically the same
code, was wrapped with `if mme_list` in enb and `if amf_list` in gnb, and is now
wrapped with `if mme_list or amf_list`.

/cc @lu.xu, @tomo, @xavier_thompson, @Daetalus
/reviewed-by @jhuge
/reviewed-on nexedi/slapos!1512

--------

Appendix. Diff for rendered enb.cfg and gnb.cfg before and after this patch.

```
$ ./pythonwitheggs slapos-render-config.py && (git diff -w --no-index config/enb.cfg.old config/enb.cfg ; git diff -w --no-index config/gnb.cfg.old config/gnb.cfg)
```

```diff
diff --git a/config/enb.cfg.old b/config/enb.cfg
index fdf3ab24d..cb46697ea 100644
--- a/config/enb.cfg.old
+++ b/config/enb.cfg
@@ -1,11 +1,15 @@

+
 #define TDD                 1

 #define N_RB_DL             50
+
 #define N_ANTENNA_DL        2
+
 #define N_ANTENNA_UL        2

+
 {

   log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,s1ap.level=debug,s1ap.max_size=1,x2ap.level=debug,x2ap.max_size=1,rrc.level=debug,rrc.max_size=1,phy.level=info,file.rota>
@@ -24,7 +28,6 @@
   rx_gain: 43,

   com_addr: "127.0.1.2:9001",
-
   mme_list: [

     {
@@ -33,9 +36,9 @@

   ],

+
   gtp_addr: "127.0.1.1",

-
   enb_id: 0x1A2D0,

   cell_list: [{
@@ -49,7 +52,6 @@
       ],
     }
   ],
-
   cell_default: {
     plmn_list: [
       "00101",
@@ -226,4 +228,6 @@
   meas_gap_config: "gp0",
   ho_from_meas: true,
   },
+
+
 }
\ No newline at end of file
diff --git a/config/gnb.cfg.old b/config/gnb.cfg
index e3d671e09..4e47a2094 100644
--- a/config/gnb.cfg.old
+++ b/config/gnb.cfg
@@ -1,15 +1,21 @@

+
+#define TDD                 1
+
+
 #define N_ANTENNA_DL        2

 #define N_ANTENNA_UL        2

+
 {

   log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,ngap.level=debug,ngap.max_size=1,xnap.level=debug,xnap.max_size=1,rrc.level=debug,rrc.max_size=1,phy.level=info,file.rota>

   log_filename: "log/gnb.log",

+
   rf_driver: {
       name: "sdr",
       args: "dev0=/dev/sdr0",
@@ -30,15 +36,17 @@
   ],

-
-
   gtp_addr: "127.0.1.1",

   gnb_id_bits: 28,
   gnb_id: 0x12345,
   en_dc_support: true,
-  cell_list: [],
+
+  cell_list: [
+  ],
+
+
   nr_cell_list: [
   {
     rf_port: 0,
```

software/ors-amarisoft/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = 46556429e86a96f4cd49084e1c96123f
+md5sum = 12591aca22ddc61f9fb1ec7e596873e3
 
 [slaplte.jinja2]
 _update_hash_filename_ = slaplte.jinja2
@@ -80,11 +80,11 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = 78ca387cee8121771186c36c8044b536
+md5sum = ae49a3a9a97407f9aea30981403ee1a2
 
 [template-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg
-md5sum = 2308c4cb644863ab322b91bb325d3460
+md5sum = 54a0c7c3a2a1c905a15c58c650ee1095
 
 [template-core-network]
 _update_hash_filename_ = instance-core-network.jinja2.cfg
@@ -108,7 +108,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = d1ddb99444cdb5413781a900518c73f9
+md5sum = 914d781af63f4214e6cc3be4ffe93215
 
 [drb_lte.jinja2.cfg]
 filename = config/drb_lte.jinja2.cfg
@@ -122,10 +122,6 @@ md5sum = 84d3cef8fc7f1c2aed7c348d500f5636
 filename = config/sib23.jinja2.asn
 md5sum = a1973ba6e43d40e510d61d461c2d13ac
 
-[gnb.jinja2.cfg]
-filename = config/gnb.jinja2.cfg
-md5sum = a4f91c1c9cfd91d000f4845a88cdb38a
-
 [mme.jinja2.cfg]
 filename = config/mme.jinja2.cfg
 md5sum = 3d7833ddba3242cedcd74c7db52390c6

software/ors-amarisoft/instance-enb.jinja2.cfg

@@ -190,6 +190,8 @@ context =
   raw trx {{ trx }}
   raw bbu {{ bbu }}
   raw ru {{ ru }}
+  json do_lte true
+  json do_nr  false
   import  netaddr netaddr
   ${:extra-context}
 

software/ors-amarisoft/instance-gnb.jinja2.cfg

@@ -242,6 +242,8 @@ context =
   raw trx {{ trx }}
   raw bbu {{ bbu }}
   raw ru {{ ru }}
+  json do_lte false
+  json do_nr  true
   import  netaddr netaddr
   ${:extra-context}
 
@@ -255,11 +257,13 @@ output = ${directory:etc}/drb.cfg
 {% if slapparameter_dict.get("gnb_config_link", None) %}
 url = ${gnb-config-dl:target}
 {% else %}
-url = {{ gnb_template }}
+url = {{ enb_template }}
 {% endif %}
 output = ${directory:etc}/gnb.cfg
 extra-context =
     key drb_file   drb-config:output
+import-list =
+    rawfile slaplte.jinja2 {{ slaplte_template }}
 
 [publish-connection-information]
 <= monitor-publish

software/ors-amarisoft/instance.cfg

@@ -316,7 +316,8 @@ extra-context =
     key lte_expiration amarisoft:lte-expiration
     key enb amarisoft:enb
     key sdr amarisoft:sdr
-    raw gnb_template   ${gnb.jinja2.cfg:target}
+    raw enb_template   ${enb.jinja2.cfg:target}
+    raw slaplte_template ${slaplte.jinja2:target}
     raw drb_nr_template  ${drb_nr.jinja2.cfg:target}
     raw ru_amarisoft_stats_template   ${ru_amarisoft-stats.jinja2.py:target}
     raw ru_amarisoft_rf_info_template   ${ru_amarisoft-rf-info.jinja2.py:target}

software/ors-amarisoft/slapos-render-config.py

@@ -9,8 +9,8 @@ from slapos.recipe.template import jinja2_template
 import json
 
 
-# j2render renders config/<cfg>.jinja2.cfg into config/<cfg>.cfg with provided json parameters.
-def j2render(cfg, jcfg):
+# j2render renders config/<src> into config/<out> with provided json parameters.
+def j2render(src, out, jcfg):
     ctx = json.loads(jcfg)
     assert '_standalone' not in ctx
     ctx['_standalone'] = True
@@ -20,8 +20,8 @@ def j2render(cfg, jcfg):
     buildout = None # stub
     r = jinja2_template.Recipe(buildout, "recipe", {
       'extensions': 'jinja2.ext.do',
-      'url': 'config/{}.jinja2.cfg'.format(cfg),
-      'output': 'config/{}.cfg'.format(cfg),
+      'url': 'config/{}'.format(src),
+      'output': 'config/{}'.format(out),
       'context': textctx,
       'import-list': '''
         rawfile slaplte.jinja2 slaplte.jinja2''',
@@ -34,11 +34,14 @@ def j2render(cfg, jcfg):
             return f.read()
     r._read = _read
 
-    with open('config/{}.cfg'.format(cfg), 'w+') as f:
+    with open('config/{}'.format(out), 'w+') as f:
       f.write(r._render().decode())
 
 
-def do(cfg, slapparameter_dict):
+def do(src, out, rat, slapparameter_dict):
+    assert rat in ('lte', 'nr')
+    jdo_lte = json.dumps(rat == 'lte')
+    jdo_nr  = json.dumps(rat == 'nr')
     jslapparameter_dict = json.dumps(slapparameter_dict)
     json_params_empty = """{
         "rf_mode": 'fdd',
@@ -50,6 +53,8 @@ def do(cfg, slapparameter_dict):
     }"""
     json_params = """{
         "rf_mode": "tdd",
+        "do_lte": %(jdo_lte)s,
+        "do_nr": %(jdo_nr)s,
         "trx": "sdr",
         "bbu": "ors",
         "ru": "ors",
@@ -88,7 +93,7 @@ def do(cfg, slapparameter_dict):
         "slapparameter_dict": %(jslapparameter_dict)s
     }"""
 
-    j2render(cfg, json_params % locals())
+    j2render(src, out, json_params % locals())
 
-do('enb', {"tdd_ul_dl_config": "[Configuration 6] 5ms 5UL 3DL (maximum uplink)"})
-do('gnb', {"tdd_ul_dl_config": "5ms 8UL 1DL 2/10 (maximum uplink)"})
+do('enb.jinja2.cfg', 'enb.cfg', 'lte', {"tdd_ul_dl_config": "[Configuration 6] 5ms 5UL 3DL (maximum uplink)"})
+do('enb.jinja2.cfg', 'gnb.cfg', 'nr',  {"tdd_ul_dl_config": "5ms 8UL 1DL 2/10 (maximum uplink)"})

software/ors-amarisoft/software-base.cfg

@@ -26,7 +26,6 @@ parts +=
   dnsmasq-core-network.jinja2.cfg
   ims.jinja2.cfg
   enb.jinja2.cfg
-  gnb.jinja2.cfg
   ue_db.jinja2.cfg
   ue-lte.jinja2.cfg
   ue-nr.jinja2.cfg
@@ -118,9 +117,6 @@ filename = enb.jinja2.cfg
 [sib23.jinja2.asn]
 <= copy-config-to-instance
 filename = sib23.jinja2.asn
-[gnb.jinja2.cfg]
-<= copy-config-to-instance
-filename = gnb.jinja2.cfg
 [ue_db.jinja2.cfg]
 <= copy-config-to-instance
 filename = ue_db.jinja2.cfg