Update Release Candidate

CHANGES.rst

 Changes
 =======
 
+1.0.138 (2020-03-03)
+--------------------
+
+- Update postgresql recipe for postgres version 10 and later
+
 1.0.124 (2020-01-30)
 --------------------
 

component/cloudooo/buildout.cfg

@@ -14,7 +14,7 @@ recipe = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/nexedi/cloudooo.git
 branch = master
 git-executable = ${git:location}/bin/git
-revision = 0ff799ebcfea1013342f5450e88ff5c3b8536e89
+revision = 67e233f25845335aaf191e80abae53733d1f2579
 
 [cloudooo]
 recipe = zc.recipe.egg

component/postgresql/buildout.cfg

@@ -8,10 +8,11 @@ extends =
 parts = postgresql
 
 [postgresql]
-<= postgresql92
+<= postgresql10
 
 [postgresql-common]
 recipe = slapos.recipe.cmmi
+shared = true
 configure-options =
   --without-tcl
   --without-perl
@@ -33,7 +34,7 @@ environment =
   CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${openssl:location}/include -I${ncurses:location}/lib
   LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${perl:location}/libs-c -Wl,-rpath=${perl:location}/libs-c
 
-[postgresql92]
+[postgresql10]
 <= postgresql-common
-url = http://ftp.postgresql.org/pub/source/v9.2.23/postgresql-9.2.23.tar.bz2
-md5sum = c972e32b7f17dbc652d2462b7690d116
+url = http://ftp.postgresql.org/pub/source/v10.11/postgresql-10.11.tar.bz2
+md5sum = 01c83ee159bf2a690e75e69e49fe2a1d

setup.py

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

slapos/recipe/certificate_authority/__init__.py

@@ -30,6 +30,7 @@ from six.moves import configparser
 import tempfile
 
 from slapos.recipe.librecipe import GenericBaseRecipe
+from slapos.util import str2bytes
 from .certificate_authority import popenCommunicate
 
 class Recipe(GenericBaseRecipe):
@@ -108,7 +109,7 @@ class Request(Recipe):
     request_needed = True
 
     name = self.options['name']
-    hash_ = hashlib.sha512(name).hexdigest()
+    hash_ = hashlib.sha512(str2bytes(name)).hexdigest()
     key = os.path.join(self.ca_private, hash_ + self.ca_key_ext)
     certificate = os.path.join(self.ca_certs, hash_ + self.ca_crt_ext)
 

slapos/recipe/certificate_authority/certificate_authority.py

@@ -8,7 +8,8 @@ import uuid
 
 
 def popenCommunicate(command_list, input=None):
-  subprocess_kw = dict(stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+  subprocess_kw = dict(stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
+                       universal_newlines=True)
   if input is not None:
     subprocess_kw.update(stdin=subprocess.PIPE)
   popen = subprocess.Popen(command_list, **subprocess_kw)

slapos/recipe/free_port.py

@@ -29,6 +29,7 @@ from six.moves import configparser
 import os
 import netaddr
 import socket
+from six.moves import range
 
 class Recipe(object):
   """
@@ -89,7 +90,7 @@ class Recipe(object):
     This algorithm thus returns always the same value with the same parameters in
     a standard environment.
     """
-    for port in xrange(self.minimum, self.maximum):
+    for port in range(self.minimum, self.maximum):
       sock = socket.socket(self.inet_family, socket.SOCK_STREAM)
       try:
         sock.bind((self.ip, port))

slapos/recipe/notifier.py

@@ -27,6 +27,7 @@
 import os
 from hashlib import sha512
 from slapos.recipe.librecipe import GenericBaseRecipe
+from slapos.util import str2bytes
 
 class Recipe(GenericBaseRecipe):
 
@@ -49,7 +50,7 @@ class Callback(GenericBaseRecipe):
     # XXX: hashing the name here and in
     # slapos.toolbox/slapos/pubsub/__init__.py is completely messed up and
     # prevent any debug.
-    callback_id = sha512(notification_id).hexdigest()
+    callback_id = sha512(str2bytes(notification_id)).hexdigest()
 
     filepath = os.path.join(self.options['callbacks'], callback_id)
     self.addLineToFile(filepath, callback)

slapos/recipe/pbs.py

@@ -46,7 +46,7 @@ def promise(ssh_client, user, host, port):
   with open(os.devnull) as _dev_null:
     ssh = subprocess.Popen(
         (ssh_client, '%s@%s' % (user, host), '-p', str(port)),
-        stdin=subprocess.PIPE, stdout=_dev_null)
+        stdin=subprocess.PIPE, stdout=_dev_null, universal_newlines=True)
   ssh.communicate('q' + chr(255) + chr(0) * 7)
   if ssh.returncode:
     sys.stderr.write("SSH Connection failed\n")

slapos/recipe/postgres/__init__.py

@@ -149,7 +149,7 @@ class Recipe(GenericBaseRecipe):
                     lc_time = 'en_US.UTF-8'
                     default_text_search_config = 'pg_catalog.english'
 
-                    unix_socket_directory = '%s'
+                    unix_socket_directories = '%s'
                     unix_socket_permissions = 0700
                     """ % (
                         ','.join(ipv4.union(ipv6)),

slapos/recipe/promise_plugin.py

@@ -47,7 +47,7 @@ extra_config_dict = %(config)s
 # The solution is to delete all cached 'slapos' modules as well as all cached
 # 'pkg_resources' modules which is responsible of namespace declaration.
 # They will be re-imported again using the updated sys.path
-for module in sys.modules.keys():
+for module in list(sys.modules):
   if 'slapos' in module or 'pkg_resources' in module:
     del sys.modules[module]
 

slapos/recipe/publish_early.py

@@ -28,6 +28,7 @@
 from collections import OrderedDict
 from .librecipe import unwrap, wrap, GenericSlapRecipe
 import six
+from zc.buildout import UserError
 
 def volatileOptions(options, volatile):
   def copy():
@@ -125,7 +126,8 @@ class Recipe(GenericSlapRecipe):
               pass
           buildout.Options = newOptions
           init_section = buildout[init_section]
-          assert buildout.Options is Options
+          if buildout.Options is not Options:
+            raise UserError("%s section was already initialized" % init_section)
           new = {}
           for k, v in six.iteritems(init):
             try:

slapos/recipe/random.py

@@ -38,6 +38,7 @@ import random
 import string
 from .librecipe import GenericBaseRecipe
 from .publish_early import volatileOptions
+from slapos.util import str2bytes
 
 class Integer(object):
   """
@@ -174,7 +175,7 @@ class Password(object):
       fd = os.open(self.storage_path,
         os.O_CREAT | os.O_EXCL | os.O_WRONLY | os.O_TRUNC, 0o600)
       try:
-        os.write(fd, self.passwd)
+        os.write(fd, str2bytes(self.passwd))
       finally:
         os.close(fd)
       if not self.create_once:

slapos/recipe/softwaretype.py

@@ -28,7 +28,7 @@
 import os
 import sys
 import copy
-from ConfigParser import ConfigParser
+from six.moves.configparser import ConfigParser
 import json
 import subprocess
 import slapos.slap
@@ -38,6 +38,7 @@ import errno
 import re
 
 import zc.buildout
+import six
 
 class SlapConfigParser(ConfigParser, object):
   """ 
@@ -57,9 +58,6 @@ class SlapConfigParser(ConfigParser, object):
 
   def write(self, fp):
     """Write an .ini-format representation of the configuration state."""
-    if sys.version_info[0] > 2:
-      return super(SlapConfigParser, self).write(fp)
-
     regex = re.compile(r'^(.*)\s+([+-]{1})$')
     if self._defaults:
       fp.write("[%s]\n" % DEFAULTSECT)
@@ -138,9 +136,9 @@ class Recipe:
     for name, ip in self.parameter_dict['ip_list']:
       if name:
         return name
-    raise AttributeError, "Not network interface found"
+    raise AttributeError("Not network interface found")
   
-  def mkdir_p(self, path, mode=0700):
+  def mkdir_p(self, path, mode=0o700):
     """
     Creates a directory and its parents, if needed.
     NB: If the directory already exists, it does not change its permission.
@@ -193,6 +191,9 @@ class Recipe:
       raise zc.buildout.UserError("The specified buildout config file %r does "
                                   "not exist." % instance_file_path)
 
+    if six.PY3:
+      buildout = SlapConfigParser(strict=False)
+    else:
       buildout = SlapConfigParser()
     with open(instance_file_path) as instance_path:
       buildout.readfp(instance_path)
@@ -231,7 +232,7 @@ class Recipe:
 
     # Copy/paste slap_connection
     buildout.add_section('slap-connection')
-    for key, value in self.buildout['slap_connection'].iteritems():
+    for key, value in six.iteritems(self.buildout['slap_connection']):
       # XXX: Waiting for SlapBaseRecipe to use dash instead of underscores
       buildout.set('slap-connection', key.replace('_', '-'), value)
     # XXX: Needed for lxc. Use non standard API

slapos/recipe/sshkeys_authority.py

@@ -32,6 +32,7 @@ import re
 
 from slapos.recipe.librecipe import GenericBaseRecipe
 from slapos.recipe.librecipe.inotify import subfiles
+from slapos.util import str2bytes
 
 # This authority only works with dropbear or openssh sshkey generators
 def sshkeys_authority(request_directory, keygen_binary):
@@ -112,7 +113,7 @@ class Request(GenericBaseRecipe):
     keys_directory = options['keys-directory']
 
     self.private_key = os.path.join(keys_directory,
-      hashlib.sha256(options['name']).hexdigest())
+      hashlib.sha256(str2bytes(options['name'])).hexdigest())
     self.public_key = self.private_key + '.pub'
 
     options['public-key-value'] = ''

slapos/recipe/switch_softwaretype.py

@@ -26,6 +26,7 @@
 ##############################################################################
 
 import os, subprocess, sys
+import six
 
 class Recipe:
 
@@ -41,7 +42,7 @@ class Recipe:
     # XXX-Antoine: We gotta find a better way to do this. I tried to check
     # out how slapgrid-cp was running buildout. But it is worse than that.
     args = sys.argv[:]
-    for x in self.buildout["slap-connection"].iteritems():
+    for x in six.iteritems(self.buildout["slap-connection"]):
       args.append("slap-connection:%s=%s" % x)
     for x in "directory", "eggs-directory", "develop-eggs-directory":
       args.append("buildout:%s=%s" % (x, self.buildout["buildout"][x]))

software/caddy-frontend/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [template]
 filename = instance.cfg.in
-md5sum = d8ce8da7ea7d82c33958bdbabbaad956
+md5sum = 816bc8179cf4195a35e07f22c36679fa
 
 [template-common]
 filename = instance-common.cfg.in
@@ -22,11 +22,11 @@ md5sum = c801b7f9f11f0965677c22e6bbe9281b
 
 [template-apache-frontend]
 filename = instance-apache-frontend.cfg.in
-md5sum = 378f6da53a02b2bfe7777a493fc95585
+md5sum = 48fb25df53d1465f4c95d1d9c39c40d2
 
 [template-caddy-replicate]
 filename = instance-apache-replicate.cfg.in
-md5sum = a34ab1970f91731c32ed7f2471632c86
+md5sum = 3ada9a41527c6d457798890422b67176
 
 [template-slave-list]
 filename = templates/apache-custom-slave-list.cfg.in
@@ -82,7 +82,7 @@ md5sum = baf7b89cc9ab5506100b0c900808c1ea
 
 [template-trafficserver-logging-config]
 filename = templates/trafficserver/logging.config.jinja2
-md5sum = 0f30ca0d299d0150b22fe8b0ee12f150
+md5sum = 6aed31174dc262ced02f31624321df41
 
 [template-nginx-eventsource-slave-virtualhost]
 filename = templates/nginx-eventsource-slave.conf.in
@@ -118,4 +118,4 @@ md5sum = 38792c2dceae38ab411592ec36fff6a8
 
 [template-kedifa]
 filename = instance-kedifa.cfg.in
-md5sum = d5efd74d80a1df3d5386758c9f13e190
+md5sum = 7814a48cc05d25c8f2d7b527ef2485b5

software/caddy-frontend/instance-apache-frontend.cfg.in

@@ -682,10 +682,8 @@ config-port = ${caddy-configuration:ssl-cache-through-port}
 # Note: Workaround for monitor stack, which uses monitor-httpd-port parameter
 #       directly, and in our case it can come from the network, thus resulting
 #       with need to strip !py!'u'
-{% set monitor_httpd_port = instance_parameter.get('configuration.monitor-httpd-port') %}
-{% if monitor_httpd_port %}
-monitor-httpd-port = {{ monitor_httpd_port | int }}
-{% endif -%}
+monitor-httpd-port = {{ instance_parameter['configuration.monitor-httpd-port'] | int }}
+password = {{ instance_parameter['configuration.monitor-password'] | string }}
 
 [monitor-conf-parameters]
 private-path-list += 

software/caddy-frontend/instance-apache-replicate.cfg.in

 {% if slap_software_type in software_type %}
+{% import "caucase" as caucase with context %}
 {#- SERVER_POLLUTED_KEY_LIST is a list of keys which comes from various SlapOS Master implementations, which mix request and publish keys on each slave information -#}
 {%- set SERVER_POLLUTED_KEY_LIST = ['connection-parameter-hash', 'timestamp', 'slave_title', 'slap_software_type'] -%}
 {%- set TRUE_VALUES = ['y', 'yes', '1', 'true'] -%}
 {%- set GOOD_CIPHER_LIST = ['ECDHE-ECDSA-AES256-GCM-SHA384', 'ECDHE-RSA-AES256-GCM-SHA384', 'ECDHE-ECDSA-AES128-GCM-SHA256', 'ECDHE-RSA-AES128-GCM-SHA256', 'ECDHE-ECDSA-WITH-CHACHA20-POLY1305', 'ECDHE-RSA-WITH-CHACHA20-POLY1305', 'ECDHE-RSA-AES256-CBC-SHA', 'ECDHE-RSA-AES128-CBC-SHA', 'ECDHE-ECDSA-AES256-CBC-SHA', 'ECDHE-ECDSA-AES128-CBC-SHA', 'RSA-AES256-CBC-SHA', 'RSA-AES128-CBC-SHA', 'ECDHE-RSA-3DES-EDE-CBC-SHA', 'RSA-3DES-EDE-CBC-SHA'] %}
 {% set aikc_enabled = slapparameter_dict.get('automatic-internal-kedifa-caucase-csr', 'true').lower() in TRUE_VALUES %}
+{# Ports 8401, 8402 and 8410+1..N are reserved for monitor ports on various partitions #}
+{% set master_partition_monitor_monitor_httpd_port = 8401 %}
+{% set kedifa_partition_monitor_httpd_port = 8402 %}
+{% set frontend_monitor_httpd_base_port = 8410 %}
 [jinja2-template-base]
 recipe = slapos.recipe.template:jinja2
 rendered = ${buildout:directory}/${:filename}
@@ -58,6 +63,7 @@ context =
 {%       do config_dict.__setitem__(key[config_key_length:], slapparameter_dict.pop(key)) %}
 {%     endif %}
 {%   endfor %}
+{%   do config_dict.__setitem__('monitor-httpd-port', frontend_monitor_httpd_base_port + i) %}
 {%   do frontend_list.append(frontend_name) %}
 {%   do frontend_section_list.append(request_section_title) %}
 {%   do part_list.append(request_section_title) %}
@@ -202,7 +208,7 @@ context =
 {% do authorized_slave_list.sort() %}
 
 [monitor-instance-parameter]
-monitor-httpd-port = {{ slapparameter_dict.get('monitor-httpd-port', '8196') }}
+monitor-httpd-port = {{ master_partition_monitor_monitor_httpd_port }}
 
 [replicate]
 <= slap-connection
@@ -305,6 +311,7 @@ recipe = slapos.cookbook:requestoptional.serialised
 config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
 config-monitor-username = ${monitor-instance-parameter:username}
 config-monitor-password = ${monitor-htpasswd:passwd}
+config-monitor-httpd-port = {{ kedifa_partition_monitor_httpd_port }}
 {% for key in ['kedifa_port', 'caucase_port'] -%}
 {%-   if key in slapparameter_dict %}
 config-{{ key }} = {{ dumps(slapparameter_dict[key]) }}
@@ -369,11 +376,10 @@ extra-context =
     section warning_slave_information warning-slave-information
     key slave_kedifa_information request-kedifa:connection-slave-kedifa-information
 
-[monitor-conf-parameters]
-monitor-url-list +=
-  ${request-kedifa:connection-monitor-base-url}
+[monitor-base-url-dict]
+kedifa = ${request-kedifa:connection-monitor-base-url}
 {% for frontend in frontend_section_list %}
-{{ '  ${' + frontend + ':connection-monitor-base-url}' }}
+{{ frontend }} = {{ '${' + frontend + ':connection-monitor-base-url}' }}
 {% endfor %}
 
 {% if aikc_enabled %}
@@ -448,6 +454,21 @@ command =
     touch ${aikc-config:user-created}
   fi
 
+{% do part_list.append('aikc-user-caucase-updater') %}
+{{ caucase.updater(
+     prefix='aikc-user-caucase-updater',
+     buildout_bin_directory=parameter_dict['bin_directory'],
+     updater_path='${directory:service}/aikc-user-caucase-updater',
+     url='${aikc-config:caucase-url}',
+     data_dir='${directory:srv}/caucase-updater',
+     crt_path='${aikc-config:key}',
+     ca_path='${aikc-config:user-ca-certificate}',
+     crl_path='${aikc-config:user-crl}',
+     key_path='${aikc-config:key}',
+     mode='user',
+)}}
+
+
 [aikc-check-certificate]
 recipe = slapos.recipe.template:jinja2
 rendered = ${directory:bin}/aikc-check-certificate

software/caddy-frontend/instance-kedifa.cfg.in

@@ -20,6 +20,13 @@ parts =
   expose-csr_id
   promise-expose-csr_id-ip-port
 
+[monitor-instance-parameter]
+# Note: Workaround for monitor stack, which uses monitor-httpd-port parameter
+#       directly, and in our case it can come from the network, thus resulting
+#       with need to strip !py!'u'
+monitor-httpd-port = {{ instance_parameter['configuration.monitor-httpd-port'] | int }}
+password = {{ instance_parameter['configuration.monitor-password'] | string }}
+
 [caucased]
 hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
 
@@ -288,4 +295,5 @@ master-key-upload-url = https://[${kedifa-config:ip}]:${kedifa-config:port}/${ma
 master-key-download-url = https://[${kedifa-config:ip}]:${kedifa-config:port}/${master-auth-random:passwd}
 csr_id-url = https://[${expose-csr_id-configuration:ip}]:${expose-csr_id-configuration:port}/csr_id.txt
 csr_id-certificate = ${get-csr_id-certificate:certificate}
+monitor-base-url = ${monitor-instance-parameter:monitor-base-url}
 {%- endif -%} {# if slap_software_type in software_type #}

software/caddy-frontend/instance.cfg.in

@@ -65,6 +65,9 @@ extra-context =
     raw template_monitor {{ monitor2_template }}
     raw common_profile {{ common_profile }}
     section parameter_dict dynamic-template-caddy-frontend-parameters
+caucase-jinja2-library = {{ caucase_jinja2_library }}
+import-list =
+  file caucase :caucase-jinja2-library
 
 [dynamic-template-kedifa]
 < = jinja2-template-base
@@ -119,7 +122,6 @@ configuration.ciphers =
 configuration.request-timeout = 600
 configuration.enable-quic = false
 configuration.mpm-graceful-shutdown-timeout = 5
-configuration.monitor-httpd-port = 8072
 configuration.frontend-name =
 configuration.proxy-try-duration = 5
 configuration.proxy-try-interval = 250

software/caddy-frontend/templates/trafficserver/logging.config.jinja2

 squid = format {
-   Format = '%<cqtq> %<ttms> %<chi> %<crc>/%<pssc> %<psql> %<cqhm> %<cquc> %<caun> %<phr>/%<pqsn> %<psct>'
+   Format = '%<cqtq> %<ttms> %<chi> %<crc>/%<pssc> %<psql> %<cqhm> %<cquc> %<cluc> %<caun> %<phr>/%<pqsn> %<psct>'
 }
 log.ascii {
    Format = squid,

software/caddy-frontend/test/test.py

@@ -47,6 +47,7 @@ import gzip
 import base64
 import re
 from slapos.recipe.librecipe import generateHashFromFiles
+import xml.etree.ElementTree as ET
 
 
 try:
@@ -73,9 +74,6 @@ setUpModule, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass(
 # ports chosen to not collide with test systems
 HTTP_PORT = '11080'
 HTTPS_PORT = '11443'
-MONITOR_HTTPD_PORT = '13000'
-MONITOR_F1_HTTPD_PORT = '13001'
-MONITOR_F2_HTTPD_PORT = '13002'
 CAUCASE_PORT = '15090'
 KEDIFA_PORT = '15080'
 
@@ -559,9 +557,12 @@ class SlaveHttpFrontendTestCase(SlapOSInstanceTestCase):
       cls.waitForCaddy()
     except BaseException:
       cls.logger.exception("Error during setUpClass")
-      # "{}.{}.setUpClass".format(cls.__module__, cls.__name__) is already used by SlapOSInstanceTestCase.setUpClass
-      # so we use another name for snapshot, to make sure we don't store another snapshot in same directory.
-      cls._cleanup("{}.SlaveHttpFrontendTestCase.{}.setUpClass".format(cls.__module__, cls.__name__))
+      # "{}.{}.setUpClass".format(cls.__module__, cls.__name__) is already used
+      # by SlapOSInstanceTestCase.setUpClass so we use another name for
+      # snapshot, to make sure we don't store another snapshot in same
+      # directory.
+      cls._cleanup("{}.SlaveHttpFrontendTestCase.{}.setUpClass".format(
+        cls.__module__, cls.__name__))
       cls.setUp = lambda self: self.fail('Setup Class failed.')
       raise
 
@@ -944,7 +945,6 @@ class TestMasterRequestDomain(SlaveHttpFrontendTestCase, TestDataMixin):
       'domain': 'example.com',
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'monitor-httpd-port': MONITOR_HTTPD_PORT,
       'kedifa_port': KEDIFA_PORT,
       'caucase_port': CAUCASE_PORT,
     }
@@ -964,7 +964,7 @@ class TestMasterRequestDomain(SlaveHttpFrontendTestCase, TestDataMixin):
 
     self.assertEqual(
       {
-        'monitor-base-url': 'https://[%s]:13000' % self._ipv6_address,
+        'monitor-base-url': 'https://[%s]:8401' % self._ipv6_address,
         'domain': 'example.com',
         'accepted-slave-amount': '1',
         'rejected-slave-amount': '0',
@@ -981,7 +981,6 @@ class TestMasterRequest(SlaveHttpFrontendTestCase, TestDataMixin):
     return {
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'monitor-httpd-port': MONITOR_HTTPD_PORT,
       'kedifa_port': KEDIFA_PORT,
       'caucase_port': CAUCASE_PORT,
     }
@@ -1000,7 +999,7 @@ class TestMasterRequest(SlaveHttpFrontendTestCase, TestDataMixin):
     self.assertRejectedSlavePromiseWithPop(parameter_dict)
     self.assertEqual(
       {
-        'monitor-base-url': 'https://[%s]:13000' % self._ipv6_address,
+        'monitor-base-url': 'https://[%s]:8401' % self._ipv6_address,
         'domain': 'None',
         'accepted-slave-amount': '1',
         'rejected-slave-amount': '0',
@@ -1080,8 +1079,6 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
       '_apache_custom_http_s-accepted _caddy_custom_http_s-accepted',
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'monitor-httpd-port': MONITOR_HTTPD_PORT,
-      '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT,
       'kedifa_port': KEDIFA_PORT,
       'caucase_port': CAUCASE_PORT,
       'mpm-graceful-shutdown-timeout': 2,
@@ -1371,6 +1368,102 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
       }
     }
 
+  monitor_setup_url_key = 'monitor-setup-url'
+
+  def test_monitor_setup(self):
+    IP = self._ipv6_address
+    self.monitor_configuration_list = [
+      {
+        'htmlUrl': 'https://[%s]:8401/public/feed' % (IP,),
+        'text': 'testing partition 0',
+        'title': 'testing partition 0',
+        'type': 'rss',
+        'url': 'https://[%s]:8401/share/private/' % (IP,),
+        'version': 'RSS',
+        'xmlUrl': 'https://[%s]:8401/public/feed' % (IP,),
+      },
+      {
+        'htmlUrl': 'https://[%s]:8402/public/feed' % (IP,),
+        'text': 'kedifa',
+        'title': 'kedifa',
+        'type': 'rss',
+        'url': 'https://[%s]:8402/share/private/' % (IP,),
+        'version': 'RSS',
+        'xmlUrl': 'https://[%s]:8402/public/feed' % (IP,),
+      },
+      {
+        'htmlUrl': 'https://[%s]:8411/public/feed' % (IP,),
+        'text': 'caddy-frontend-1',
+        'title': 'caddy-frontend-1',
+        'type': 'rss',
+        'url': 'https://[%s]:8411/share/private/' % (IP,),
+        'version': 'RSS',
+        'xmlUrl': 'https://[%s]:8411/public/feed' % (IP,),
+      },
+    ]
+    connection_parameter_dict = self\
+        .computer_partition.getConnectionParameterDict()
+    self.assertTrue(
+      self.monitor_setup_url_key in connection_parameter_dict,
+      '%s not in %s' % (self.monitor_setup_url_key, connection_parameter_dict))
+    monitor_setup_url_value = connection_parameter_dict[
+      self.monitor_setup_url_key]
+    monitor_url_match = re.match(r'.*url=(.*)', monitor_setup_url_value)
+    self.assertNotEqual(
+      None, monitor_url_match, '%s not parsable' % (monitor_setup_url_value,))
+    self.assertEqual(1, len(monitor_url_match.groups()))
+    monitor_url = monitor_url_match.groups()[0]
+    monitor_url_split = monitor_url.split('&')
+    self.assertEqual(
+      3, len(monitor_url_split), '%s not splitabble' % (monitor_url,))
+    self.monitor_url = monitor_url_split[0]
+    monitor_username = monitor_url_split[1].split('=')
+    self.assertEqual(
+      2, len(monitor_username), '%s not splittable' % (monitor_username))
+    monitor_password = monitor_url_split[2].split('=')
+    self.assertEqual(
+      2, len(monitor_password), '%s not splittable' % (monitor_password))
+    self.monitor_username = monitor_username[1]
+    self.monitor_password = monitor_password[1]
+
+    opml_text = requests.get(self.monitor_url, verify=False).text
+    opml = ET.fromstring(opml_text)
+
+    body = opml[1]
+    self.assertEqual('body', body.tag)
+
+    outline_list = body[0].findall('outline')
+
+    self.assertEqual(
+      self.monitor_configuration_list,
+      [q.attrib for q in outline_list]
+    )
+
+    expected_status_code_list = []
+    got_status_code_list = []
+    for monitor_configuration in self.monitor_configuration_list:
+      status_code = requests.get(
+          monitor_configuration['url'],
+          verify=False,
+          auth=(self.monitor_username, self.monitor_password)
+        ).status_code
+      expected_status_code_list.append(
+        {
+          'url': monitor_configuration['url'],
+          'status_code': 200
+        }
+      )
+      got_status_code_list.append(
+        {
+          'url': monitor_configuration['url'],
+          'status_code': status_code
+        }
+      )
+    self.assertEqual(
+      expected_status_code_list,
+      got_status_code_list
+    )
+
   def getMasterPartitionPath(self):
     # partition w/o etc/trafficserver, but with buildout.cfg
     return [
@@ -1444,7 +1537,7 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
     self.assertRejectedSlavePromiseWithPop(parameter_dict)
 
     expected_parameter_dict = {
-      'monitor-base-url': 'https://[%s]:13000' % self._ipv6_address,
+      'monitor-base-url': 'https://[%s]:8401' % self._ipv6_address,
       'domain': 'example.com',
       'accepted-slave-amount': '54',
       'rejected-slave-amount': '0',
@@ -4118,9 +4211,6 @@ class TestReplicateSlave(SlaveHttpFrontendTestCase, TestDataMixin):
       '-frontend-2-state': 'stopped',
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'monitor-httpd-port': MONITOR_HTTPD_PORT,
-      '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT,
-      '-frontend-config-2-monitor-httpd-port': MONITOR_F2_HTTPD_PORT,
       'kedifa_port': KEDIFA_PORT,
       'caucase_port': CAUCASE_PORT,
     }
@@ -4189,9 +4279,6 @@ class TestReplicateSlaveOtherDestroyed(SlaveHttpFrontendTestCase):
       '-frontend-2-state': 'destroyed',
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'monitor-httpd-port': MONITOR_HTTPD_PORT,
-      '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT,
-      '-frontend-config-2-monitor-httpd-port': MONITOR_F2_HTTPD_PORT,
       'kedifa_port': KEDIFA_PORT,
       'caucase_port': CAUCASE_PORT,
     }
@@ -4231,8 +4318,6 @@ class TestEnableHttp2ByDefaultFalseSlave(SlaveHttpFrontendTestCase,
       'enable-http2-by-default': 'false',
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'monitor-httpd-port': MONITOR_HTTPD_PORT,
-      '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT,
       'kedifa_port': KEDIFA_PORT,
       'caucase_port': CAUCASE_PORT,
     }
@@ -4325,8 +4410,6 @@ class TestEnableHttp2ByDefaultDefaultSlave(SlaveHttpFrontendTestCase,
       'public-ipv4': cls._ipv4_address,
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'monitor-httpd-port': MONITOR_HTTPD_PORT,
-      '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT,
       'kedifa_port': KEDIFA_PORT,
       'caucase_port': CAUCASE_PORT,
     }
@@ -4417,8 +4500,6 @@ class TestRe6stVerificationUrlDefaultSlave(SlaveHttpFrontendTestCase,
     return {
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'monitor-httpd-port': MONITOR_HTTPD_PORT,
-      '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT,
       'kedifa_port': KEDIFA_PORT,
       'caucase_port': CAUCASE_PORT,
     }
@@ -4477,8 +4558,6 @@ class TestRe6stVerificationUrlSlave(SlaveHttpFrontendTestCase,
     return {
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'monitor-httpd-port': MONITOR_HTTPD_PORT,
-      '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT,
       're6st-verification-url': 'some-re6st-verification-url',
       'kedifa_port': KEDIFA_PORT,
       'caucase_port': CAUCASE_PORT,
@@ -4540,8 +4619,6 @@ class TestMalformedBackenUrlSlave(SlaveHttpFrontendTestCase,
       'public-ipv4': cls._ipv4_address,
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'monitor-httpd-port': MONITOR_HTTPD_PORT,
-      '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT,
       'kedifa_port': KEDIFA_PORT,
       'caucase_port': CAUCASE_PORT,
     }
@@ -4566,7 +4643,7 @@ class TestMalformedBackenUrlSlave(SlaveHttpFrontendTestCase,
     self.assertRejectedSlavePromiseWithPop(parameter_dict)
 
     expected_parameter_dict = {
-      'monitor-base-url': 'https://[%s]:13000' % self._ipv6_address,
+      'monitor-base-url': 'https://[%s]:8401' % self._ipv6_address,
       'domain': 'example.com',
       'accepted-slave-amount': '1',
       'rejected-slave-amount': '2',
@@ -4691,8 +4768,6 @@ class TestQuicEnabled(SlaveHttpFrontendTestCase, TestDataMixin):
       'enable-quic': 'true',
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'monitor-httpd-port': MONITOR_HTTPD_PORT,
-      '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT,
       'mpm-graceful-shutdown-timeout': 2,
       'kedifa_port': KEDIFA_PORT,
       'caucase_port': CAUCASE_PORT,
@@ -4792,8 +4867,6 @@ class TestSlaveBadParameters(SlaveHttpFrontendTestCase, TestDataMixin):
       'public-ipv4': cls._ipv4_address,
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'monitor-httpd-port': MONITOR_HTTPD_PORT,
-      '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT,
       'mpm-graceful-shutdown-timeout': 2,
       'kedifa_port': KEDIFA_PORT,
       'caucase_port': CAUCASE_PORT,
@@ -4852,7 +4925,7 @@ class TestSlaveBadParameters(SlaveHttpFrontendTestCase, TestDataMixin):
     self.assertRejectedSlavePromiseWithPop(parameter_dict)
 
     expected_parameter_dict = {
-      'monitor-base-url': 'https://[%s]:13000' % self._ipv6_address,
+      'monitor-base-url': 'https://[%s]:8401' % self._ipv6_address,
       'domain': 'example.com',
       'accepted-slave-amount': '8',
       'rejected-slave-amount': '3',
@@ -5203,8 +5276,6 @@ class TestDuplicateSiteKeyProtection(SlaveHttpFrontendTestCase, TestDataMixin):
       'public-ipv4': cls._ipv4_address,
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'monitor-httpd-port': MONITOR_HTTPD_PORT,
-      '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT,
       'mpm-graceful-shutdown-timeout': 2,
       'kedifa_port': KEDIFA_PORT,
       'caucase_port': CAUCASE_PORT,
@@ -5235,7 +5306,7 @@ class TestDuplicateSiteKeyProtection(SlaveHttpFrontendTestCase, TestDataMixin):
     self.assertRejectedSlavePromiseWithPop(parameter_dict)
 
     expected_parameter_dict = {
-      'monitor-base-url': 'https://[%s]:13000' % self._ipv6_address,
+      'monitor-base-url': 'https://[%s]:8401' % self._ipv6_address,
       'domain': 'example.com',
       'accepted-slave-amount': '1',
       'rejected-slave-amount': '3',
@@ -5460,8 +5531,6 @@ class TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster(
       'apache-key': cls.key_pem,
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'monitor-httpd-port': MONITOR_HTTPD_PORT,
-      '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT,
       'kedifa_port': KEDIFA_PORT,
       'caucase_port': CAUCASE_PORT,
       'mpm-graceful-shutdown-timeout': 2,
@@ -5601,8 +5670,6 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
       'apache-key': cls.key_pem,
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'monitor-httpd-port': MONITOR_HTTPD_PORT,
-      '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT,
       'kedifa_port': KEDIFA_PORT,
       'caucase_port': CAUCASE_PORT,
       'mpm-graceful-shutdown-timeout': 2,
@@ -5693,7 +5760,7 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
     self.assertRejectedSlavePromiseWithPop(parameter_dict)
 
     expected_parameter_dict = {
-      'monitor-base-url': 'https://[%s]:13000' % self._ipv6_address,
+      'monitor-base-url': 'https://[%s]:8401' % self._ipv6_address,
       'domain': 'example.com',
       'accepted-slave-amount': '12',
       'rejected-slave-amount': '0',
@@ -6352,8 +6419,6 @@ class TestSlaveSlapOSMasterCertificateCompatibilityUpdate(
     'domain': 'example.com',
     'port': HTTPS_PORT,
     'plain_http_port': HTTP_PORT,
-    'monitor-httpd-port': MONITOR_HTTPD_PORT,
-    '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT,
     'kedifa_port': KEDIFA_PORT,
     'caucase_port': CAUCASE_PORT,
     'mpm-graceful-shutdown-timeout': 2,
@@ -6386,7 +6451,7 @@ class TestSlaveSlapOSMasterCertificateCompatibilityUpdate(
     self.assertRejectedSlavePromiseWithPop(parameter_dict)
 
     expected_parameter_dict = {
-      'monitor-base-url': 'https://[%s]:13000' % self._ipv6_address,
+      'monitor-base-url': 'https://[%s]:8401' % self._ipv6_address,
       'domain': 'example.com',
       'accepted-slave-amount': '1',
       'rejected-slave-amount': '0',
@@ -6465,8 +6530,6 @@ class TestSlaveCiphers(SlaveHttpFrontendTestCase, TestDataMixin):
       '_apache_custom_http_s-accepted _caddy_custom_http_s-accepted',
       'port': HTTPS_PORT,
       'plain_http_port': HTTP_PORT,
-      'monitor-httpd-port': MONITOR_HTTPD_PORT,
-      '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT,
       'kedifa_port': KEDIFA_PORT,
       'caucase_port': CAUCASE_PORT,
       'mpm-graceful-shutdown-timeout': 2,
@@ -6495,7 +6558,7 @@ class TestSlaveCiphers(SlaveHttpFrontendTestCase, TestDataMixin):
     self.assertRejectedSlavePromiseWithPop(parameter_dict)
 
     expected_parameter_dict = {
-      'monitor-base-url': 'https://[%s]:13000' % self._ipv6_address,
+      'monitor-base-url': 'https://[%s]:8401' % self._ipv6_address,
       'domain': 'example.com',
       'accepted-slave-amount': '2',
       'rejected-slave-amount': '0',

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_log-CADDY.txt

@@ -2,6 +2,7 @@ T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.log
+T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-cache-direct/_dummy-cached_access_log

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor-httpd.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_supervisor_state-CADDY.txt

+T-0:aikc-user-caucase-updater-on-watch RUNNING
 T-0:bootstrap-monitor EXITED
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
@@ -12,7 +13,7 @@ T-1:crond-{hash-generic}-on-watch RUNNING
 T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
 T-1:kedifa-{hash-generic}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch EXITED
+T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
 T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt

@@ -2,6 +2,7 @@ T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.log
+T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-cache-direct/_dummy-cached_access_log

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor-httpd.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt

+T-0:aikc-user-caucase-updater-on-watch RUNNING
 T-0:bootstrap-monitor EXITED
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
@@ -12,7 +13,7 @@ T-1:crond-{hash-generic}-on-watch RUNNING
 T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
 T-1:kedifa-{hash-generic}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch EXITED
+T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
 T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_log-CADDY.txt

@@ -2,6 +2,7 @@ T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.log
+T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-cache-direct/_dummy-cached_access_log

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor-httpd.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_supervisor_state-CADDY.txt

+T-0:aikc-user-caucase-updater-on-watch RUNNING
 T-0:bootstrap-monitor EXITED
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
@@ -12,7 +13,7 @@ T-1:crond-{hash-generic}-on-watch RUNNING
 T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
 T-1:kedifa-{hash-generic}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch EXITED
+T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
 T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt

@@ -2,6 +2,7 @@ T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.log
+T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-cache-direct/_dummy-cached_access_log

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor-httpd.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt

+T-0:aikc-user-caucase-updater-on-watch RUNNING
 T-0:bootstrap-monitor EXITED
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
@@ -12,7 +13,7 @@ T-1:crond-{hash-generic}-on-watch RUNNING
 T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
 T-1:kedifa-{hash-generic}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch EXITED
+T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
 T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_log-CADDY.txt

@@ -2,6 +2,7 @@ T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.log
+T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-cache-direct/_waitforcaddyslave_access_log
@@ -9,5 +10,6 @@ T-2/var/log/httpd-cache-direct/_waitforcaddyslave_error_log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_waitforcaddyslave_access_log
 T-2/var/log/httpd/_waitforcaddyslave_error_log
+T-2/var/log/monitor-httpd-error.log
 T-2/var/log/trafficserver/manager.log
 T-2/var/log/trafficserver/traffic.out
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor-httpd.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
+T-2/var/run/monitor-httpd.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequest.test_supervisor_state-CADDY.txt

+T-0:aikc-user-caucase-updater-on-watch RUNNING
 T-0:bootstrap-monitor EXITED
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
@@ -12,7 +13,7 @@ T-1:crond-{hash-generic}-on-watch RUNNING
 T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
 T-1:kedifa-{hash-generic}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch EXITED
+T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
 T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
@@ -26,7 +27,7 @@ T-2:frontend-caddy-safe-graceful EXITED
 T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
 T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
 T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-{hash-generic}-on-watch EXITED
+T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
 T-2:trafficserver-reload EXITED
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_log-CADDY.txt

@@ -2,6 +2,7 @@ T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.log
+T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-cache-direct/_waitforcaddyslave_access_log
@@ -9,5 +10,6 @@ T-2/var/log/httpd-cache-direct/_waitforcaddyslave_error_log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_waitforcaddyslave_access_log
 T-2/var/log/httpd/_waitforcaddyslave_error_log
+T-2/var/log/monitor-httpd-error.log
 T-2/var/log/trafficserver/manager.log
 T-2/var/log/trafficserver/traffic.out
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor-httpd.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
+T-2/var/run/monitor-httpd.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_supervisor_state-CADDY.txt

+T-0:aikc-user-caucase-updater-on-watch RUNNING
 T-0:bootstrap-monitor EXITED
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
@@ -12,7 +13,7 @@ T-1:crond-{hash-generic}-on-watch RUNNING
 T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
 T-1:kedifa-{hash-generic}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch EXITED
+T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
 T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
@@ -26,7 +27,7 @@ T-2:frontend-caddy-safe-graceful EXITED
 T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
 T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
 T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-{hash-generic}-on-watch EXITED
+T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
 T-2:trafficserver-reload EXITED
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_log-CADDY.txt

@@ -2,6 +2,7 @@ T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.log
+T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-cache-direct/_url_access_log

software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor-httpd.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_supervisor_state-CADDY.txt

+T-0:aikc-user-caucase-updater-on-watch RUNNING
 T-0:bootstrap-monitor EXITED
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
@@ -12,7 +13,7 @@ T-1:crond-{hash-generic}-on-watch RUNNING
 T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
 T-1:kedifa-{hash-generic}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch EXITED
+T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
 T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_log-CADDY.txt

@@ -2,6 +2,7 @@ T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.log
+T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-cache-direct/_default_access_log

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor-httpd.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_supervisor_state-CADDY.txt

+T-0:aikc-user-caucase-updater-on-watch RUNNING
 T-0:bootstrap-monitor EXITED
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
@@ -12,7 +13,7 @@ T-1:crond-{hash-generic}-on-watch RUNNING
 T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
 T-1:kedifa-{hash-generic}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch EXITED
+T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
 T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_log-CADDY.txt

@@ -2,6 +2,7 @@ T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.log
+T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-cache-direct/_enable_cache-disable-no-cache-request_access_log

software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor-httpd.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlave.test_supervisor_state-CADDY.txt

+T-0:aikc-user-caucase-updater-on-watch RUNNING
 T-0:bootstrap-monitor EXITED
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
@@ -12,7 +13,7 @@ T-1:crond-{hash-generic}-on-watch RUNNING
 T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
 T-1:kedifa-{hash-generic}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch EXITED
+T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
 T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_log-CADDY.txt

@@ -2,6 +2,7 @@ T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.log
+T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-cache-direct/_default_ciphers_access_log

software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor-httpd.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_supervisor_state-CADDY.txt

+T-0:aikc-user-caucase-updater-on-watch RUNNING
 T-0:bootstrap-monitor EXITED
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
@@ -12,7 +13,7 @@ T-1:crond-{hash-generic}-on-watch RUNNING
 T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
 T-1:kedifa-{hash-generic}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch EXITED
+T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
 T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt

@@ -2,6 +2,7 @@ T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.log
+T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-cache-direct/_enable_cache-disable-no-cache-request_access_log

software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor-httpd.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt

+T-0:aikc-user-caucase-updater-on-watch RUNNING
 T-0:bootstrap-monitor EXITED
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
@@ -12,7 +13,7 @@ T-1:crond-{hash-generic}-on-watch RUNNING
 T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
 T-1:kedifa-{hash-generic}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch EXITED
+T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
 T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_log-CADDY.txt

@@ -2,6 +2,7 @@ T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.log
+T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-cache-direct/_ssl_from_master_access_log

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor-httpd.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_supervisor_state-CADDY.txt

+T-0:aikc-user-caucase-updater-on-watch RUNNING
 T-0:bootstrap-monitor EXITED
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
@@ -12,7 +13,7 @@ T-1:crond-{hash-generic}-on-watch RUNNING
 T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
 T-1:kedifa-{hash-generic}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch EXITED
+T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
 T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_log-CADDY.txt

@@ -2,6 +2,7 @@ T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.log
+T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-cache-direct/_ssl_from_master_kedifa_overrides_master_certificate_access_log

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor-httpd.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_supervisor_state-CADDY.txt

+T-0:aikc-user-caucase-updater-on-watch RUNNING
 T-0:bootstrap-monitor EXITED
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
@@ -12,7 +13,7 @@ T-1:crond-{hash-generic}-on-watch RUNNING
 T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
 T-1:kedifa-{hash-generic}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch EXITED
+T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
 T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_log-CADDY.txt

@@ -2,6 +2,7 @@ T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.log
+T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-cache-direct/_ssl_from_master_access_log

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor-httpd.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_supervisor_state-CADDY.txt

+T-0:aikc-user-caucase-updater-on-watch RUNNING
 T-0:bootstrap-monitor EXITED
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
@@ -12,7 +13,7 @@ T-1:crond-{hash-generic}-on-watch RUNNING
 T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
 T-1:kedifa-{hash-generic}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch EXITED
+T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
 T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING

software/kvm/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = a236b719aaac61ac342ada0ce569151a
 
 [template-kvm]
 filename = instance-kvm.cfg.jinja2
-md5sum = d604d8696815716ac51af770164e86d5
+md5sum = fd0b26e5ae200ce2f7ee2a169731998c
 
 [template-kvm-cluster]
 filename = instance-kvm-cluster.cfg.jinja2.in

software/kvm/instance-kvm.cfg.jinja2

@@ -490,8 +490,8 @@ filename = ${frontend-additional-port-execute:output}
 <= monitor-publish
 recipe = slapos.cookbook:publish
 ipv6 = ${slap-network-information:global-ipv6}
-backend-url = https://[${novnc-instance:ip}]:${novnc-instance:port}/vnc.html?host=[${novnc-instance:ip}]&port=${novnc-instance:port}&encrypt=1&password=${kvm-controller-parameter-dict:vnc-passwd}
-url = ${request-slave-frontend:connection-secure_access}/vnc.html?host=${request-slave-frontend:connection-domain}&port=${frontend-port:port}&encrypt=1&password=${kvm-controller-parameter-dict:vnc-passwd}
+backend-url = https://[${novnc-instance:ip}]:${novnc-instance:port}/vnc.html?auto=1&encrypt=1&password=${kvm-controller-parameter-dict:vnc-passwd}
+url = ${request-slave-frontend:connection-secure_access}/vnc.html?auto=1&encrypt=1&password=${kvm-controller-parameter-dict:vnc-passwd}
 {% if additional_frontend %}
 url-additional = ${request-slave-frontend-additional:connection-secure_access}/vnc.html?host=${request-slave-frontend-additional:connection-domain}&port=${frontend-additional-port:port}&encrypt=1&password=${kvm-controller-parameter-dict:vnc-passwd}
 {% endif %}

software/kvm/test/test.py

@@ -28,10 +28,8 @@
 import httplib
 import json
 import os
-import re
 import requests
 import slapos.util
-import subprocess
 import sqlite3
 import urlparse
 import unittest
@@ -39,20 +37,10 @@ import unittest
 from slapos.recipe.librecipe import generateHashFromFiles
 from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
 
+has_kvm = os.access('/dev/kvm', os.R_OK|os.W_OK)
+skipUnlessKvm = unittest.skipUnless(has_kvm, 'kvm not loaded or not allowed')
 
-def sanityCheck():
-  try:
-    output = subprocess.check_output("lsmod | grep kvm_intel", shell=True)
-  except subprocess.CalledProcessError as e:
-    state = False
-    output = e.output
-  else:
-    state = True
-  if state is True and re.search(r'kvm.*kvm_intel', output):
-    return True
-
-
-if sanityCheck():
+if has_kvm:
   setUpModule, InstanceTestCase = makeModuleSetUpAndTestCaseClass(
     os.path.abspath(
         os.path.join(os.path.dirname(__file__), '..', 'software.cfg')))
@@ -61,12 +49,11 @@ else:
 
   class SanityCheckTestCase(unittest.TestCase):
     def test_kvm_sanity_check(self):
-      if not(sanityCheck()):
-        self.fail('This environment is not usable for kvm testing, as it '
-                  'lacks kvm_intel kernel module')
+      self.fail('This environment is not usable for kvm testing,'
+                ' as it lacks kvm_intel kernel module')
 
 
-@unittest.skipIf(not sanityCheck(), 'missing kvm_intel module')
+@skipUnlessKvm
 class ServicesTestCase(InstanceTestCase):
   def test_hashes(self):
     hash_files = [
@@ -162,7 +149,7 @@ class MonitorAccessMixin(object):
     )
 
 
-@unittest.skipIf(not sanityCheck(), 'missing kvm_intel module')
+@skipUnlessKvm
 class TestAccessDefault(MonitorAccessMixin, InstanceTestCase):
   __partition_reference__ = 'ad'
   expected_partition_with_monitor_base_url_count = 1
@@ -179,7 +166,7 @@ class TestAccessDefault(MonitorAccessMixin, InstanceTestCase):
     self.assertFalse('url-additional' in connection_parameter_dict)
 
 
-@unittest.skipIf(not sanityCheck(), 'missing kvm_intel module')
+@skipUnlessKvm
 class TestAccessDefaultAdditional(MonitorAccessMixin, InstanceTestCase):
   __partition_reference__ = 'ada'
   expected_partition_with_monitor_base_url_count = 1
@@ -210,7 +197,7 @@ class TestAccessDefaultAdditional(MonitorAccessMixin, InstanceTestCase):
     self.assertTrue('<title>noVNC</title>' in result.text)
 
 
-@unittest.skipIf(not sanityCheck(), 'missing kvm_intel module')
+@skipUnlessKvm
 class TestAccessKvmCluster(MonitorAccessMixin, InstanceTestCase):
   __partition_reference__ = 'akc'
   expected_partition_with_monitor_base_url_count = 2
@@ -241,7 +228,7 @@ class TestAccessKvmCluster(MonitorAccessMixin, InstanceTestCase):
     self.assertFalse('kvm0-url-additional' in connection_parameter_dict)
 
 
-@unittest.skipIf(not sanityCheck(), 'missing kvm_intel module')
+@skipUnlessKvm
 class TestAccessKvmClusterAdditional(MonitorAccessMixin, InstanceTestCase):
   __partition_reference__ = 'akca'
   expected_partition_with_monitor_base_url_count = 2
@@ -282,7 +269,7 @@ class TestAccessKvmClusterAdditional(MonitorAccessMixin, InstanceTestCase):
     self.assertTrue('<title>noVNC</title>' in result.text)
 
 
-@unittest.skipIf(not sanityCheck(), 'missing kvm_intel module')
+@skipUnlessKvm
 class TestInstanceResilient(InstanceTestCase):
   __partition_reference__ = 'ir'
   instance_max_retry = 20
@@ -309,7 +296,7 @@ class TestInstanceResilient(InstanceTestCase):
         'takeover-kvm-1-url',
         'url']))
 
-@unittest.skipIf(not sanityCheck(), 'missing kvm_intel module')
+@skipUnlessKvm
 class TestAccessResilientAdditional(InstanceTestCase):
   __partition_reference__ = 'ara'
   expected_partition_with_monitor_base_url_count = 1

stack/slapos.cfg

@@ -137,15 +137,15 @@ pyparsing = 2.2.0
 pytz = 2016.10
 requests = 2.13.0
 six = 1.12.0
-slapos.cookbook = 1.0.124
+slapos.cookbook = 1.0.138
 slapos.core = 1.5.9
 slapos.extension.strip = 0.4
 slapos.extension.shared = 1.0
 slapos.libnetworkcache = 0.20
 slapos.rebootstrap = 4.4
-slapos.recipe.build = 0.42
+slapos.recipe.build = 0.43
 slapos.recipe.cmmi = 0.12
-slapos.toolbox = 0.106
+slapos.toolbox = 0.107
 stevedore = 1.21.0
 subprocess32 = 3.5.3
 unicodecsv = 0.14.1