wip

software/ors-amarisoft/buildout.hash.cfg

@@ -100,7 +100,7 @@ md5sum = f4389a92fb111447e7976e452db78607
 
 [template-core-network]
 _update_hash_filename_ = instance-core-network.jinja2.cfg
-md5sum = dab992c02a363e00cdc86f102a7ae489
+md5sum = 69e2d7a37b3041b3540a16173c5aa340
 
 [template-ue]
 _update_hash_filename_ = instance-ue.jinja2.cfg
@@ -112,7 +112,7 @@ md5sum = c5f581ba01654b2aec46000abf8d0e35
 
 [ue_db.jinja2.cfg]
 filename = config/ue_db.jinja2.cfg
-md5sum = 29cacd22b4242d12192ec61f3a44ea46
+md5sum = bdc34f0efd64eb45feae41893656467d
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg

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

@@ -14,7 +14,7 @@ ue_db: [
     K: "{{ s.get('k', '') }}",
     impu: "{{ s.get('impu', '') }}",
     impi: "{{ s.get('impi', '') }}",
-{%- if "ip" in s or slapparameter_dict.get('enable_multicast', False) or slapparameter_dict.get('enable_ipv6_multicast', False) or "routes" in s %}
+{%- if "ip" in s or slapparameter_dict.get('enable_multicast', False) or slapparameter_dict.get('enable_ipv6_multicast', False) or s.get('route_list', False) %}
     pdn_list:[{
       access_point_name: "internet",
       default: true,
@@ -30,13 +30,13 @@ ue_db: [
 {%-   if slapparameter_dict.get('enable_broadcast', False) %}
       broadcast: True,
 {%-   endif %}
-{%-   if "routes" in s %}
+{%-   if s.get('route_list', False) %}
       routes: [
-{%-     for route in s['routes'] %}
+{%-     for _, route in s.route_list |dictsort %}
         [
           {
-            ipv6_remote_addr_prefix: s['routes']['ipv6_remote_addr_prefix'],
-            prefix_len: s['routes']['prefix_len'],
+            ipv6_remote_addr_prefix: {{ route['ipv6_remote_addr_prefix'] }},
+            prefix_len: {{ route['prefix_len'] }},
           }
         ],
 {%-     endfor -%}

software/ors-amarisoft/instance-core-network.jinja2.cfg

@@ -261,7 +261,7 @@ output = ${directory:etc}/mt_call_qos.sdp
 <= config-base
 url = {{ ue_db_template }}
 output = ${directory:etc}/ue_db.cfg
-context =
+extra-context =
   section slap_configuration slap-configuration
   import json_module json