.

software/ors-amarisoft/amari/slap.jinja2

@@ -4,6 +4,48 @@
     XXX see also amari/lte for ...
 -#}
 
+
+{#- defaults provide default values for lte parameters.
+    it should be kept in sync with "default" in json schemas  #}
+{#- XXX ssb_pos_bitmap=10000000 is for TDD only; FDD -> "1000"  #}
+{#- XXX opc='milenage' is not meaningful ?  #}
+{%- set defaults = {
+      'enb_id': '0x1A2D0',
+      'gnb_id': '0x12345',
+      'gnb_id_bits': 28,
+
+      'cell/lte': {
+        'pci':  1,
+        'tac':  "0x0001",
+        'tdd_ul_dl_config': '[Configuration 2] 5ms 2UL 6DL (default)',
+      },
+      'cell/nr': {
+        'pci':  500,
+        'ssb_pos_bitmap':   '10000000',
+        'tdd_ul_dl_config': '5ms 2UL 7DL 4/6 (default)',
+      },
+      'cpri_link': {
+        'mapping': 'hw',
+        'mult':     16,
+        'rx_delay':  0,
+        'tx_delay':  0,
+        'tx_dbm':    0,
+      },
+
+      'ue': {
+        'sim_algo': 'milenage',
+        'opc':      'milenage',
+        'amf':      '0x9001',
+        'sqn':      '000000000000',
+        'impu':     '',
+        'impi':     '',
+        'imsi':     '001010123456789',
+        'k':        '00112233445566778899aabbccddeeff',
+      }
+    }
+%}
+
+
 {#- J is used around macro calls to retrieve returned objects.
 
     It is needed to workaround jinja2 limitation that macro can return only

software/ors-amarisoft/buildout.hash.cfg

@@ -24,7 +24,7 @@ md5sum = ddee326ec6f0612c48b301f9b0913f44
 
 [amari_slap.jinja2]
 _update_hash_filename_ = amari/slap.jinja2
-md5sum = 80d71929033fd5d27708cb364f960f05
+md5sum = bdaf4f827fb1456513a2b9322f14dcfc
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
@@ -84,7 +84,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = 9284afa98485ee4c81fa10c4e2a05d8a
+md5sum = cdbd534a064f3f948845eadb2c2b786e
 
 [sib23.jinja2.asn]
 filename = config/sib23.jinja2.asn
@@ -112,7 +112,7 @@ md5sum = 36281b03597252cf75169417d02fc28c
 
 [ue.jinja2.cfg]
 filename = config/ue.jinja2.cfg
-md5sum = 0a780e55ea53b1dc4850237c651adc43
+md5sum = 8cdf69739dd573259eba0f952e7085a6
 
 [CreateProcessingEle.jinja2.xml]
 filename = netconf/CreateProcessingEle.jinja2.xml

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

@@ -2,34 +2,6 @@
 {#- XXX icell vs cell / iru vs ru everyhere + document it #}
 {#- XXX TDD check   #}
 
-{#- defaults provide default values for enb parameters.
-    it should be kept in sync with "default" in json schemas  #}
-{#- XXX ssb_pos_bitmap=10000000 is for TDD only; FDD -> "1000"  #}
-{%- set defaults = {
-      'enb_id': '0x1A2D0',
-      'gnb_id': '0x12345',
-      'gnb_id_bits': 28,
-
-      'cell/lte': {
-        'pci':  1,
-        'tac':  "0x0001",
-        'tdd_ul_dl_config': '[Configuration 2] 5ms 2UL 6DL (default)',
-      },
-      'cell/nr': {
-        'pci':  500,
-        'ssb_pos_bitmap':   '10000000',
-        'tdd_ul_dl_config': '5ms 2UL 7DL 4/6 (default)',
-      },
-      'cpri_link': {
-        'mapping': 'hw',
-        'mult':     16,
-        'rx_delay':  0,
-        'tx_delay':  0,
-        'tx_dbm':    0,
-      }
-    }
-%}
-
 {#- cfg returns value of configuration parameter name #}  // XXX -> amari ?
 {%- macro cfg(name)     %}
 {{- slapparameter_dict.get(name, defaults.get(name)) }}

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

-{#- defaults provide default values for parameters.
-    it should be kept in sync with "default" in json schemas  #}
-{#- XXX opc='milenage' is not meaningful ?  #}
-{%- set defaults = {
-      'ue': {
-        'sim_algo': 'milenage',
-        'opc':      'milenage',
-        'amf':      '0x9001',
-        'sqn':      '000000000000',
-        'impu':     '',
-        'impi':     '',
-        'imsi':     '001010123456789',
-        'k':        '00112233445566778899aabbccddeeff',
-      }
-    }
-%}
-
 {%- import 'amari_lte.jinja2' as lte  with context -%}
 {%- set iru_dict        = lte.iru_dict %}
 {%- set icell_dict      = lte.icell_dict %}