software/ors-amarisoft: use local IP for GTP when no external MME

software/ors-amarisoft/buildout.hash.cfg

@@ -20,7 +20,7 @@ md5sum = 6ea4fa210a91c15278c847a809de5991
 
 [template-lte-enb-epc]
 _update_hash_filename_ = instance-enb-epc.jinja2.cfg
-md5sum = 25fae79db2b30be0f365ad967b278c3c
+md5sum = cf6c400d9fa5b0942f9be7145f77b8de
 
 [template-lte-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
@@ -28,7 +28,7 @@ md5sum = fe249168a3f50b0efe6aeae39afb03ae
 
 [template-lte-gnb-epc]
 _update_hash_filename_ = instance-gnb-epc.jinja2.cfg
-md5sum = 5ec4508b02f6e7fbdbe1f37c65b9d897
+md5sum = f94c3e2f714629d9e1fc9b2f7c8eb586
 
 [template-lte-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg
@@ -44,11 +44,11 @@ md5sum = d33163012d6c98efc59161974c649557
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = 97d9cdd07704cae36c5e4234c87025e8
+md5sum = 8cac0de54f54236e750ee85b98de8a31
 
 [gnb.jinja2.cfg]
 filename = config/gnb.jinja2.cfg
-md5sum = b0df7f3b679b25d5296dd67e074364b4
+md5sum = 28cc9fc7b1fa7cccb16315a732d9a15f
 
 [ltelogs.jinja2.sh]
 filename = ltelogs.jinja2.sh

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

@@ -61,7 +61,11 @@
   ],
   /* GTP bind address (=address of the ethernet interface connected to
      the MME). Must be modified if the MME runs on a different host. */
+{% if slapparameter_dict.get('mme_addr', '') %}
   gtp_addr: "{{ gtp_addr }}",
+{% else %}
+  gtp_addr: "127.0.1.1",
+{% endif %}
 
   /* high 20 bits of SIB1.cellIdentifier */
   enb_id: {{ slapparameter_dict.get('enb_id', '0x1A2D0') }},

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

@@ -42,7 +42,11 @@
   ],
   /* GTP bind address (=address of the ethernet interface connected to
      the AMF). Must be modified if the AMF runs on a different host. */
+{% if slapparameter_dict.get('mme_addr', '') %}
   gtp_addr: "{{ gtp_addr }}",
+{% else %}
+  gtp_addr: "127.0.1.1",
+{% endif %}
 
   gnb_id_bits: 28,
   gnb_id: {{ slapparameter_dict.get('gnb_id', '0x12345') }},

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

@@ -70,6 +70,12 @@ config-dl_earfcn = {{ dumps(slapparameter_dict["dl_earfcn"]) }}
 {% if slapparameter_dict.get("n_rb_dl", None) %}
 config-n_rb_dl = {{ dumps(slapparameter_dict["n_rb_dl"]) }}
 {% endif %}
+{% if slapparameter_dict.get("mme_addr", None) %}
+config-mme_addr = {{ dumps(slapparameter_dict["mme_addr"]) }}
+{% endif %}
+{% if slapparameter_dict.get("enb_id", None) %}
+config-enb_id = {{ dumps(slapparameter_dict["enb_id"]) }}
+{% endif %}
 
 [monitor-base-url-dict]
 lte-epc-request =  ${lte-epc-request:connection-monitor-base-url}

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

@@ -73,6 +73,12 @@ config-nr_band = {{ dumps(slapparameter_dict["nr_band"]) }}
 {% if slapparameter_dict.get("nr_bandwidth", None) %}
 config-nr_bandwidth = {{ dumps(slapparameter_dict["nr_bandwidth"]) }}
 {% endif %}
+{% if slapparameter_dict.get("mme_addr", None) %}
+config-mme_addr = {{ dumps(slapparameter_dict["mme_addr"]) }}
+{% endif %}
+{% if slapparameter_dict.get("enb_id", None) %}
+config-enb_id = {{ dumps(slapparameter_dict["enb_id"]) }}
+{% endif %}
 
 [monitor-base-url-dict]
 lte-epc-request =  ${lte-epc-request:connection-monitor-base-url}