caddy-frontend: Pass correctly monitor httpd port

As monitor stack uses values directly from buildout convert them to buildout
safe values, otherwise the the magic !py! is not stripped.

Also add a test proving that monitor with default values is going to be
correctly configured.

software/caddy-frontend/TODO.rst

@@ -2,6 +2,7 @@ Generally things to be done with ``caddy-frontend``:
 
  * tests: add assertion with results of promises in etc/promise for each partition
  * check the whole frontend slave snippet with ``caddy -validate`` during buildout run, and reject if does not pass validation
+ * check that all options from ``instance-slave-caddy-input-schema.json`` are safe to be used
  * ``apache-ca-certificate`` shall be merged with ``apache-certificate``
 
    * ``apache-ca-certificate`` shall be appended to ``apache-certificate`` if not already there

software/caddy-frontend/buildout.hash.cfg

@@ -22,7 +22,7 @@ md5sum = c801b7f9f11f0965677c22e6bbe9281b
 
 [template-apache-frontend]
 filename = instance-apache-frontend.cfg.in
-md5sum = 29160773f60e5fc0eef25dc39553fadd
+md5sum = 2f8f0e30d9703437555e57e9410b1bbf
 
 [template-apache-replicate]
 filename = instance-apache-replicate.cfg.in

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

@@ -567,7 +567,13 @@ wrapper-path = ${directory:promise}/caddy-frontend-is-running-actual-software-re
 #
 
 [monitor-instance-parameter]
-monitor-httpd-port = ${configuration:monitor-httpd-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-conf-parameters]
 private-path-list += 

software/caddy-frontend/test/test.py

@@ -758,6 +758,17 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
         os.path.join(
           partition_path, 'etc', 'httpd-cors.cfg'), 'r').read().strip())
 
+  def test_promise_monitor_httpd_listening_on_tcp(self):
+      result = set([
+        subprocess.call(q) for q in glob.glob(
+          os.path.join(
+            self.instance_path, '*', 'etc', 'promise',
+            'monitor-httpd-listening-on-tcp'))])
+      self.assertEqual(
+        result,
+        set([0])
+      )
+
   @skipIf(not IS_CADDY, 'Will NOT be covered on apache-frontend')
   def test_slave_partition_state(self):
     partition_path = self.getSlavePartitionPath()
@@ -2780,3 +2791,42 @@ class TestMalformedBackenUrlSlave(SlaveHttpFrontendTestCase,
     self.assertEqual(
       parameter_dict, {}
     )
+
+
+class TestDefaultMonitorHttpdPort(SlaveHttpFrontendTestCase, TestDataMixin):
+  @classmethod
+  def getInstanceParameterDict(cls):
+    return {
+      '-frontend-1-state': 'stopped',
+    }
+
+  @classmethod
+  def getSlaveParameterDictDict(cls):
+    return {
+      'test': {
+        'url': cls.backend_url,
+      },
+    }
+
+  def test(self):
+    parameter_dict = self.slave_connection_parameter_dict_dict[
+      'test']
+    self.assertKeyWithPop('log-access-url', parameter_dict)
+    self.assertEqual(
+      parameter_dict,
+      {
+        'domain': 'test.None', 'replication_number': '1',
+        'url': 'http://test.None', 'site_url': 'http://test.None',
+        'secure_access': 'https://test.None', 'public-ipv4': None}
+    )
+    master_monitor_conf = open(os.path.join(
+      self.instance_path, 'TestDefaultMonitorHttpdPort-0', 'etc',
+      'monitor-httpd.conf')).read()
+    slave_monitor_conf = open(os.path.join(
+      self.instance_path, 'TestDefaultMonitorHttpdPort-1', 'etc',
+      'monitor-httpd.conf')).read()
+
+    self.assertTrue(
+      'Listen [%s]:8196' % (utils.GLOBAL_IPV6,) in master_monitor_conf)
+    self.assertTrue(
+      'Listen [%s]:8072' % (utils.GLOBAL_IPV6,) in slave_monitor_conf)

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

+TestDefaultMonitorHttpdPort-0/var/run/monitor/monitor-bootstrap.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_monitor_promise_list-CADDY.txt

+TestDefaultMonitorHttpdPort-1/etc/monitor-promise/check-_test-error-log-last-day
+TestDefaultMonitorHttpdPort-1/etc/monitor-promise/check-_test-error-log-last-hour
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_list-CADDY.txt

+TestDefaultMonitorHttpdPort-0/etc/promise/check-free-disk-space
+TestDefaultMonitorHttpdPort-0/etc/promise/monitor-http-frontend
+TestDefaultMonitorHttpdPort-0/etc/promise/monitor-httpd-listening-on-tcp
+TestDefaultMonitorHttpdPort-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
+TestDefaultMonitorHttpdPort-1/etc/promise/caddy-frontend-is-running-actual-software-release
+TestDefaultMonitorHttpdPort-1/etc/promise/caddy_cached
+TestDefaultMonitorHttpdPort-1/etc/promise/caddy_frontend_ipv4_http
+TestDefaultMonitorHttpdPort-1/etc/promise/caddy_frontend_ipv4_https
+TestDefaultMonitorHttpdPort-1/etc/promise/caddy_frontend_ipv6_http
+TestDefaultMonitorHttpdPort-1/etc/promise/caddy_frontend_ipv6_https
+TestDefaultMonitorHttpdPort-1/etc/promise/caddy_ssl_cached
+TestDefaultMonitorHttpdPort-1/etc/promise/check-free-disk-space
+TestDefaultMonitorHttpdPort-1/etc/promise/frontend-caddy-configuration-promise
+TestDefaultMonitorHttpdPort-1/etc/promise/monitor-http-frontend
+TestDefaultMonitorHttpdPort-1/etc/promise/monitor-httpd-listening-on-tcp
+TestDefaultMonitorHttpdPort-1/etc/promise/nginx-configuration-promise
+TestDefaultMonitorHttpdPort-1/etc/promise/nginx_frontend_ipv4_http
+TestDefaultMonitorHttpdPort-1/etc/promise/nginx_frontend_ipv4_https
+TestDefaultMonitorHttpdPort-1/etc/promise/nginx_frontend_ipv6_http
+TestDefaultMonitorHttpdPort-1/etc/promise/nginx_frontend_ipv6_https
+TestDefaultMonitorHttpdPort-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
+TestDefaultMonitorHttpdPort-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
+TestDefaultMonitorHttpdPort-1/etc/promise/re6st-connectivity
+TestDefaultMonitorHttpdPort-1/etc/promise/trafficserver-cache-availability
+TestDefaultMonitorHttpdPort-1/etc/promise/trafficserver-port-listening
\ No newline at end of file

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

+TestDefaultMonitorHttpdPort-0:bootstrap-monitor EXITED
+TestDefaultMonitorHttpdPort-0:certificate_authority-on-watch RUNNING
+TestDefaultMonitorHttpdPort-0:crond RUNNING
+TestDefaultMonitorHttpdPort-0:monitor-httpd-graceful EXITED
+TestDefaultMonitorHttpdPort-0:monitor-httpd-on-watch EXITED
+TestDefaultMonitorHttpdPort-1:6tunnel-26011-on-watch STOPPED
+TestDefaultMonitorHttpdPort-1:6tunnel-26012-on-watch STOPPED
+TestDefaultMonitorHttpdPort-1:6tunnel-4443-on-watch STOPPED
+TestDefaultMonitorHttpdPort-1:6tunnel-8080-on-watch STOPPED
+TestDefaultMonitorHttpdPort-1:6tunnel-8081-on-watch STOPPED
+TestDefaultMonitorHttpdPort-1:6tunnel-9443-on-watch STOPPED
+TestDefaultMonitorHttpdPort-1:bootstrap-monitor STOPPED
+TestDefaultMonitorHttpdPort-1:certificate_authority-on-watch STOPPED
+TestDefaultMonitorHttpdPort-1:crond-on-watch STOPPED
+TestDefaultMonitorHttpdPort-1:frontend-caddy-safe-graceful STOPPED
+TestDefaultMonitorHttpdPort-1:frontend-nginx-safe-graceful STOPPED
+TestDefaultMonitorHttpdPort-1:frontend_caddy-on-watch STOPPED
+TestDefaultMonitorHttpdPort-1:frontend_nginx-on-watch STOPPED
+TestDefaultMonitorHttpdPort-1:monitor-httpd-graceful STOPPED
+TestDefaultMonitorHttpdPort-1:monitor-httpd-on-watch STOPPED
+TestDefaultMonitorHttpdPort-1:trafficserver-on-watch STOPPED
+TestDefaultMonitorHttpdPort-1:trafficserver-reload STOPPED
+watchdog:watchdog RUNNING
\ No newline at end of file