software/ors-amarisoft: test: Factor loading YAML config into dedicated function

We are going to do fixes and enhancements to YAML loading processes. Move
corresponding code to one place before that as the preparatory step.

Place new utility in new test/test.py file - with MultiRU that will be the
place for tests of generic mode and test.jinja2.py, which will be renamed to
test_ors.py, will be using utilities from there. So place the utility into new
place from the start.

/cc @jhuge, @lu.xu, @tomo, @xavier_thompson, @Daetalus
/proposed-for-review-on nexedi/slapos!1526
/reviewed-by TrustMe

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

@@ -26,11 +26,12 @@
 ##############################################################################
 
 import os
-import yaml
 import json
 import glob
 import requests
 
+from test import yaml_load
+
 from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
 
 setUpModule, ORSTestCase = makeModuleSetUpAndTestCaseClass(
@@ -140,8 +141,7 @@ def test_enb_conf(self):
     conf_file = glob.glob(os.path.join(
       self.slap.instance_directory, '*', 'etc', 'enb.cfg'))[0]
 
-    with open(conf_file, 'r') as f:
-        conf = yaml.load(f)
+    conf = yaml_load(conf_file)
     if 'tx_gain' in conf and 'rx_gain' in conf:
       self.assertEqual(conf['tx_gain'], enb_param_dict['tx_gain'])
       self.assertEqual(conf['rx_gain'], enb_param_dict['rx_gain'])
@@ -179,8 +179,7 @@ def test_gnb_conf1(self):
         conf_file = glob.glob(os.path.join(
           self.slap.instance_directory, '*', 'etc', 'enb.cfg'))[0]
 
-        with open(conf_file, 'r') as f:
-            conf = yaml.load(f)
+        conf = yaml_load(conf_file)
         if 'tx_gain' in conf and 'rx_gain' in conf:
             self.assertEqual(conf['tx_gain'], gnb_param_dict1['tx_gain'])
             self.assertEqual(conf['rx_gain'], gnb_param_dict1['rx_gain'])
@@ -224,8 +223,7 @@ def test_gnb_conf2(self):
         conf_file = glob.glob(os.path.join(
           self.slap.instance_directory, '*', 'etc', 'enb.cfg'))[0]
 
-        with open(conf_file, 'r') as f:
-            conf = yaml.load(f)
+        conf = yaml_load(conf_file)
 
         for p in conf['nr_cell_default']['plmn_list'][0]['nssai']:
           sd = hex(p['sd'])
@@ -237,8 +235,7 @@ def test_mme_conf(self):
     conf_file = glob.glob(os.path.join(
       self.slap.instance_directory, '*', 'etc', 'mme.cfg'))[0]
 
-    with open(conf_file, 'r') as f:
-        conf = yaml.load(f)
+    conf = yaml_load(conf_file)
     self.assertEqual(conf['plmn'], param_dict['core_network_plmn'])
 
 def test_sim_card(self):
@@ -246,8 +243,7 @@ def test_sim_card(self):
     conf_file = glob.glob(os.path.join(
       self.slap.instance_directory, '*', 'etc', 'ue_db.cfg'))[0]
 
-    with open(conf_file, 'r') as f:
-        conf = yaml.load(f)
+    conf = yaml_load(conf_file)
     for n in "sim_algo imsi opc sqn impu impi".split():
         self.assertEqual(conf['ue_db'][0][n], param_dict[n])
     self.assertEqual(conf['ue_db'][0]['K'], param_dict['k'])
@@ -414,8 +410,7 @@ class TestUELTEParameters(ORSTestCase):
         conf_file = glob.glob(os.path.join(
           self.slap.instance_directory, '*', 'etc', 'ue.cfg'))[0]
 
-        with open(conf_file, 'r') as f:
-          conf = yaml.load(f)
+        conf = yaml_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'])
@@ -443,8 +438,7 @@ class TestUENRParameters(ORSTestCase):
         conf_file = glob.glob(os.path.join(
           self.slap.instance_directory, '*', 'etc', 'ue.cfg'))[0]
 
-        with open(conf_file, 'r') as f:
-          conf = yaml.load(f)
+        conf = yaml_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')

software/ors-amarisoft/test/test.py

+# Copyright (C) 2022-2024  Nexedi SA and Contributors.
+#
+# This program is free software: you can Use, Study, Modify and Redistribute
+# it under the terms of the GNU General Public License version 3, or (at your
+# option) any later version, as published by the Free Software Foundation.
+#
+# You can also Link and Combine this program with other software covered by
+# the terms of any of the Free Software licenses or any of the Open Source
+# Initiative approved licenses and Convey the resulting work. Corresponding
+# source of such a combination shall include the source code for all other
+# software used.
+#
+# This program is distributed WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# See COPYING file for full licensing terms.
+# See https://www.nexedi.com/licensing for rationale and options.
+
+
+import yaml
+
+
+# ---- misc ----
+
+# yaml_load loads yaml config file.
+def yaml_load(path):
+    with open(path, 'r') as f:
+        data = f.read()
+    return yaml.load(data)

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

@@ -26,11 +26,12 @@
 ##############################################################################
 
 import os
-import yaml
 import json
 import glob
 import requests
 
+from test import yaml_load
+
 from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
 
 setUpModule, ORSTestCase = makeModuleSetUpAndTestCaseClass(
@@ -140,8 +141,7 @@ def test_enb_conf(self):
     conf_file = glob.glob(os.path.join(
       self.slap.instance_directory, '*', 'etc', 'enb.cfg'))[0]
 
-    with open(conf_file, 'r') as f:
-        conf = yaml.load(f)
+    conf = yaml_load(conf_file)
     if 'tx_gain' in conf and 'rx_gain' in conf:
       self.assertEqual(conf['tx_gain'], enb_param_dict['tx_gain'])
       self.assertEqual(conf['rx_gain'], enb_param_dict['rx_gain'])
@@ -175,8 +175,7 @@ def test_gnb_conf1(self):
         conf_file = glob.glob(os.path.join(
           self.slap.instance_directory, '*', 'etc', 'enb.cfg'))[0]
 
-        with open(conf_file, 'r') as f:
-            conf = yaml.load(f)
+        conf = yaml_load(conf_file)
         if 'tx_gain' in conf and 'rx_gain' in conf:
             self.assertEqual(conf['tx_gain'], gnb_param_dict1['tx_gain'])
             self.assertEqual(conf['rx_gain'], gnb_param_dict1['rx_gain'])
@@ -220,8 +219,7 @@ def test_gnb_conf2(self):
         conf_file = glob.glob(os.path.join(
           self.slap.instance_directory, '*', 'etc', 'enb.cfg'))[0]
 
-        with open(conf_file, 'r') as f:
-            conf = yaml.load(f)
+        conf = yaml_load(conf_file)
 
         for p in conf['nr_cell_default']['plmn_list'][0]['nssai']:
           sd = hex(p['sd'])
@@ -233,8 +231,7 @@ def test_mme_conf(self):
     conf_file = glob.glob(os.path.join(
       self.slap.instance_directory, '*', 'etc', 'mme.cfg'))[0]
 
-    with open(conf_file, 'r') as f:
-        conf = yaml.load(f)
+    conf = yaml_load(conf_file)
     self.assertEqual(conf['plmn'], param_dict['core_network_plmn'])
 
 def test_sim_card(self):
@@ -242,8 +239,7 @@ def test_sim_card(self):
     conf_file = glob.glob(os.path.join(
       self.slap.instance_directory, '*', 'etc', 'ue_db.cfg'))[0]
 
-    with open(conf_file, 'r') as f:
-        conf = yaml.load(f)
+    conf = yaml_load(conf_file)
     for n in "sim_algo imsi opc sqn impu impi".split():
         self.assertEqual(conf['ue_db'][0][n], param_dict[n])
     self.assertEqual(conf['ue_db'][0]['K'], param_dict['k'])
@@ -410,8 +406,7 @@ class TestUELTEParameters(ORSTestCase):
         conf_file = glob.glob(os.path.join(
           self.slap.instance_directory, '*', 'etc', 'ue.cfg'))[0]
 
-        with open(conf_file, 'r') as f:
-          conf = yaml.load(f)
+        conf = yaml_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'])
@@ -439,8 +434,7 @@ class TestUENRParameters(ORSTestCase):
         conf_file = glob.glob(os.path.join(
           self.slap.instance_directory, '*', 'etc', 'ue.cfg'))[0]
 
-        with open(conf_file, 'r') as f:
-          conf = yaml.load(f)
+        conf = yaml_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')

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

@@ -26,11 +26,12 @@
 ##############################################################################
 
 import os
-import yaml
 import json
 import glob
 import requests
 
+from test import yaml_load
+
 from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
 
 setUpModule, ORSTestCase = makeModuleSetUpAndTestCaseClass(
@@ -140,8 +141,7 @@ def test_enb_conf(self):
     conf_file = glob.glob(os.path.join(
       self.slap.instance_directory, '*', 'etc', 'enb.cfg'))[0]
 
-    with open(conf_file, 'r') as f:
-        conf = yaml.load(f)
+    conf = yaml_load(conf_file)
     if 'tx_gain' in conf and 'rx_gain' in conf:
       self.assertEqual(conf['tx_gain'], enb_param_dict['tx_gain'])
       self.assertEqual(conf['rx_gain'], enb_param_dict['rx_gain'])
@@ -175,8 +175,7 @@ def test_gnb_conf1(self):
         conf_file = glob.glob(os.path.join(
           self.slap.instance_directory, '*', 'etc', 'enb.cfg'))[0]
 
-        with open(conf_file, 'r') as f:
-            conf = yaml.load(f)
+        conf = yaml_load(conf_file)
         if 'tx_gain' in conf and 'rx_gain' in conf:
             self.assertEqual(conf['tx_gain'], gnb_param_dict1['tx_gain'])
             self.assertEqual(conf['rx_gain'], gnb_param_dict1['rx_gain'])
@@ -220,8 +219,7 @@ def test_gnb_conf2(self):
         conf_file = glob.glob(os.path.join(
           self.slap.instance_directory, '*', 'etc', 'enb.cfg'))[0]
 
-        with open(conf_file, 'r') as f:
-            conf = yaml.load(f)
+        conf = yaml_load(conf_file)
 
         for p in conf['nr_cell_default']['plmn_list'][0]['nssai']:
           sd = hex(p['sd'])
@@ -233,8 +231,7 @@ def test_mme_conf(self):
     conf_file = glob.glob(os.path.join(
       self.slap.instance_directory, '*', 'etc', 'mme.cfg'))[0]
 
-    with open(conf_file, 'r') as f:
-        conf = yaml.load(f)
+    conf = yaml_load(conf_file)
     self.assertEqual(conf['plmn'], param_dict['core_network_plmn'])
 
 def test_sim_card(self):
@@ -242,8 +239,7 @@ def test_sim_card(self):
     conf_file = glob.glob(os.path.join(
       self.slap.instance_directory, '*', 'etc', 'ue_db.cfg'))[0]
 
-    with open(conf_file, 'r') as f:
-        conf = yaml.load(f)
+    conf = yaml_load(conf_file)
     for n in "sim_algo imsi opc sqn impu impi".split():
         self.assertEqual(conf['ue_db'][0][n], param_dict[n])
     self.assertEqual(conf['ue_db'][0]['K'], param_dict['k'])
@@ -410,8 +406,7 @@ class TestUELTEParameters(ORSTestCase):
         conf_file = glob.glob(os.path.join(
           self.slap.instance_directory, '*', 'etc', 'ue.cfg'))[0]
 
-        with open(conf_file, 'r') as f:
-          conf = yaml.load(f)
+        conf = yaml_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'])
@@ -439,8 +434,7 @@ class TestUENRParameters(ORSTestCase):
         conf_file = glob.glob(os.path.join(
           self.slap.instance_directory, '*', 'etc', 'ue.cfg'))[0]
 
-        with open(conf_file, 'r') as f:
-          conf = yaml.load(f)
+        conf = yaml_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')

software/ors-amarisoft/test/testFDD.py

@@ -26,11 +26,12 @@
 ##############################################################################
 
 import os
-import yaml
 import json
 import glob
 import requests
 
+from test import yaml_load
+
 from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
 
 setUpModule, ORSTestCase = makeModuleSetUpAndTestCaseClass(
@@ -140,8 +141,7 @@ def test_enb_conf(self):
     conf_file = glob.glob(os.path.join(
       self.slap.instance_directory, '*', 'etc', 'enb.cfg'))[0]
 
-    with open(conf_file, 'r') as f:
-        conf = yaml.load(f)
+    conf = yaml_load(conf_file)
     if 'tx_gain' in conf and 'rx_gain' in conf:
       self.assertEqual(conf['tx_gain'], enb_param_dict['tx_gain'])
       self.assertEqual(conf['rx_gain'], enb_param_dict['rx_gain'])
@@ -175,8 +175,7 @@ def test_gnb_conf1(self):
         conf_file = glob.glob(os.path.join(
           self.slap.instance_directory, '*', 'etc', 'enb.cfg'))[0]
 
-        with open(conf_file, 'r') as f:
-            conf = yaml.load(f)
+        conf = yaml_load(conf_file)
         if 'tx_gain' in conf and 'rx_gain' in conf:
             self.assertEqual(conf['tx_gain'], gnb_param_dict1['tx_gain'])
             self.assertEqual(conf['rx_gain'], gnb_param_dict1['rx_gain'])
@@ -220,8 +219,7 @@ def test_gnb_conf2(self):
         conf_file = glob.glob(os.path.join(
           self.slap.instance_directory, '*', 'etc', 'enb.cfg'))[0]
 
-        with open(conf_file, 'r') as f:
-            conf = yaml.load(f)
+        conf = yaml_load(conf_file)
 
         for p in conf['nr_cell_default']['plmn_list'][0]['nssai']:
           sd = hex(p['sd'])
@@ -233,8 +231,7 @@ def test_mme_conf(self):
     conf_file = glob.glob(os.path.join(
       self.slap.instance_directory, '*', 'etc', 'mme.cfg'))[0]
 
-    with open(conf_file, 'r') as f:
-        conf = yaml.load(f)
+    conf = yaml_load(conf_file)
     self.assertEqual(conf['plmn'], param_dict['core_network_plmn'])
 
 def test_sim_card(self):
@@ -242,8 +239,7 @@ def test_sim_card(self):
     conf_file = glob.glob(os.path.join(
       self.slap.instance_directory, '*', 'etc', 'ue_db.cfg'))[0]
 
-    with open(conf_file, 'r') as f:
-        conf = yaml.load(f)
+    conf = yaml_load(conf_file)
     for n in "sim_algo imsi opc sqn impu impi".split():
         self.assertEqual(conf['ue_db'][0][n], param_dict[n])
     self.assertEqual(conf['ue_db'][0]['K'], param_dict['k'])
@@ -410,8 +406,7 @@ class TestUELTEParameters(ORSTestCase):
         conf_file = glob.glob(os.path.join(
           self.slap.instance_directory, '*', 'etc', 'ue.cfg'))[0]
 
-        with open(conf_file, 'r') as f:
-          conf = yaml.load(f)
+        conf = yaml_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'])
@@ -439,8 +434,7 @@ class TestUENRParameters(ORSTestCase):
         conf_file = glob.glob(os.path.join(
           self.slap.instance_directory, '*', 'etc', 'ue.cfg'))[0]
 
-        with open(conf_file, 'r') as f:
-          conf = yaml.load(f)
+        conf = yaml_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')

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

@@ -26,11 +26,12 @@
 ##############################################################################
 
 import os
-import yaml
 import json
 import glob
 import requests
 
+from test import yaml_load
+
 from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
 
 setUpModule, ORSTestCase = makeModuleSetUpAndTestCaseClass(
@@ -140,8 +141,7 @@ def test_enb_conf(self):
     conf_file = glob.glob(os.path.join(
       self.slap.instance_directory, '*', 'etc', 'enb.cfg'))[0]
 
-    with open(conf_file, 'r') as f:
-        conf = yaml.load(f)
+    conf = yaml_load(conf_file)
     if 'tx_gain' in conf and 'rx_gain' in conf:
       self.assertEqual(conf['tx_gain'], enb_param_dict['tx_gain'])
       self.assertEqual(conf['rx_gain'], enb_param_dict['rx_gain'])
@@ -175,8 +175,7 @@ def test_gnb_conf1(self):
         conf_file = glob.glob(os.path.join(
           self.slap.instance_directory, '*', 'etc', 'enb.cfg'))[0]
 
-        with open(conf_file, 'r') as f:
-            conf = yaml.load(f)
+        conf = yaml_load(conf_file)
         if 'tx_gain' in conf and 'rx_gain' in conf:
             self.assertEqual(conf['tx_gain'], gnb_param_dict1['tx_gain'])
             self.assertEqual(conf['rx_gain'], gnb_param_dict1['rx_gain'])
@@ -220,8 +219,7 @@ def test_gnb_conf2(self):
         conf_file = glob.glob(os.path.join(
           self.slap.instance_directory, '*', 'etc', 'enb.cfg'))[0]
 
-        with open(conf_file, 'r') as f:
-            conf = yaml.load(f)
+        conf = yaml_load(conf_file)
 
         for p in conf['nr_cell_default']['plmn_list'][0]['nssai']:
           sd = hex(p['sd'])
@@ -233,8 +231,7 @@ def test_mme_conf(self):
     conf_file = glob.glob(os.path.join(
       self.slap.instance_directory, '*', 'etc', 'mme.cfg'))[0]
 
-    with open(conf_file, 'r') as f:
-        conf = yaml.load(f)
+    conf = yaml_load(conf_file)
     self.assertEqual(conf['plmn'], param_dict['core_network_plmn'])
 
 def test_sim_card(self):
@@ -242,8 +239,7 @@ def test_sim_card(self):
     conf_file = glob.glob(os.path.join(
       self.slap.instance_directory, '*', 'etc', 'ue_db.cfg'))[0]
 
-    with open(conf_file, 'r') as f:
-        conf = yaml.load(f)
+    conf = yaml_load(conf_file)
     for n in "sim_algo imsi opc sqn impu impi".split():
         self.assertEqual(conf['ue_db'][0][n], param_dict[n])
     self.assertEqual(conf['ue_db'][0]['K'], param_dict['k'])
@@ -410,8 +406,7 @@ class TestUELTEParameters(ORSTestCase):
         conf_file = glob.glob(os.path.join(
           self.slap.instance_directory, '*', 'etc', 'ue.cfg'))[0]
 
-        with open(conf_file, 'r') as f:
-          conf = yaml.load(f)
+        conf = yaml_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'])
@@ -439,8 +434,7 @@ class TestUENRParameters(ORSTestCase):
         conf_file = glob.glob(os.path.join(
           self.slap.instance_directory, '*', 'etc', 'ue.cfg'))[0]
 
-        with open(conf_file, 'r') as f:
-          conf = yaml.load(f)
+        conf = yaml_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')

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

@@ -26,11 +26,12 @@
 ##############################################################################
 
 import os
-import yaml
 import json
 import glob
 import requests
 
+from test import yaml_load
+
 from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
 
 setUpModule, ORSTestCase = makeModuleSetUpAndTestCaseClass(
@@ -140,8 +141,7 @@ def test_enb_conf(self):
     conf_file = glob.glob(os.path.join(
       self.slap.instance_directory, '*', 'etc', 'enb.cfg'))[0]
 
-    with open(conf_file, 'r') as f:
-        conf = yaml.load(f)
+    conf = yaml_load(conf_file)
     if 'tx_gain' in conf and 'rx_gain' in conf:
       self.assertEqual(conf['tx_gain'], enb_param_dict['tx_gain'])
       self.assertEqual(conf['rx_gain'], enb_param_dict['rx_gain'])
@@ -175,8 +175,7 @@ def test_gnb_conf1(self):
         conf_file = glob.glob(os.path.join(
           self.slap.instance_directory, '*', 'etc', 'enb.cfg'))[0]
 
-        with open(conf_file, 'r') as f:
-            conf = yaml.load(f)
+        conf = yaml_load(conf_file)
         if 'tx_gain' in conf and 'rx_gain' in conf:
             self.assertEqual(conf['tx_gain'], gnb_param_dict1['tx_gain'])
             self.assertEqual(conf['rx_gain'], gnb_param_dict1['rx_gain'])
@@ -220,8 +219,7 @@ def test_gnb_conf2(self):
         conf_file = glob.glob(os.path.join(
           self.slap.instance_directory, '*', 'etc', 'enb.cfg'))[0]
 
-        with open(conf_file, 'r') as f:
-            conf = yaml.load(f)
+        conf = yaml_load(conf_file)
 
         for p in conf['nr_cell_default']['plmn_list'][0]['nssai']:
           sd = hex(p['sd'])
@@ -233,8 +231,7 @@ def test_mme_conf(self):
     conf_file = glob.glob(os.path.join(
       self.slap.instance_directory, '*', 'etc', 'mme.cfg'))[0]
 
-    with open(conf_file, 'r') as f:
-        conf = yaml.load(f)
+    conf = yaml_load(conf_file)
     self.assertEqual(conf['plmn'], param_dict['core_network_plmn'])
 
 def test_sim_card(self):
@@ -242,8 +239,7 @@ def test_sim_card(self):
     conf_file = glob.glob(os.path.join(
       self.slap.instance_directory, '*', 'etc', 'ue_db.cfg'))[0]
 
-    with open(conf_file, 'r') as f:
-        conf = yaml.load(f)
+    conf = yaml_load(conf_file)
     for n in "sim_algo imsi opc sqn impu impi".split():
         self.assertEqual(conf['ue_db'][0][n], param_dict[n])
     self.assertEqual(conf['ue_db'][0]['K'], param_dict['k'])
@@ -410,8 +406,7 @@ class TestUELTEParameters(ORSTestCase):
         conf_file = glob.glob(os.path.join(
           self.slap.instance_directory, '*', 'etc', 'ue.cfg'))[0]
 
-        with open(conf_file, 'r') as f:
-          conf = yaml.load(f)
+        conf = yaml_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'])
@@ -439,8 +434,7 @@ class TestUENRParameters(ORSTestCase):
         conf_file = glob.glob(os.path.join(
           self.slap.instance_directory, '*', 'etc', 'ue.cfg'))[0]
 
-        with open(conf_file, 'r') as f:
-          conf = yaml.load(f)
+        conf = yaml_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')

software/ors-amarisoft/test/testTDD.py

@@ -26,11 +26,12 @@
 ##############################################################################
 
 import os
-import yaml
 import json
 import glob
 import requests
 
+from test import yaml_load
+
 from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
 
 setUpModule, ORSTestCase = makeModuleSetUpAndTestCaseClass(
@@ -140,8 +141,7 @@ def test_enb_conf(self):
     conf_file = glob.glob(os.path.join(
       self.slap.instance_directory, '*', 'etc', 'enb.cfg'))[0]
 
-    with open(conf_file, 'r') as f:
-        conf = yaml.load(f)
+    conf = yaml_load(conf_file)
     if 'tx_gain' in conf and 'rx_gain' in conf:
       self.assertEqual(conf['tx_gain'], enb_param_dict['tx_gain'])
       self.assertEqual(conf['rx_gain'], enb_param_dict['rx_gain'])
@@ -175,8 +175,7 @@ def test_gnb_conf1(self):
         conf_file = glob.glob(os.path.join(
           self.slap.instance_directory, '*', 'etc', 'enb.cfg'))[0]
 
-        with open(conf_file, 'r') as f:
-            conf = yaml.load(f)
+        conf = yaml_load(conf_file)
         if 'tx_gain' in conf and 'rx_gain' in conf:
             self.assertEqual(conf['tx_gain'], gnb_param_dict1['tx_gain'])
             self.assertEqual(conf['rx_gain'], gnb_param_dict1['rx_gain'])
@@ -220,8 +219,7 @@ def test_gnb_conf2(self):
         conf_file = glob.glob(os.path.join(
           self.slap.instance_directory, '*', 'etc', 'enb.cfg'))[0]
 
-        with open(conf_file, 'r') as f:
-            conf = yaml.load(f)
+        conf = yaml_load(conf_file)
 
         for p in conf['nr_cell_default']['plmn_list'][0]['nssai']:
           sd = hex(p['sd'])
@@ -233,8 +231,7 @@ def test_mme_conf(self):
     conf_file = glob.glob(os.path.join(
       self.slap.instance_directory, '*', 'etc', 'mme.cfg'))[0]
 
-    with open(conf_file, 'r') as f:
-        conf = yaml.load(f)
+    conf = yaml_load(conf_file)
     self.assertEqual(conf['plmn'], param_dict['core_network_plmn'])
 
 def test_sim_card(self):
@@ -242,8 +239,7 @@ def test_sim_card(self):
     conf_file = glob.glob(os.path.join(
       self.slap.instance_directory, '*', 'etc', 'ue_db.cfg'))[0]
 
-    with open(conf_file, 'r') as f:
-        conf = yaml.load(f)
+    conf = yaml_load(conf_file)
     for n in "sim_algo imsi opc sqn impu impi".split():
         self.assertEqual(conf['ue_db'][0][n], param_dict[n])
     self.assertEqual(conf['ue_db'][0]['K'], param_dict['k'])
@@ -410,8 +406,7 @@ class TestUELTEParameters(ORSTestCase):
         conf_file = glob.glob(os.path.join(
           self.slap.instance_directory, '*', 'etc', 'ue.cfg'))[0]
 
-        with open(conf_file, 'r') as f:
-          conf = yaml.load(f)
+        conf = yaml_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'])
@@ -439,8 +434,7 @@ class TestUENRParameters(ORSTestCase):
         conf_file = glob.glob(os.path.join(
           self.slap.instance_directory, '*', 'etc', 'ue.cfg'))[0]
 
-        with open(conf_file, 'r') as f:
-          conf = yaml.load(f)
+        conf = yaml_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')