Merge remote-tracking branch 'upstream/master' into zope4py2

software/ors-amarisoft/buildout.hash.cfg

@@ -20,7 +20,7 @@ md5sum = 6e5c63c35b13f8920ea13e24c27d7b50
 
 [template-lte-enb-epc]
 _update_hash_filename_ = instance-enb-epc.jinja2.cfg
-md5sum = 80a239305950ed76b5279647f422478f
+md5sum = 42959a0525d2e06e61310836656d5de6
 
 [template-lte-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
@@ -28,7 +28,7 @@ md5sum = 04dbc8396cb112e86d5d1564df033b82
 
 [template-lte-gnb-epc]
 _update_hash_filename_ = instance-gnb-epc.jinja2.cfg
-md5sum = dadb76e747faeea18c387109c3319dfd
+md5sum = 2b589e23486661c52f379c4d9b35e7a9
 
 [template-lte-epc]
 _update_hash_filename_ = instance-epc.jinja2.cfg

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

@@ -78,7 +78,7 @@ software-type = enb
 config-name = enb
 {%- for key, value in slapparameter_dict.items() %}
 config-{{ key }} = {{ dumps(value) }}
-{% endfor -%}
+{% endfor %}
 return = monitor-base-url
 
 [monitor-base-url-dict]

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

@@ -67,7 +67,7 @@ software-type = mme
 config-name = mme
 {%- for key, value in slapparameter_dict.items() %}
 config-{{ key }} = {{ dumps(value) }}
-{% endfor -%}
+{% endfor %}
 config-slave-list = {{ dumps(slave_instance_list) }}
 return = monitor-base-url epc-ipv6
 

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

@@ -220,6 +220,7 @@ 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):
@@ -230,8 +231,10 @@ 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):
@@ -242,8 +245,10 @@ 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):

software/ors-amarisoft/test/testTDD1900.py

@@ -220,6 +220,7 @@ 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):
@@ -230,8 +231,10 @@ 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):
@@ -242,8 +245,10 @@ 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):

software/ors-amarisoft/test/testTDD2600.py

@@ -220,6 +220,7 @@ 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):
@@ -230,8 +231,10 @@ 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):
@@ -242,8 +245,10 @@ 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):

software/ors-amarisoft/test/testTDD3500.py

@@ -220,6 +220,7 @@ 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):
@@ -230,8 +231,10 @@ 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):
@@ -242,8 +245,10 @@ 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):

software/ors-amarisoft/test/testTDD3700.py

@@ -220,6 +220,7 @@ 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):
@@ -230,8 +231,10 @@ 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):
@@ -242,8 +245,10 @@ 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):