.

software/ors-amarisoft/README.md

@@ -18,7 +18,7 @@ generated with jinja2 templates with the render-templates script before being pu
  * instance-fdd-enb-input-schema.json
  * software-fdd.cfg
  * software-tdd.cfg.json
- * instance-fdd-ue-nr-input-schema.json
+ * instance-fdd-ue-nr-input-schema.json     XXX kill x-ue
  * instance-tdd-gnb-input-schema.json
  * instance-tdd-ue-nr-input-schema.json
  * test/testFDD.py

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

@@ -363,26 +363,14 @@ class TestCoreNetworkMonitorGadgetUrl(ORSTestCase):
     def test_monitor_gadget_url(self):
       test_monitor_gadget_url(self)
 
-class TestUELTEMonitorGadgetUrl(ORSTestCase):
+class TestUEMonitorGadgetUrl(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"
+        return "ue"
 
     def test_monitor_gadget_url(self):
       test_monitor_gadget_url(self)
@@ -406,7 +394,7 @@ class TestSimCard(ORSTestCase):
     def test_sim_card(self):
         test_sim_card(self)
 
-class TestUELTEParameters(ORSTestCase):
+class TestUELTEParameters(ORSTestCase):     # XXX adjust
     @classmethod
     def getInstanceParameterDict(cls):
         return {'_': json.dumps(param_dict)}
@@ -439,7 +427,7 @@ class TestUELTEParameters(ORSTestCase):
                 if l.startswith('#define N_RB_DL'):
                     self.assertIn('50', l)
 
-class TestUENRParameters(ORSTestCase):
+class TestUENRParameters(ORSTestCase):      # XXX adjust
     @classmethod
     def getInstanceParameterDict(cls):
         return {'_': json.dumps(param_dict)}