.

software/ors-amarisoft/buildout.hash.cfg

@@ -92,7 +92,7 @@ md5sum = 6434819165cefda0ed9f9ecd46f39e46
 
 [template-ors-enb]
 _update_hash_filename_ = instance-ors-enb.jinja2.cfg
-md5sum = ce77962cf769d2f47eae13ddab871522
+md5sum = 92e4cece996ce1a3a74e7a944cb05dbf
 
 [template-core-network]
 _update_hash_filename_ = instance-core-network.jinja2.cfg
@@ -112,7 +112,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = 21dc035532687577ebd9090b4ab05926
+md5sum = 6dea4d3f265ee958467ee5f064175577
 
 [drb_lte.jinja2.cfg]
 filename = config/drb_lte.jinja2.cfg
@@ -145,7 +145,7 @@ md5sum = 36281b03597252cf75169417d02fc28c
 
 [ue.jinja2.cfg]
 filename = config/ue.jinja2.cfg
-md5sum = 6cb71d0235f544197917262c9a30dc37
+md5sum = 9bffa00d88ffa57cf1e3b11a24c494b9
 
 [ru_lopcomm_CreateProcessingEle.jinja2.xml]
 _update_hash_filename_ = ru/lopcomm/CreateProcessingEle.jinja2.xml
@@ -153,7 +153,7 @@ md5sum = e435990eb0a0d4be41efa9bd16dce09b
 
 [ru_lopcomm_cu_config.jinja2.xml]
 _update_hash_filename_ = ru/lopcomm/cu_config.jinja2.xml
-md5sum = 0002c7318b16ef37d795908f9ed08945
+md5sum = 274faf246197cbdd4973b772569daa8e
 
 [software.cfg.html]
 _update_hash_filename_ = gadget/software.cfg.html

software/ors-amarisoft/test/test.py

@@ -48,18 +48,22 @@ def yload(path):
 TDD = {'rf_mode': 'tdd'}
 FDD = {'rf_mode': 'fdd'}
 
-# LTE/NR return basic parameters for an LTE/NR cell with given downlink frequency and bandwidth.
-def LTE(dl_earfcn, bandwidth):
+# LTE/NR return basic parameters for an LTE/NR cell with given downlink frequency.
+def LTE(dl_earfcn):
     return {
         'cell_type': 'lte',
         'dl_earfcn': dl_earfcn,
-        'bandwidth': bandwidth,
     }
-def NR(dl_nr_arfcn, nr_band, bandwidth):
+def NR(dl_nr_arfcn, nr_band):
     return {
         'cell_type':    'nr',
         'dl_nr_arfcn':  dl_nr_arfcn,
         'nr_band':      nr_band,
+    }
+
+# BW returns basic parameters to indicate specified bandwidth.
+def BW(bandwidth):
+    return {
         'bandwidth':    bandwidth,
     }
 
@@ -75,14 +79,14 @@ def CENB(cell_id, pci, tac):
 # LTE_PEER/NR_PEER indicate an LTE/NR ENB-PEER-kind cell.
 def LTE_PEER(e_cell_id, pci, tac):
     return {
-        'cell_kind': 'enb_peer'
+        'cell_kind': 'enb_peer',
         'e_cell_id': '0x%05x' % e_cell_id,
         'pci':       pci,
         'tac':       '0x%x' % tac,
     }
 def NR_PEER(nr_cell_id, gnb_id_bits, pci, tac):
     return {
-        'cell_kind': 'enb_peer'
+        'cell_kind': 'enb_peer',
         'nr_cell_id':       '0x77712',
         'gnb_id_bits':      22,
         'pci':              75,
@@ -106,8 +110,8 @@ PEER4 = {
     'xn_addr':      '55.1.1.1',
 }
 
-PEERCELL4 = LTE(700, XXXbandwidth)      | LTE_PEER(0x12345, 35, 0x123)
-PEERCELL5 = NR(520000,38, XXXbandwidth) | NR_PEER(0x77712, 75, 0x321)
+PEERCELL4 = LTE(700)      | LTE_PEER(0x12345, 35, 0x123)
+PEERCELL5 = NR(520000,38) | NR_PEER(0x77712,28, 75, 0x321)
 
 PEERCELL5 = {
     'cell_type':        'nr',
@@ -127,10 +131,10 @@ PEERCELL5 = {
 
 
 # XXX explain CELL_xy ...   XXX goes away
-CELL_4t = LTE(38050,      5) | TDD  # 2600 MHz
-CELL_5t =  NR(523020,41, 10) | TDD  # 2615.1 MHz
-CELL_4f = LTE(3350,       5) | FDD  # 2680 MHz
-CELL_5f =  NR(537200,7,   5) | FDD  # 2686 MHz
+CELL_4t = TDD | LTE(38050)    | BW( 5)  # 2600 MHz
+CELL_5t = TDD | NR(523020,41) | BW(10)  # 2615.1 MHz
+CELL_4f = FDD | LTE(3350)     | BW( 5)  # 2680 MHz
+CELL_5f = FDD |  NR(537200,7) | BW( 5)  # 2686 MHz
 
 
 # XXX doc
@@ -240,10 +244,10 @@ class TestENB_CPRI(ENBTestCase):
             cell.update(kw)
             cls.requestShared(imain, 'LO%d.CELL' % i, cell)
 
-        LO_CELL(1, TDD | LTE(100, 10))
-        LO_CELL(2, FDD | LTE(500, 20))
-        LO_CELL(3, TDD | NR (100, 10))
-        LO_CELL(4, FDD | NR (500, 10))
+        LO_CELL(1, TDD | LTE(100) | BW(10))
+        LO_CELL(2, FDD | LTE(500) | BW(20))
+        LO_CELL(3, TDD | NR (100) | BW(10))
+        LO_CELL(4, FDD | NR (500) | BW(10))
 
         # XXX + sunwave
 

software/ors-amarisoft/test/test.sh

@@ -5,7 +5,7 @@
 export SLAPOS_TEST_DEBUG=1
 export SLAPOS_TEST_VERBOSE=0
 export SLAPOS_TEST_SKIP_SOFTWARE_CHECK=1 
-export SLAPOS_TEST_SKIP_SOFTWARE_REBUILD=1
+export SLAPOS_TEST_SKIP_SOFTWARE_REBUILD=0
 
 rm -rf snapshot
 mkdir snapshot