ors-amarisoft fix the random test failing when accessing ors IPv6 with dynamic port

See merge request nexedi/slapos!1378

software/ors-amarisoft/buildout.hash.cfg

@@ -36,7 +36,7 @@ md5sum = e0b68a87238282568e0e04c792ec7288
 
 [template-lte-enb-epc]
 _update_hash_filename_ = instance-enb-epc.jinja2.cfg
-md5sum = 22c2d4f52463de898fcd7516269aed62
+md5sum = 107eb2af916569bfa9e7ca56958ad8b4
 
 [template-lte-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
@@ -44,11 +44,11 @@ md5sum = dd85f04ab2836cf459078f0adaf7b847
 
 [template-lte-gnb-epc]
 _update_hash_filename_ = instance-gnb-epc.jinja2.cfg
-md5sum = 12b4a6eb722d0ddd0c6edb2a48285f73
+md5sum = 31e73e7f2a3ec6e557e55650594af6ce
 
 [template-lte-epc]
 _update_hash_filename_ = instance-epc.jinja2.cfg
-md5sum = 397dccca5d9fa027dfc9ba0aab3b7544
+md5sum = 0c6fc6e55865357ef6385ff2ca9ae770
 
 [template-lte-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg

software/ors-amarisoft/instance-enb-epc.jinja2.cfg

@@ -64,7 +64,7 @@ promise = ${:etc}/promise
 log = ${:var}/log
 
 [request-common-base]
-recipe = slapos.cookbook:requestoptional.serialised
+recipe = slapos.cookbook:request.serialised
 software-url = {{ slap_connection['software-release-url'] }}
 server-url = {{ slap_connection['server-url'] }}
 computer-id = {{ slap_connection['computer-id'] }}

software/ors-amarisoft/instance-epc.jinja2.cfg

@@ -63,7 +63,7 @@ promise = ${:etc}/promise
 log = ${:var}/log
 
 [request-common-base]
-recipe = slapos.cookbook:requestoptional.serialised
+recipe = slapos.cookbook:request.serialised
 software-url = {{ slap_connection['software-release-url'] }}
 server-url = {{ slap_connection['server-url'] }}
 computer-id = {{ slap_connection['computer-id'] }}

software/ors-amarisoft/instance-gnb-epc.jinja2.cfg

@@ -64,7 +64,7 @@ promise = ${:etc}/promise
 log = ${:var}/log
 
 [request-common-base]
-recipe = slapos.cookbook:requestoptional.serialised
+recipe = slapos.cookbook:request.serialised
 software-url = {{ slap_connection['software-release-url'] }}
 server-url = {{ slap_connection['server-url'] }}
 computer-id = {{ slap_connection['computer-id'] }}

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

@@ -180,7 +180,6 @@ def test_sim_card(self):
     self.assertEqual(conf['ue_db'][0]['K'], param_dict['k'])
     self.assertEqual(conf['ue_db'][0]['amf'], int(param_dict['amf'], 16))
 
-    self.slap.waitForInstance() # Wait until publish is done
     p = self.requestSlaveInstance().getConnectionParameterDict()
     p = p['_'] if '_' in p else p
     self.assertIn('info', p)
@@ -240,7 +239,6 @@ class TestEPCParameters(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "epc"
     def test_mme_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_mme_conf(self)
 
 class TestENBEPCParameters(ORSTestCase):
@@ -251,10 +249,8 @@ class TestENBEPCParameters(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "enb-epc"
     def test_enb_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_enb_conf(self)
     def test_mme_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_mme_conf(self)
 
 class TestGNBEPCParameters(ORSTestCase):
@@ -265,10 +261,8 @@ class TestGNBEPCParameters(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "gnb-epc"
     def test_gnb_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_gnb_conf1(self)
     def test_mme_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_mme_conf(self)
 
 def requestSlaveInstance(cls, software_type):
@@ -291,7 +285,6 @@ class TestEPCMonitorGadgetUrl(ORSTestCase):
         return "epc"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestENBMonitorGadgetUrl(ORSTestCase):
@@ -304,7 +297,6 @@ class TestENBMonitorGadgetUrl(ORSTestCase):
         return "enb"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestENBEPCMonitorGadgetUrl(ORSTestCase):
@@ -317,7 +309,6 @@ class TestENBEPCMonitorGadgetUrl(ORSTestCase):
         return "enb-epc"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestGNBEPCMonitorGadgetUrl(ORSTestCase):
@@ -330,7 +321,6 @@ class TestGNBEPCMonitorGadgetUrl(ORSTestCase):
         return "gnb-epc"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestGNBMonitorGadgetUrl(ORSTestCase):
@@ -343,7 +333,6 @@ class TestGNBMonitorGadgetUrl(ORSTestCase):
         return "gnb"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestMMEMonitorGadgetUrl(ORSTestCase):
@@ -356,7 +345,6 @@ class TestMMEMonitorGadgetUrl(ORSTestCase):
         return "mme"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestUELTEMonitorGadgetUrl(ORSTestCase):
@@ -369,7 +357,6 @@ class TestUELTEMonitorGadgetUrl(ORSTestCase):
         return "ue-lte"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestUENRMonitorGadgetUrl(ORSTestCase):
@@ -382,7 +369,6 @@ class TestUENRMonitorGadgetUrl(ORSTestCase):
         return "ue-nr"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestEPCSimCard(ORSTestCase):
@@ -402,7 +388,6 @@ class TestEPCSimCard(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "epc"
     def test_sim_card(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_sim_card(self)
 
 class TestENBEPCSimCard(ORSTestCase):
@@ -422,7 +407,6 @@ class TestENBEPCSimCard(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "enb-epc"
     def test_sim_card(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_sim_card(self)
 
 class TestGNBEPCSimCard(ORSTestCase):
@@ -442,7 +426,6 @@ class TestGNBEPCSimCard(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "gnb-epc"
     def test_sim_card(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_sim_card(self)
 
 class TestUELTEParameters(ORSTestCase):

software/ors-amarisoft/test/testTDD1900.py

@@ -180,7 +180,6 @@ def test_sim_card(self):
     self.assertEqual(conf['ue_db'][0]['K'], param_dict['k'])
     self.assertEqual(conf['ue_db'][0]['amf'], int(param_dict['amf'], 16))
 
-    self.slap.waitForInstance() # Wait until publish is done
     p = self.requestSlaveInstance().getConnectionParameterDict()
     p = p['_'] if '_' in p else p
     self.assertIn('info', p)
@@ -240,7 +239,6 @@ class TestEPCParameters(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "epc"
     def test_mme_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_mme_conf(self)
 
 class TestENBEPCParameters(ORSTestCase):
@@ -251,10 +249,8 @@ class TestENBEPCParameters(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "enb-epc"
     def test_enb_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_enb_conf(self)
     def test_mme_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_mme_conf(self)
 
 class TestGNBEPCParameters(ORSTestCase):
@@ -265,10 +261,8 @@ class TestGNBEPCParameters(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "gnb-epc"
     def test_gnb_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_gnb_conf1(self)
     def test_mme_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_mme_conf(self)
 
 def requestSlaveInstance(cls, software_type):
@@ -291,7 +285,6 @@ class TestEPCMonitorGadgetUrl(ORSTestCase):
         return "epc"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestENBMonitorGadgetUrl(ORSTestCase):
@@ -304,7 +297,6 @@ class TestENBMonitorGadgetUrl(ORSTestCase):
         return "enb"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestENBEPCMonitorGadgetUrl(ORSTestCase):
@@ -317,7 +309,6 @@ class TestENBEPCMonitorGadgetUrl(ORSTestCase):
         return "enb-epc"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestGNBEPCMonitorGadgetUrl(ORSTestCase):
@@ -330,7 +321,6 @@ class TestGNBEPCMonitorGadgetUrl(ORSTestCase):
         return "gnb-epc"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestGNBMonitorGadgetUrl(ORSTestCase):
@@ -343,7 +333,6 @@ class TestGNBMonitorGadgetUrl(ORSTestCase):
         return "gnb"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestMMEMonitorGadgetUrl(ORSTestCase):
@@ -356,7 +345,6 @@ class TestMMEMonitorGadgetUrl(ORSTestCase):
         return "mme"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestUELTEMonitorGadgetUrl(ORSTestCase):
@@ -369,7 +357,6 @@ class TestUELTEMonitorGadgetUrl(ORSTestCase):
         return "ue-lte"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestUENRMonitorGadgetUrl(ORSTestCase):
@@ -382,7 +369,6 @@ class TestUENRMonitorGadgetUrl(ORSTestCase):
         return "ue-nr"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestEPCSimCard(ORSTestCase):
@@ -402,7 +388,6 @@ class TestEPCSimCard(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "epc"
     def test_sim_card(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_sim_card(self)
 
 class TestENBEPCSimCard(ORSTestCase):
@@ -422,7 +407,6 @@ class TestENBEPCSimCard(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "enb-epc"
     def test_sim_card(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_sim_card(self)
 
 class TestGNBEPCSimCard(ORSTestCase):
@@ -442,7 +426,6 @@ class TestGNBEPCSimCard(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "gnb-epc"
     def test_sim_card(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_sim_card(self)
 
 class TestUELTEParameters(ORSTestCase):

software/ors-amarisoft/test/testTDD2600.py

@@ -180,7 +180,6 @@ def test_sim_card(self):
     self.assertEqual(conf['ue_db'][0]['K'], param_dict['k'])
     self.assertEqual(conf['ue_db'][0]['amf'], int(param_dict['amf'], 16))
 
-    self.slap.waitForInstance() # Wait until publish is done
     p = self.requestSlaveInstance().getConnectionParameterDict()
     p = p['_'] if '_' in p else p
     self.assertIn('info', p)
@@ -240,7 +239,6 @@ class TestEPCParameters(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "epc"
     def test_mme_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_mme_conf(self)
 
 class TestENBEPCParameters(ORSTestCase):
@@ -251,10 +249,8 @@ class TestENBEPCParameters(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "enb-epc"
     def test_enb_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_enb_conf(self)
     def test_mme_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_mme_conf(self)
 
 class TestGNBEPCParameters(ORSTestCase):
@@ -265,10 +261,8 @@ class TestGNBEPCParameters(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "gnb-epc"
     def test_gnb_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_gnb_conf1(self)
     def test_mme_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_mme_conf(self)
 
 def requestSlaveInstance(cls, software_type):
@@ -291,7 +285,6 @@ class TestEPCMonitorGadgetUrl(ORSTestCase):
         return "epc"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestENBMonitorGadgetUrl(ORSTestCase):
@@ -304,7 +297,6 @@ class TestENBMonitorGadgetUrl(ORSTestCase):
         return "enb"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestENBEPCMonitorGadgetUrl(ORSTestCase):
@@ -317,7 +309,6 @@ class TestENBEPCMonitorGadgetUrl(ORSTestCase):
         return "enb-epc"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestGNBEPCMonitorGadgetUrl(ORSTestCase):
@@ -330,7 +321,6 @@ class TestGNBEPCMonitorGadgetUrl(ORSTestCase):
         return "gnb-epc"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestGNBMonitorGadgetUrl(ORSTestCase):
@@ -343,7 +333,6 @@ class TestGNBMonitorGadgetUrl(ORSTestCase):
         return "gnb"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestMMEMonitorGadgetUrl(ORSTestCase):
@@ -356,7 +345,6 @@ class TestMMEMonitorGadgetUrl(ORSTestCase):
         return "mme"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestUELTEMonitorGadgetUrl(ORSTestCase):
@@ -369,7 +357,6 @@ class TestUELTEMonitorGadgetUrl(ORSTestCase):
         return "ue-lte"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestUENRMonitorGadgetUrl(ORSTestCase):
@@ -382,7 +369,6 @@ class TestUENRMonitorGadgetUrl(ORSTestCase):
         return "ue-nr"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestEPCSimCard(ORSTestCase):
@@ -402,7 +388,6 @@ class TestEPCSimCard(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "epc"
     def test_sim_card(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_sim_card(self)
 
 class TestENBEPCSimCard(ORSTestCase):
@@ -422,7 +407,6 @@ class TestENBEPCSimCard(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "enb-epc"
     def test_sim_card(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_sim_card(self)
 
 class TestGNBEPCSimCard(ORSTestCase):
@@ -442,7 +426,6 @@ class TestGNBEPCSimCard(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "gnb-epc"
     def test_sim_card(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_sim_card(self)
 
 class TestUELTEParameters(ORSTestCase):

software/ors-amarisoft/test/testTDD3500.py

@@ -180,7 +180,6 @@ def test_sim_card(self):
     self.assertEqual(conf['ue_db'][0]['K'], param_dict['k'])
     self.assertEqual(conf['ue_db'][0]['amf'], int(param_dict['amf'], 16))
 
-    self.slap.waitForInstance() # Wait until publish is done
     p = self.requestSlaveInstance().getConnectionParameterDict()
     p = p['_'] if '_' in p else p
     self.assertIn('info', p)
@@ -240,7 +239,6 @@ class TestEPCParameters(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "epc"
     def test_mme_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_mme_conf(self)
 
 class TestENBEPCParameters(ORSTestCase):
@@ -251,10 +249,8 @@ class TestENBEPCParameters(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "enb-epc"
     def test_enb_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_enb_conf(self)
     def test_mme_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_mme_conf(self)
 
 class TestGNBEPCParameters(ORSTestCase):
@@ -265,10 +261,8 @@ class TestGNBEPCParameters(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "gnb-epc"
     def test_gnb_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_gnb_conf1(self)
     def test_mme_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_mme_conf(self)
 
 def requestSlaveInstance(cls, software_type):
@@ -291,7 +285,6 @@ class TestEPCMonitorGadgetUrl(ORSTestCase):
         return "epc"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestENBMonitorGadgetUrl(ORSTestCase):
@@ -304,7 +297,6 @@ class TestENBMonitorGadgetUrl(ORSTestCase):
         return "enb"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestENBEPCMonitorGadgetUrl(ORSTestCase):
@@ -317,7 +309,6 @@ class TestENBEPCMonitorGadgetUrl(ORSTestCase):
         return "enb-epc"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestGNBEPCMonitorGadgetUrl(ORSTestCase):
@@ -330,7 +321,6 @@ class TestGNBEPCMonitorGadgetUrl(ORSTestCase):
         return "gnb-epc"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestGNBMonitorGadgetUrl(ORSTestCase):
@@ -343,7 +333,6 @@ class TestGNBMonitorGadgetUrl(ORSTestCase):
         return "gnb"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestMMEMonitorGadgetUrl(ORSTestCase):
@@ -356,7 +345,6 @@ class TestMMEMonitorGadgetUrl(ORSTestCase):
         return "mme"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestUELTEMonitorGadgetUrl(ORSTestCase):
@@ -369,7 +357,6 @@ class TestUELTEMonitorGadgetUrl(ORSTestCase):
         return "ue-lte"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestUENRMonitorGadgetUrl(ORSTestCase):
@@ -382,7 +369,6 @@ class TestUENRMonitorGadgetUrl(ORSTestCase):
         return "ue-nr"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestEPCSimCard(ORSTestCase):
@@ -402,7 +388,6 @@ class TestEPCSimCard(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "epc"
     def test_sim_card(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_sim_card(self)
 
 class TestENBEPCSimCard(ORSTestCase):
@@ -422,7 +407,6 @@ class TestENBEPCSimCard(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "enb-epc"
     def test_sim_card(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_sim_card(self)
 
 class TestGNBEPCSimCard(ORSTestCase):
@@ -442,7 +426,6 @@ class TestGNBEPCSimCard(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "gnb-epc"
     def test_sim_card(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_sim_card(self)
 
 class TestUELTEParameters(ORSTestCase):

software/ors-amarisoft/test/testTDD3700.py

@@ -180,7 +180,6 @@ def test_sim_card(self):
     self.assertEqual(conf['ue_db'][0]['K'], param_dict['k'])
     self.assertEqual(conf['ue_db'][0]['amf'], int(param_dict['amf'], 16))
 
-    self.slap.waitForInstance() # Wait until publish is done
     p = self.requestSlaveInstance().getConnectionParameterDict()
     p = p['_'] if '_' in p else p
     self.assertIn('info', p)
@@ -240,7 +239,6 @@ class TestEPCParameters(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "epc"
     def test_mme_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_mme_conf(self)
 
 class TestENBEPCParameters(ORSTestCase):
@@ -251,10 +249,8 @@ class TestENBEPCParameters(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "enb-epc"
     def test_enb_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_enb_conf(self)
     def test_mme_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_mme_conf(self)
 
 class TestGNBEPCParameters(ORSTestCase):
@@ -265,10 +261,8 @@ class TestGNBEPCParameters(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "gnb-epc"
     def test_gnb_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_gnb_conf1(self)
     def test_mme_conf(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_mme_conf(self)
 
 def requestSlaveInstance(cls, software_type):
@@ -291,7 +285,6 @@ class TestEPCMonitorGadgetUrl(ORSTestCase):
         return "epc"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestENBMonitorGadgetUrl(ORSTestCase):
@@ -304,7 +297,6 @@ class TestENBMonitorGadgetUrl(ORSTestCase):
         return "enb"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestENBEPCMonitorGadgetUrl(ORSTestCase):
@@ -317,7 +309,6 @@ class TestENBEPCMonitorGadgetUrl(ORSTestCase):
         return "enb-epc"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestGNBEPCMonitorGadgetUrl(ORSTestCase):
@@ -330,7 +321,6 @@ class TestGNBEPCMonitorGadgetUrl(ORSTestCase):
         return "gnb-epc"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestGNBMonitorGadgetUrl(ORSTestCase):
@@ -343,7 +333,6 @@ class TestGNBMonitorGadgetUrl(ORSTestCase):
         return "gnb"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestMMEMonitorGadgetUrl(ORSTestCase):
@@ -356,7 +345,6 @@ class TestMMEMonitorGadgetUrl(ORSTestCase):
         return "mme"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestUELTEMonitorGadgetUrl(ORSTestCase):
@@ -369,7 +357,6 @@ class TestUELTEMonitorGadgetUrl(ORSTestCase):
         return "ue-lte"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestUENRMonitorGadgetUrl(ORSTestCase):
@@ -382,7 +369,6 @@ class TestUENRMonitorGadgetUrl(ORSTestCase):
         return "ue-nr"
 
     def test_monitor_gadget_url(self):
-      self.slap.waitForInstance() # Wait until publish is done
       test_monitor_gadget_url(self)
 
 class TestEPCSimCard(ORSTestCase):
@@ -402,7 +388,6 @@ class TestEPCSimCard(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "epc"
     def test_sim_card(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_sim_card(self)
 
 class TestENBEPCSimCard(ORSTestCase):
@@ -422,7 +407,6 @@ class TestENBEPCSimCard(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "enb-epc"
     def test_sim_card(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_sim_card(self)
 
 class TestGNBEPCSimCard(ORSTestCase):
@@ -442,7 +426,6 @@ class TestGNBEPCSimCard(ORSTestCase):
     def getInstanceSoftwareType(cls):
         return "gnb-epc"
     def test_sim_card(self):
-        self.slap.waitForInstance() # Wait until publish is done
         test_sim_card(self)
 
 class TestUELTEParameters(ORSTestCase):