Merge branch 'x/lte-multiru' into xy/lte-multiru

software/ors-amarisoft/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = f1309feb2d86e61f0c542a97594622f9
+md5sum = a3527093ffc01d8f8fbaf27696ad7b9b
 
 [template-ors]
 filename = instance-ors.cfg
@@ -24,11 +24,11 @@ md5sum = f5c76c3443b75569eb18503dce38e783
 
 [slaplte.jinja2]
 _update_hash_filename_ = slaplte.jinja2
-md5sum = 9c1cf42bbf5286f8ddd4e14f19447d30
+md5sum = 55d9182051ce13d07f1bc8e019173ae5
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
-md5sum = 415d002d8f89e11194de24223edb3b02
+md5sum = 21b7f5611c20dc6f29e4e1e456493234
 
 [ru_sdr_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
@@ -88,7 +88,7 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = ebca620d56ccd5d7fb0967da224ea5db
+md5sum = 4f6ef8c1be0751500fbcc4e5ea24debb
 
 [template-ors-enb]
 _update_hash_filename_ = instance-ors-enb.jinja2.cfg
@@ -112,7 +112,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = a0e06192f4f0f2252696a67c5eb902e2
+md5sum = cf51fd760ac1d1b5b0bb622bab1bf541
 
 [drb_lte.jinja2.cfg]
 filename = config/drb_lte.jinja2.cfg

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

@@ -436,7 +436,7 @@
       }
     ],
 
-{#  TODO fully expose lte meas_config_desc in generic #}
+{#  TODO fully expose lte meas_config_desc in generic SR #}
   meas_config_desc: {
     a1_report_type: "rsrp",
     a1_rsrp: -70,
@@ -956,7 +956,7 @@
     cipher_algo_pref: [],
     integ_algo_pref: [2, 1],
 
-{#  TODO fully expose nr meas_config_desc in generic #}
+{#  TODO fully expose nr meas_config_desc in generic SR #}
     meas_config_desc: {
       a1_report_type: "rsrp",
       a1_rsrp: -60,

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

@@ -234,9 +234,8 @@ license-expiration = {{ lte_expiration }}
 monitor-gadget-url = ${:monitor-base-url}/gadget/software.cfg.html
 ru-list   = {{ dumps(rulib.iru_dict.keys()   | sort) }}
 cell-list = {{ dumps(rulib.icell_dict.keys() | sort) }}
-# TODO peer-list peer-cell-list
-peer-list = XXX
-peer-cell-list = XXX
+peer-list = {{ dumps(ipeer_dict.keys()       | sort) }}
+peer-cell-list = {{ dumps(ipeercell_dict.keys() | sort) }}
 
 
 [monitor-instance-parameter]

software/ors-amarisoft/instance.cfg

@@ -34,6 +34,7 @@ context =
     key eggs_directory buildout:eggs-directory
     key develop_eggs_directory buildout:develop-eggs-directory
     raw buildout_directory ${buildout:directory}
+    section directory directory
     raw pythonwitheggs ${pythonwitheggs:exe}
     section slap_connection slap-connection
     key slapparameter_dict slap-configuration:configuration
@@ -146,7 +147,6 @@ extra-context =
     raw monitor_template ${monitor2-template:output}
     section comp_id comp-id
     section slap_configuration slap-configuration
-    section defaults defaults
     key lte_version amarisoft:lte-version
     key lte_expiration amarisoft:lte-expiration
     key enb amarisoft:enb
@@ -237,14 +237,3 @@ output = $${directory:etc}/$${:filename}
 context =
     import json_module json
     key slave_instance_list slap-configuration:slave-instance-list
-
-
-# ----------------------------------------
-
-# XXX temp hack  -> either cell configuration, or other conf(?)
-[defaults]
-lte-imsi = 001010123456789
-lte-k = 00112233445566778899aabbccddeeff
-
-nr-imsi = 001010123456789
-nr-k = 00112233445566778899aabbccddeeff

software/ors-amarisoft/ru/libinstance.jinja2.cfg

@@ -42,6 +42,7 @@
 {{ part('promise-'+name) }}
 <= monitor-promise-base
 name = {{ dumps('%s.py' % pretty_name) }}
+output = {{ dumps('%s/plugin/%s.py' % (directory.etc, pretty_name)) }}
 config-testing = {{ testing }}
 config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
 {%-   endmacro %}

software/ors-amarisoft/slaplte.jinja2

@@ -15,7 +15,6 @@
     it should be kept in sync with "default" in json schemas
 
     TODO automatically load defaults from JSON schemas  #}
-{#- XXX opc='milenage' is not meaningful ?  #}
 {#- XXX add inactivity timer to cell schemas #}
 {%- set defaults = {
       'ru': {

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

@@ -201,7 +201,7 @@ def iRU2_LOPCOMM_fLTE_fNR(ienb):
     RU1 = {
         'ru_type':      'lopcomm',
         'ru_link_type': 'cpri',
-        'mac_addr':     'XXX',
+        'mac_addr':     '00:00:00:00:00:01',
         'cpri_link':    {
             'sdr_dev':  2,
             'sfp_port': 0,
@@ -218,7 +218,7 @@ def iRU2_LOPCOMM_fLTE_fNR(ienb):
     }
 
     RU2 = copy.deepcopy(RU1)
-    RU2['mac_addr'] = 'YYY'
+    RU2['mac_addr'] = '00:00:00:00:00:02'
     RU2['cpri_link']['sfp_port'] = 1
     RU2['tx_gain'] += 10
     RU2['rx_gain'] += 10
@@ -304,7 +304,7 @@ def iRU2_LOPCOMM_fLTE2(ienb):
     RU_0002 = {
         'ru_type':      'lopcomm',
         'ru_link_type': 'cpri',
-#       'mac_addr':     'XXX',
+        'mac_addr':     '00:00:00:00:00:01',
         'cpri_link':    {
             'sdr_dev':  0,
             'sfp_port': 0,
@@ -322,7 +322,7 @@ def iRU2_LOPCOMM_fLTE2(ienb):
 
     # supports: 2110 - 2170 MHz
     RU_0004 = copy.deepcopy(RU_0002)
-#   RU_0004['mac_addr'] = 'YYY'
+    RU_0004['mac_addr'] = '00:00:00:00:00:04'
     RU_0004['cpri_link']['sfp_port'] = 1
 
     if 1:

software/ors-amarisoft/software-base.cfg

@@ -157,8 +157,6 @@ recipe = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/kirr/xlte.git
 revision = 8e606c64
 git-executable = ${git:location}/bin/git
-# XXX temp (speedup build)
-develop = true
 
 [xlte]
 recipe = zc.recipe.egg:develop