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

software/jstestnode/buildout.hash.cfg

@@ -27,4 +27,4 @@ md5sum = 98faa5ad8cfb23a11d97a459078a1d05
 
 [template-runTestSuite]
 filename = runTestSuite.in
-md5sum = 54d585d50a3464100611774db68b72c0
+md5sum = 2bb3d71a0e04bc8bc828bb3f726ef3ff

software/jstestnode/runTestSuite.in

@@ -122,7 +122,7 @@ def main():
         if ('jio' in test_suite):
           url = f'{remote_access_url}/jio/test/tests.html'
         else:
-          url = f'{remote_access_url}/renderjs/test'
+          url = f'{remote_access_url}/renderjs/test/'
 
       is_browser_running = True
       agent = browser.execute_script("return navigator.userAgent")

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 = 7f8f92ff218c40c843a102953c7695f8
+md5sum = 80a239305950ed76b5279647f422478f
 
 [template-lte-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
@@ -28,11 +28,11 @@ md5sum = 04dbc8396cb112e86d5d1564df033b82
 
 [template-lte-gnb-epc]
 _update_hash_filename_ = instance-gnb-epc.jinja2.cfg
-md5sum = d83b5569e258770774cb6028d93a4a70
+md5sum = dadb76e747faeea18c387109c3319dfd
 
 [template-lte-epc]
 _update_hash_filename_ = instance-epc.jinja2.cfg
-md5sum = d310dee0de054e10d77f036199297b3f
+md5sum = 9ffc54bf10757403c4b1809d1102ea52
 
 [template-lte-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg

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

@@ -48,7 +48,7 @@ promise = ${:etc}/promise
 log = ${:var}/log
 
 [request-common-base]
-recipe = slapos.cookbook:request.serialised
+recipe = slapos.cookbook:requestoptional.serialised
 software-url = {{ slap_connection['software-release-url'] }}
 server-url = {{ slap_connection['server-url'] }}
 computer-id = {{ slap_connection['computer-id'] }}
@@ -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/instance-epc.jinja2.cfg

@@ -47,7 +47,7 @@ promise = ${:etc}/promise
 log = ${:var}/log
 
 [request-common-base]
-recipe = slapos.cookbook:request.serialised
+recipe = slapos.cookbook:requestoptional.serialised
 software-url = {{ slap_connection['software-release-url'] }}
 server-url = {{ slap_connection['server-url'] }}
 computer-id = {{ slap_connection['computer-id'] }}
@@ -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) }}
 
 [monitor-base-url-dict]

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

@@ -48,7 +48,7 @@ promise = ${:etc}/promise
 log = ${:var}/log
 
 [request-common-base]
-recipe = slapos.cookbook:request.serialised
+recipe = slapos.cookbook:requestoptional.serialised
 software-url = {{ slap_connection['software-release-url'] }}
 server-url = {{ slap_connection['server-url'] }}
 computer-id = {{ slap_connection['computer-id'] }}
@@ -78,7 +78,7 @@ software-type = gnb
 config-name = gnb
 {%- for key, value in slapparameter_dict.items() %}
 config-{{ key }} = {{ dumps(value) }}
-{% endfor -%}
+{% endfor %}
 return = monitor-base-url
 
 [monitor-base-url-dict]

software/theia/test/bogus/README.md

+# Bogus Software
+
+A bogus non-SR that only has a JSON schema so that requesting it works.

software/theia/test/bogus/software.cfg.json

+{
+  "name": "Bogus",
+  "description": "Bogus",
+  "serialisation": "json-in-xml",
+  "software-type": {}
+}

software/theia/test/dummy/software.cfg.json

+{
+  "name": "Dummy",
+  "description": "Dummy",
+  "serialisation": "xml",
+  "software-type": {}
+}

software/theia/test/test.py

@@ -275,9 +275,9 @@ class TestTheiaEmbeddedSlapOSShutdown(TheiaTestCase):
 
 
 class TestTheiaWithEmbeddedInstance(TheiaTestCase):
-  sr_url = '~/bogus/sr/url.cfg'
-  sr_type = 'bogus-type'
-  sr_config = {"bogus": "yes"}
+  sr_url = os.path.abspath('dummy/software.cfg')
+  sr_type = 'dummy-type'
+  sr_config = {"dummy": "yes"}
   regexpr = re.compile(r"([\w/\-\.]+)\s+slaprunner\s+available")
 
   @classmethod
@@ -326,9 +326,9 @@ class TestTheiaWithEmbeddedInstance(TheiaTestCase):
     self.assertEmbedded(initial_sr_url, self.sr_type, self.sr_config)
 
     # Change parameters for embedded instance
-    sr_url = '/bogus/sr/url-2.cfg'
-    sr_type = 'bogus-type-2'
-    sr_config = {"bogus-2": "true"}
+    sr_url = os.path.abspath('bogus/software.cfg')
+    sr_type = 'bogus-type'
+    sr_config = {"bogus": "true"}
     self.requestInstance(
       self.getInstanceParameterDict(sr_url, sr_type, sr_config))
     self.waitForInstance()