software/ors-amarisoft: ue: Don't run UEsim tests in ORS mode

ORS does not support UEsim as indicated by `if bbu != ors` in software.cfg.json.jinja2.

Amends f3f1cb46 (software/ors-amarisoft: Start to introduce ORS mode) because
that patch started to really reject instantiating ue-* on ORS.

software/ors-amarisoft/test/test.jinja2.py

@@ -356,6 +356,7 @@ class TestCoreNetworkMonitorGadgetUrl(ORSTestCase):
     def test_monitor_gadget_url(self):
       test_monitor_gadget_url(self)
 
+{% if bbu != 'ors' %}
 class TestUELTEMonitorGadgetUrl(ORSTestCase):
     @classmethod
     def getInstanceParameterDict(cls):
@@ -379,6 +380,7 @@ class TestUENRMonitorGadgetUrl(ORSTestCase):
 
     def test_monitor_gadget_url(self):
       test_monitor_gadget_url(self)
+{% endif %}
 
 class TestSimCard(ORSTestCase):
     @classmethod
@@ -399,6 +401,7 @@ class TestSimCard(ORSTestCase):
     def test_sim_card(self):
         test_sim_card(self)
 
+{% if bbu != 'ors' %}
 class TestUELTEParameters(ORSTestCase):
     @classmethod
     def getInstanceParameterDict(cls):
@@ -456,4 +459,4 @@ class TestUENRParameters(ORSTestCase):
         self.assertEqual(conf['ue_list'][0]['impi'], param_dict['impi'])
         self.assertEqual(conf['tx_gain'], param_dict['tx_gain'])
         self.assertEqual(conf['rx_gain'], param_dict['rx_gain'])
-
+{% endif %}

software/ors-amarisoft/test/testFDD-LOPCOMM.py

@@ -352,6 +352,7 @@ class TestCoreNetworkMonitorGadgetUrl(ORSTestCase):
     def test_monitor_gadget_url(self):
       test_monitor_gadget_url(self)
 
+
 class TestUELTEMonitorGadgetUrl(ORSTestCase):
     @classmethod
     def getInstanceParameterDict(cls):
@@ -376,6 +377,7 @@ class TestUENRMonitorGadgetUrl(ORSTestCase):
     def test_monitor_gadget_url(self):
       test_monitor_gadget_url(self)
 
+
 class TestSimCard(ORSTestCase):
     @classmethod
     def requestDefaultInstance(cls, state='started'):
@@ -395,6 +397,7 @@ class TestSimCard(ORSTestCase):
     def test_sim_card(self):
         test_sim_card(self)
 
+
 class TestUELTEParameters(ORSTestCase):
     @classmethod
     def getInstanceParameterDict(cls):

software/ors-amarisoft/test/testFDD-ORS.py

@@ -352,29 +352,7 @@ class TestCoreNetworkMonitorGadgetUrl(ORSTestCase):
     def test_monitor_gadget_url(self):
       test_monitor_gadget_url(self)
 
-class TestUELTEMonitorGadgetUrl(ORSTestCase):
-    @classmethod
-    def getInstanceParameterDict(cls):
-        return {'_': json.dumps({'testing': True})}
-
-    @classmethod
-    def getInstanceSoftwareType(cls):
-        return "ue-lte"
-
-    def test_monitor_gadget_url(self):
-      test_monitor_gadget_url(self)
 
-class TestUENRMonitorGadgetUrl(ORSTestCase):
-    @classmethod
-    def getInstanceParameterDict(cls):
-        return {'_': json.dumps({'testing': True})}
-
-    @classmethod
-    def getInstanceSoftwareType(cls):
-        return "ue-nr"
-
-    def test_monitor_gadget_url(self):
-      test_monitor_gadget_url(self)
 
 class TestSimCard(ORSTestCase):
     @classmethod
@@ -395,61 +373,4 @@ class TestSimCard(ORSTestCase):
     def test_sim_card(self):
         test_sim_card(self)
 
-class TestUELTEParameters(ORSTestCase):
-    @classmethod
-    def getInstanceParameterDict(cls):
-        return {'_': json.dumps(param_dict)}
-    @classmethod
-    def getInstanceSoftwareType(cls):
-        return "ue-lte"
-    def test_ue_lte_conf(self):
-        conf_file = glob.glob(os.path.join(
-          self.slap.instance_directory, '*', 'etc', 'ue.cfg'))[0]
-
-        conf = yamlpp_load(conf_file)
-        self.assertEqual(conf['cell_groups'][0]['cells'][0]['dl_earfcn'], param_dict['dl_earfcn'])
-        self.assertEqual(conf['cell_groups'][0]['cells'][0]['bandwidth'], 10)
-        self.assertEqual(conf['cell_groups'][0]['cells'][0]['n_antenna_dl'], param_dict['n_antenna_dl'])
-        self.assertEqual(conf['cell_groups'][0]['cells'][0]['n_antenna_ul'], param_dict['n_antenna_ul'])
-        self.assertEqual(conf['ue_list'][0]['rue_addr'], param_dict['rue_addr'])
-        self.assertEqual(conf['ue_list'][0]['imsi'], param_dict['imsi'])
-        self.assertEqual(conf['ue_list'][0]['K'], param_dict['k'])
-        self.assertEqual(conf['ue_list'][0]['sim_algo'], param_dict['sim_algo'])
-        self.assertEqual(conf['ue_list'][0]['opc'], param_dict['opc'])
-        self.assertEqual(conf['ue_list'][0]['amf'], int(param_dict['amf'], 16))
-        self.assertEqual(conf['ue_list'][0]['sqn'], param_dict['sqn'])
-        self.assertEqual(conf['ue_list'][0]['impu'], param_dict['impu'])
-        self.assertEqual(conf['ue_list'][0]['impi'], param_dict['impi'])
-        self.assertEqual(conf['tx_gain'], param_dict['tx_gain'])
-        self.assertEqual(conf['rx_gain'], param_dict['rx_gain'])
-
-class TestUENRParameters(ORSTestCase):
-    @classmethod
-    def getInstanceParameterDict(cls):
-        return {'_': json.dumps(param_dict)}
-    @classmethod
-    def getInstanceSoftwareType(cls):
-        return "ue-nr"
-    def test_ue_nr_conf(self):
-        conf_file = glob.glob(os.path.join(
-          self.slap.instance_directory, '*', 'etc', 'ue.cfg'))[0]
-
-        conf = yamlpp_load(conf_file)
-        self.assertEqual(conf['cell_groups'][0]['cells'][0]['ssb_nr_arfcn'], param_dict['ssb_nr_arfcn'])
-        self.assertEqual(conf['cell_groups'][0]['cells'][0]['dl_nr_arfcn'], param_dict['dl_nr_arfcn'])
-        self.assertEqual(conf['cell_groups'][0]['cells'][0]['bandwidth'], '10 MHz')
-        self.assertEqual(conf['cell_groups'][0]['cells'][0]['band'], param_dict['nr_band'])
-        self.assertEqual(conf['cell_groups'][0]['cells'][0]['n_antenna_dl'], param_dict['n_antenna_dl'])
-        self.assertEqual(conf['cell_groups'][0]['cells'][0]['n_antenna_ul'], param_dict['n_antenna_ul'])
-        self.assertEqual(conf['ue_list'][0]['rue_addr'], param_dict['rue_addr'])
-        self.assertEqual(conf['ue_list'][0]['imsi'], param_dict['imsi'])
-        self.assertEqual(conf['ue_list'][0]['K'], param_dict['k'])
-        self.assertEqual(conf['ue_list'][0]['sim_algo'], param_dict['sim_algo'])
-        self.assertEqual(conf['ue_list'][0]['opc'], param_dict['opc'])
-        self.assertEqual(conf['ue_list'][0]['amf'], int(param_dict['amf'], 16))
-        self.assertEqual(conf['ue_list'][0]['sqn'], param_dict['sqn'])
-        self.assertEqual(conf['ue_list'][0]['impu'], param_dict['impu'])
-        self.assertEqual(conf['ue_list'][0]['impi'], param_dict['impi'])
-        self.assertEqual(conf['tx_gain'], param_dict['tx_gain'])
-        self.assertEqual(conf['rx_gain'], param_dict['rx_gain'])
 

software/ors-amarisoft/test/testFDD.py

@@ -352,6 +352,7 @@ class TestCoreNetworkMonitorGadgetUrl(ORSTestCase):
     def test_monitor_gadget_url(self):
       test_monitor_gadget_url(self)
 
+
 class TestUELTEMonitorGadgetUrl(ORSTestCase):
     @classmethod
     def getInstanceParameterDict(cls):
@@ -376,6 +377,7 @@ class TestUENRMonitorGadgetUrl(ORSTestCase):
     def test_monitor_gadget_url(self):
       test_monitor_gadget_url(self)
 
+
 class TestSimCard(ORSTestCase):
     @classmethod
     def requestDefaultInstance(cls, state='started'):
@@ -395,6 +397,7 @@ class TestSimCard(ORSTestCase):
     def test_sim_card(self):
         test_sim_card(self)
 
+
 class TestUELTEParameters(ORSTestCase):
     @classmethod
     def getInstanceParameterDict(cls):

software/ors-amarisoft/test/testTDD-M2RU.py

@@ -352,6 +352,7 @@ class TestCoreNetworkMonitorGadgetUrl(ORSTestCase):
     def test_monitor_gadget_url(self):
       test_monitor_gadget_url(self)
 
+
 class TestUELTEMonitorGadgetUrl(ORSTestCase):
     @classmethod
     def getInstanceParameterDict(cls):
@@ -376,6 +377,7 @@ class TestUENRMonitorGadgetUrl(ORSTestCase):
     def test_monitor_gadget_url(self):
       test_monitor_gadget_url(self)
 
+
 class TestSimCard(ORSTestCase):
     @classmethod
     def requestDefaultInstance(cls, state='started'):
@@ -395,6 +397,7 @@ class TestSimCard(ORSTestCase):
     def test_sim_card(self):
         test_sim_card(self)
 
+
 class TestUELTEParameters(ORSTestCase):
     @classmethod
     def getInstanceParameterDict(cls):

software/ors-amarisoft/test/testTDD-ORS.py

@@ -352,29 +352,7 @@ class TestCoreNetworkMonitorGadgetUrl(ORSTestCase):
     def test_monitor_gadget_url(self):
       test_monitor_gadget_url(self)
 
-class TestUELTEMonitorGadgetUrl(ORSTestCase):
-    @classmethod
-    def getInstanceParameterDict(cls):
-        return {'_': json.dumps({'testing': True})}
-
-    @classmethod
-    def getInstanceSoftwareType(cls):
-        return "ue-lte"
-
-    def test_monitor_gadget_url(self):
-      test_monitor_gadget_url(self)
 
-class TestUENRMonitorGadgetUrl(ORSTestCase):
-    @classmethod
-    def getInstanceParameterDict(cls):
-        return {'_': json.dumps({'testing': True})}
-
-    @classmethod
-    def getInstanceSoftwareType(cls):
-        return "ue-nr"
-
-    def test_monitor_gadget_url(self):
-      test_monitor_gadget_url(self)
 
 class TestSimCard(ORSTestCase):
     @classmethod
@@ -395,61 +373,4 @@ class TestSimCard(ORSTestCase):
     def test_sim_card(self):
         test_sim_card(self)
 
-class TestUELTEParameters(ORSTestCase):
-    @classmethod
-    def getInstanceParameterDict(cls):
-        return {'_': json.dumps(param_dict)}
-    @classmethod
-    def getInstanceSoftwareType(cls):
-        return "ue-lte"
-    def test_ue_lte_conf(self):
-        conf_file = glob.glob(os.path.join(
-          self.slap.instance_directory, '*', 'etc', 'ue.cfg'))[0]
-
-        conf = yamlpp_load(conf_file)
-        self.assertEqual(conf['cell_groups'][0]['cells'][0]['dl_earfcn'], param_dict['dl_earfcn'])
-        self.assertEqual(conf['cell_groups'][0]['cells'][0]['bandwidth'], 10)
-        self.assertEqual(conf['cell_groups'][0]['cells'][0]['n_antenna_dl'], param_dict['n_antenna_dl'])
-        self.assertEqual(conf['cell_groups'][0]['cells'][0]['n_antenna_ul'], param_dict['n_antenna_ul'])
-        self.assertEqual(conf['ue_list'][0]['rue_addr'], param_dict['rue_addr'])
-        self.assertEqual(conf['ue_list'][0]['imsi'], param_dict['imsi'])
-        self.assertEqual(conf['ue_list'][0]['K'], param_dict['k'])
-        self.assertEqual(conf['ue_list'][0]['sim_algo'], param_dict['sim_algo'])
-        self.assertEqual(conf['ue_list'][0]['opc'], param_dict['opc'])
-        self.assertEqual(conf['ue_list'][0]['amf'], int(param_dict['amf'], 16))
-        self.assertEqual(conf['ue_list'][0]['sqn'], param_dict['sqn'])
-        self.assertEqual(conf['ue_list'][0]['impu'], param_dict['impu'])
-        self.assertEqual(conf['ue_list'][0]['impi'], param_dict['impi'])
-        self.assertEqual(conf['tx_gain'], param_dict['tx_gain'])
-        self.assertEqual(conf['rx_gain'], param_dict['rx_gain'])
-
-class TestUENRParameters(ORSTestCase):
-    @classmethod
-    def getInstanceParameterDict(cls):
-        return {'_': json.dumps(param_dict)}
-    @classmethod
-    def getInstanceSoftwareType(cls):
-        return "ue-nr"
-    def test_ue_nr_conf(self):
-        conf_file = glob.glob(os.path.join(
-          self.slap.instance_directory, '*', 'etc', 'ue.cfg'))[0]
-
-        conf = yamlpp_load(conf_file)
-        self.assertEqual(conf['cell_groups'][0]['cells'][0]['ssb_nr_arfcn'], param_dict['ssb_nr_arfcn'])
-        self.assertEqual(conf['cell_groups'][0]['cells'][0]['dl_nr_arfcn'], param_dict['dl_nr_arfcn'])
-        self.assertEqual(conf['cell_groups'][0]['cells'][0]['bandwidth'], '10 MHz')
-        self.assertEqual(conf['cell_groups'][0]['cells'][0]['band'], param_dict['nr_band'])
-        self.assertEqual(conf['cell_groups'][0]['cells'][0]['n_antenna_dl'], param_dict['n_antenna_dl'])
-        self.assertEqual(conf['cell_groups'][0]['cells'][0]['n_antenna_ul'], param_dict['n_antenna_ul'])
-        self.assertEqual(conf['ue_list'][0]['rue_addr'], param_dict['rue_addr'])
-        self.assertEqual(conf['ue_list'][0]['imsi'], param_dict['imsi'])
-        self.assertEqual(conf['ue_list'][0]['K'], param_dict['k'])
-        self.assertEqual(conf['ue_list'][0]['sim_algo'], param_dict['sim_algo'])
-        self.assertEqual(conf['ue_list'][0]['opc'], param_dict['opc'])
-        self.assertEqual(conf['ue_list'][0]['amf'], int(param_dict['amf'], 16))
-        self.assertEqual(conf['ue_list'][0]['sqn'], param_dict['sqn'])
-        self.assertEqual(conf['ue_list'][0]['impu'], param_dict['impu'])
-        self.assertEqual(conf['ue_list'][0]['impi'], param_dict['impi'])
-        self.assertEqual(conf['tx_gain'], param_dict['tx_gain'])
-        self.assertEqual(conf['rx_gain'], param_dict['rx_gain'])
 

software/ors-amarisoft/test/testTDD.py

@@ -352,6 +352,7 @@ class TestCoreNetworkMonitorGadgetUrl(ORSTestCase):
     def test_monitor_gadget_url(self):
       test_monitor_gadget_url(self)
 
+
 class TestUELTEMonitorGadgetUrl(ORSTestCase):
     @classmethod
     def getInstanceParameterDict(cls):
@@ -376,6 +377,7 @@ class TestUENRMonitorGadgetUrl(ORSTestCase):
     def test_monitor_gadget_url(self):
       test_monitor_gadget_url(self)
 
+
 class TestSimCard(ORSTestCase):
     @classmethod
     def requestDefaultInstance(cls, state='started'):
@@ -395,6 +397,7 @@ class TestSimCard(ORSTestCase):
     def test_sim_card(self):
         test_sim_card(self)
 
+
 class TestUELTEParameters(ORSTestCase):
     @classmethod
     def getInstanceParameterDict(cls):