software/ors-amarisoft: enb: Move DRB configuration to standalone file

This is preparatory step for multiRU: when there will be several LTE cells,
each possibly having different RF mode, we'll need to configure DRB per-cell.

-> Move DRB configuration to separate jinja2 template to prepare to handle that.

This is 99% movement only, without changing the code for DRB profile. We'll
adjust the DRB profile a bit as another preparatory step in the next patch.

/cc @xavier_thompson, @Daetalus
/reviewed-by @jhuge, @lu.xu
/reviewed-on !1473

software/ors-amarisoft/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = 1e3d2626ffd677ab6d3c078a376c1c7c
+md5sum = 2b12292c66af2bc5b8bf3d5375a4f11c
 
 [amarisoft-stats.jinja2.py]
 _update_hash_filename_ = amarisoft-stats.jinja2.py
@@ -72,7 +72,7 @@ md5sum = 11623b42a0b6271ba0abc8b40e7630e5
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = b93939eb4c924ca41e78cd3db0a2daf0
+md5sum = 516f993bb7835710ba08a0cc592f70d1
 
 [template-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg
@@ -100,7 +100,11 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = 46e326c84ed096909595d56512da0de7
+md5sum = 8bcf0524a89da28a0329ae598165684b
+
+[drb_lte.jinja2.cfg]
+filename = config/drb_lte.jinja2.cfg
+md5sum = f3547d5b183cfa474c934a4a8602be33
 
 [sib23.jinja2.asn]
 filename = config/sib23.jinja2.asn

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

@@ -336,6 +336,11 @@ context =
 url = {{ sib23_template }}
 output = ${directory:etc}/sib23.cfg
 
+[drb-config]
+<= config-base
+url = {{ drb_lte_template }}
+output = ${directory:etc}/drb.cfg
+
 [enb-config]
 <= config-base
 {% if slapparameter_dict.get("enb_config_link", None) %}
@@ -347,6 +352,7 @@ output = ${directory:etc}/enb.cfg
 extra-context =
     json cell_list {{ rulib.cell_list | tojson }}
     key sib23_file sib-config:output
+    key drb_file   drb-config:output
 
 [publish-connection-information]
 <= monitor-publish

software/ors-amarisoft/instance.cfg

@@ -273,6 +273,7 @@ extra-context =
     key enb amarisoft:enb
     key sdr amarisoft:sdr
     raw enb_template   ${enb.jinja2.cfg:target}
+    raw drb_lte_template ${drb_lte.jinja2.cfg:target}
     raw sib23_template   ${sib23.jinja2.asn:target}
     raw amarisoft_stats_template   ${amarisoft-stats.jinja2.py:target}
     raw amarisoft_rf_info_template   ${amarisoft-rf-info.jinja2.py:target}

software/ors-amarisoft/software-base.cfg

@@ -29,6 +29,7 @@ parts +=
   ue_db.jinja2.cfg
   ue-lte.jinja2.cfg
   ue-nr.jinja2.cfg
+  drb_lte.jinja2.cfg
   sib23.jinja2.asn
   monitor-httpd-extra-conf
 # copy all gadget file
@@ -114,6 +115,8 @@ destination =  ${buildout:directory}/gadget/${:_buildout_section_name_}
 [enb.jinja2.cfg]
 <= copy-config-to-instance
 filename = enb.jinja2.cfg
+[drb_lte.jinja2.cfg]
+<= copy-config-to-instance
 [sib23.jinja2.asn]
 <= copy-config-to-instance
 filename = sib23.jinja2.asn