.

software/ors-amarisoft/buildout.hash.cfg

@@ -28,7 +28,7 @@ md5sum = 8c044b28682940fbca62657c16613157
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
-md5sum = 4c33145d2b7dd0299d1f64d46dfa3e66
+md5sum = 3596f6d581c06c05506120474ef903ca
 
 [ru_sdr_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg

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

@@ -149,7 +149,7 @@ context =
 {{ part('dnsmasq-service') }}
 recipe = slapos.cookbook:wrapper
 port = 5353
-ip = ${slap-configuration:tun-ipv4-addr}
+#ip = ${slap-configuration:tun-ipv4-addr}
 command-line = {{ dnsmasq_location }}/sbin/dnsmasq --conf-file=${dnsmasq-config:output} -x ${directory:run}/dnsmasq.pid --local-service --keep-in-foreground
 wrapper-path = ${directory:service}/dnsmasq
 mode = 0775

software/ors-amarisoft/test/test.py

@@ -139,8 +139,11 @@ class ENBTestCase(AmariTestCase):
     @classmethod
     def getInstanceParameterDict(cls):
         return {'_': json.dumps({
-            'testing': True,
-        })}    # XXX + enb_id, gnb_id
+            'testing':      True,
+            'enb_id':       '0x17',
+            'gnb_id':       '0x23',
+            'gnb_id_bits':  30,
+        })}
 
     # XXX + generic test that verifies ^^^ to be rendered into enb.cfg
 
@@ -222,9 +225,9 @@ class TestENB_CPRI(ENBTestCase):
                 'txrx_active':  'INACTIVE',
             }
         cls.requestShared(imain, 'LO1', LO(1))
-        cls.requestShared(imain, 'LO2', LO(2))
-        cls.requestShared(imain, 'LO3', LO(3))
-        cls.requestShared(imain, 'LO4', LO(4))
+        #cls.requestShared(imain, 'LO2', LO(2))
+        #cls.requestShared(imain, 'LO3', LO(3))
+        #cls.requestShared(imain, 'LO4', LO(4))
 
         def LO_CELL(i, ctx):
             cell = {
@@ -238,9 +241,9 @@ class TestENB_CPRI(ENBTestCase):
             cls.requestShared(imain, 'LO%d.CELL' % i, cell)
 
         LO_CELL(1, FDD | LTE(   100)    | BW(10))
-        LO_CELL(2, TDD | LTE( 36100)    | BW(10))
-        LO_CELL(3, FDD | NR (430100, 1) | BW(10))
-        LO_CELL(4, TDD | NR (510100,41) | BW(10))
+        #LO_CELL(2, TDD | LTE( 36100)    | BW(10))
+        #LO_CELL(3, FDD | NR (430100, 1) | BW(10))
+        #LO_CELL(4, TDD | NR (510100,41) | BW(10))
 
         # XXX + sunwave
 

software/ors-amarisoft/test/test_ors.py

@@ -65,7 +65,7 @@ param_dict = {
     'nr_band': 34,
     'nr_bandwidth': 50,
     'ssb_nr_arfcn': 403520,
-    'rue_addr': '192.168.99.88',
+#   'rue_addr': '192.168.99.88',
     'n_antenna_dl': 2,
     'n_antenna_ul': 2,
     'inactivity_timer': 17,