Update Release Candidate

setup.py

@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '1.0.226'
+version = '1.0.236'
 name = 'slapos.cookbook'
 long_description = open("README.rst").read()
 

slapos/recipe/_urlparse.py

@@ -24,7 +24,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-from urlparse import urlparse
+from six.moves.urllib.parse import urlparse
 
 from slapos.recipe.librecipe import GenericBaseRecipe
 

slapos/test/recipe/test_urlparse.py

+import unittest
+import zc.buildout.testing
+
+class UrlparseTest(unittest.TestCase):
+  def setUp(self):
+    self.buildout = buildout = zc.buildout.testing.Buildout()
+    buildout['urlinfo'] = {}
+    buildout['urlinfo']['url'] = "http://www.google.com/search?hl=en&q=urlparse&btnG=Google+Search"
+    from slapos.recipe import _urlparse
+    self.recipe = _urlparse.Recipe(buildout,"urlinfo",buildout['urlinfo'])
+
+  def test_options(self):
+    buildout = self.buildout
+    self.assertTrue(buildout['urlinfo'])
+    self.assertEqual(buildout['urlinfo']['path'], 'search')
+    self.assertEqual(buildout['urlinfo']['scheme'], 'http')
+    self.assertEqual(buildout['urlinfo']['host'], 'www.google.com')
+    self.assertEqual(buildout['urlinfo']['query'], 'hl=en&q=urlparse&btnG=Google+Search')
+
+  def test_install(self):
+    self.assertEqual(self.recipe.install(), [])

software/caddy-frontend/test/test.py

@@ -6674,6 +6674,9 @@ class TestPassedRequestParameter(HttpFrontendTestCase):
         're6st-verification-url': 're6st-verification-url',
         'request-timeout': '100',
         'root_instance_title': 'testing partition 0',
+        'slap_computer_id': 'local',
+        'slap_computer_partition_id': 'T-0',
+        'slap_software_release_url': base_software_url,
         'slap_software_type': 'RootSoftwareInstance',
         'slave_instance_list': []
       }

software/theia/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [instance-theia]
 _update_hash_filename_ = instance-theia.cfg.jinja.in
-md5sum = 4df9f0d76a134a8abec9060a0c1be50b
+md5sum = 00d15432c1486376d8ba7d0f5ec63c33
 
 [instance]
 _update_hash_filename_ = instance.cfg.in
@@ -31,7 +31,7 @@ md5sum = b3f1dd83033d6a45def0bd26e70d5a9c
 
 [instance-resilient]
 _update_hash_filename_ = instance-resilient.cfg.jinja
-md5sum = b1e338973bc9cfe1bb4e16d46b3c6da9
+md5sum = ad9499e7355ded4975ad313442cecb7a
 
 [theia-common]
 _update_hash_filename_ = theia_common.py

software/theia/instance-output-schema.json

@@ -17,6 +17,10 @@
     "backend-url": {
       "description": "Theia Backend URL",
       "type": "string"
+    },
+    "ipv6": {
+      "description": "A Theia ipv6 address",
+      "type": "string"
     }
   },
   "type": "object"

software/theia/instance-resilient.cfg.jinja

@@ -33,7 +33,7 @@ parts +=
 
 # Ask for the connection parameters of the main theia
 [request-theia]
-return += url username password backend-url
+return += url username password backend-url ipv6
 
 
 # Publish connection parameters of the main theia and resiliency parameters
@@ -43,6 +43,7 @@ url = ${request-theia:connection-url}
 username = ${request-theia:connection-username}
 password = ${request-theia:connection-password}
 backend-url = ${request-theia:connection-backend-url}
+ipv6 = ${request-theia:connection-ipv6}
 monitor-base-url = ${monitor-publish:monitor-base-url}
 monitor-setup-url = ${monitor-publish:monitor-setup-url}
 <= publish-connection-information

software/theia/instance-theia.cfg.jinja.in

@@ -37,7 +37,7 @@ additional-url = $${remote-additional-frontend:connection-secure_access}
 username = $${frontend-instance-password:username}
 password = $${frontend-instance-password:passwd}
 backend-url = $${frontend-instance:url}
-
+ipv6 = {{ ipv6_random }}
 
 [directory]
 recipe = slapos.cookbook:mkdirectory
@@ -353,7 +353,7 @@ template =
   #!/bin/sh
   export HOME=$${directory:home}
   export PATH=${python-language-server:location}/bin:${java-jdk:location}/bin:${cli-utilities:PATH}:$HOME/.cargo/bin:$PATH
-
+  export IPV6_SLAPRUNNER={{ ipv6_random }}
 
 # Theia Backend
 # -------------

software/theia/test/test.py

@@ -125,6 +125,9 @@ class TestTheia(TheiaTestCase):
       resp = self.get(urljoin(authenticated_url, url))
       self.assertTrue(resp.raw)
 
+  def test_ipv6_parameter_published(self):
+    self.assertIn('ipv6', self.connection_parameters)
+
   def test_theia_slapos(self):
     # Make sure we can use the shell and the integrated slapos command
     process = pexpect.spawnu(