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

software/osie-coupler/buildout.hash.cfg

 [instance-profile]
 filename = instance.cfg.in
-md5sum = fa8d1d0a44720e0ffa4f6a953b65eae4
+md5sum = b6a9ac23e2bd0779408464f6fbf4a321

software/osie-coupler/instance-input-schema.json

@@ -62,6 +62,11 @@
       "description": "Network address URL type used for Pub/Sub.",
       "type": "string",
       "default": "opc.udp://224.0.0.22:4840/"
+    },
+    "network_interface": {
+      "description": "Network interface to be used for Pub/Sub.",
+      "type": "string",
+      "default": ""
     }
   }
 }

software/osie-coupler/instance.cfg.in

@@ -19,7 +19,7 @@ recipe = slapos.cookbook:wrapper
 environment =
   LD_LIBRARY_PATH=$LD_LIBRARY_PATH:{{ open62541_location }}/lib:{{ mbedtls_location }}/lib
 command-line =
-    {{ coupler_location }}/server -d ${instance-parameter:configuration.coupler_block_device} -s ${instance-parameter:configuration.coupler_i2c_slave_list} -p ${instance-parameter:configuration.opc_ua_port} -u ${instance-parameter:configuration.username} -w ${instance-parameter:configuration.password} -b ${instance-parameter:configuration.heart_beat} -t ${instance-parameter:configuration.heart_beat_interval} -l ${instance-parameter:configuration.heart_beat_id_list} -n ${instance-parameter:configuration.network_address_url_data_type} -o ${instance-parameter:configuration.heart_beat_timeout_interval} -i ${instance-parameter:configuration.id} -m ${instance-parameter:configuration.mode}
+    {{ coupler_location }}server -d ${instance-parameter:configuration.coupler_block_device} -s ${instance-parameter:configuration.coupler_i2c_slave_list} -p ${instance-parameter:configuration.opc_ua_port} -u ${instance-parameter:configuration.username} -w ${instance-parameter:configuration.password} -b ${instance-parameter:configuration.heart_beat} -t ${instance-parameter:configuration.heart_beat_interval} -l ${instance-parameter:configuration.heart_beat_id_list} -n ${instance-parameter:configuration.network_address_url_data_type} -o ${instance-parameter:configuration.heart_beat_timeout_interval} -i ${instance-parameter:configuration.id} -m ${instance-parameter:configuration.mode} -j ${instance-parameter:configuration.network_interface}
 wrapper-path = ${directory:service}/coupler-opc-ua
 
 [instance-parameter]
@@ -42,6 +42,7 @@ configuration.heart_beat_interval = 500
 configuration.heart_beat_id_list =
 configuration.network_address_url_data_type = opc.udp://224.0.0.22:4840/
 configuration.heart_beat_timeout_interval = 2000
+configuration.network_interface =
 
 [directory]
 recipe = slapos.cookbook:mkdirectory

software/osie-coupler/software.cfg

@@ -44,7 +44,7 @@ environment +=
 recipe  = slapos.recipe.build:gitclone
 git-executable = ${git:location}/bin/git
 repository = https://lab.nexedi.com/nexedi/osie.git
-revision = dc273b64b594de90080afdef873403f953c989f5
+revision = 7c49d252659c3c1278591f8c789ab3dd4fa25142
 
 [compile-coupler]
 recipe = slapos.recipe.cmmi

software/rapid-cdn/buildout.hash.cfg

@@ -22,15 +22,15 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68
 
 [profile-frontend]
 filename = instance-frontend.cfg.in
-md5sum = f6a7678e8dc18871d6b18e2138e95f7f
+md5sum = 83dca4b9ba8d8beeed2d5d861dee0e3f
 
 [profile-master]
 filename = instance-master.cfg.in
-md5sum = 2aaab85bad51136b38f6a16d662a7b3e
+md5sum = 2ac67006dede70c905b0d32b4a995b9a
 
 [profile-slave-list]
 filename = instance-slave-list.cfg.in
-md5sum = 939f475b5a1a67ade2617802e5dde3a9
+md5sum = 1e6f3c8eec64cb5c59b06c1a35502e6b
 
 [profile-master-publish-slave-information]
 filename = instance-master-publish-slave-information.cfg.in

software/rapid-cdn/instance-frontend.cfg.in

@@ -370,7 +370,6 @@ software_type = single-custom-personal
 organization = {{ slapparameter_dict['cluster-identification'] }}
 organizational-unit = {{ instance_parameter_dict['configuration.frontend-name'] }}
 backend-client-caucase-url = {{ slapparameter_dict['backend-client-caucase-url'] }}
-partition_ipv6 =  ${slap-configuration:ipv6-random}
 url-ready-file = ${directory:var}/url-ready.txt
 quic = {{ FRONTEND_HAPROXY_QUIC }}
 extra-context =

software/rapid-cdn/instance-master.cfg.in

@@ -74,8 +74,6 @@
       'https-only',
       'https-url',
       'https-url-netloc-list',
-      'monitor-ipv4-test',
-      'monitor-ipv6-test',
       'path',
       'prefer-gzip-encoding-to-backend',
       'request-timeout',

software/rapid-cdn/instance-slave-input-schema.json

@@ -100,18 +100,6 @@
       "title": "HTTPS Backend URL",
       "type": "string"
     },
-    "monitor-ipv4-test": {
-      "default": "",
-      "description": "IPv4 Address for the frontend keep monitoring with ping",
-      "title": "IPv4 Address to Monitor Packet Lost",
-      "type": "string"
-    },
-    "monitor-ipv6-test": {
-      "default": "",
-      "description": "IPv6 Address for the frontend keep monitoring with ping6 (without brackets)",
-      "title": "IPv6 Address to Monitor Packet Lost",
-      "type": "string"
-    },
     "websocket-path-list": {
       "default": "",
       "description": "Space separated list of path to the websocket application. If not set the whole slave will be websocket, if set then / will be HTTP, and /<websocket-path> will be WSS. In order to have ' ' in the space use '%20'",

software/rapid-cdn/instance-slave-list.cfg.in

@@ -371,32 +371,6 @@ local_ipv4 = {{ dumps('' ~ instance_parameter_dict['ipv4-random']) }}
 {%-     endif %}
 {%-   endfor %}
 
-{%-   set monitor_ipv6_test = slave_instance.get('monitor-ipv6-test', '') %}
-{%-   if monitor_ipv6_test %}
-{%-     set monitor_ipv6_section_title = 'check-%s-ipv6-packet-list-test' % slave_instance.get('slave_reference') %}
-{%-     do part_list.append(monitor_ipv6_section_title) %}
-[{{ monitor_ipv6_section_title }}]
-<= monitor-promise-base
-promise = check_icmp_packet_lost
-name = {{ monitor_ipv6_section_title }}.py
-config-address = {{ dumps(monitor_ipv6_test) }}
-# promise frequency in minutes (2 times/day)
-config-frequency = 720
-{%-   endif %}
-{%-   set monitor_ipv4_test = slave_instance.get('monitor-ipv4-test', '') %}
-{%-   if monitor_ipv4_test %}
-{%-     set monitor_ipv4_section_title = 'check-%s-ipv4-packet-list-test' % slave_instance.get('slave_reference') %}
-{%-     do part_list.append(monitor_ipv4_section_title) %}
-[{{ monitor_ipv4_section_title }}]
-<= monitor-promise-base
-promise = check_icmp_packet_lost
-name = {{ monitor_ipv4_section_title }}.py
-config-address = {{ dumps(monitor_ipv4_test) }}
-config-ipv4 = true
-# promise frequency in minutes (2 times/day)
-config-frequency = 720
-{%-   endif %}
-
 {#-   ###############################  #}
 {#-   Prepare Slave Information        #}
 {%-   do slave_instance_information_list.append(slave_publish_dict) %}

software/rapid-cdn/test/test.py

@@ -1910,12 +1910,6 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin):
         'url': cls.backend_url,
         'disabled-cookie-list': 'Chocolate',
       },
-      'monitor-ipv4-test': {
-        'monitor-ipv4-test': 'monitor-ipv4-test',
-      },
-      'monitor-ipv6-test': {
-        'monitor-ipv6-test': 'monitor-ipv6-test',
-      },
       'ciphers': {
         'ciphers': 'RSA-3DES-EDE-CBC-SHA RSA-AES128-CBC-SHA',
       },
@@ -2100,9 +2094,9 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin):
       'monitor-base-url': 'https://[%s]:8401' % self._ipv6_address,
       'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
       'domain': 'example.com',
-      'accepted-slave-amount': '56',
+      'accepted-slave-amount': '54',
       'rejected-slave-amount': '0',
-      'slave-amount': '56',
+      'slave-amount': '54',
       'rejected-slave-dict': {
       },
       'warning-slave-dict': {
@@ -3653,81 +3647,6 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin):
       result.status_code
     )
 
-  def test_monitor_ipv6_test(self):
-    parameter_dict = self.assertSlaveBase('monitor-ipv6-test')
-
-    result = fakeHTTPSResult(
-      parameter_dict['domain'], 'test-path')
-
-    self.assertEqual(
-      self.certificate_pem,
-      der2pem(result.peercert))
-
-    self.assertEqual(http.client.SERVICE_UNAVAILABLE, result.status_code)
-
-    result_http = fakeHTTPResult(
-      parameter_dict['domain'], 'test-path')
-    self.assertEqual(
-      http.client.FOUND,
-      result_http.status_code
-    )
-
-    self.assertEqual(
-      'https://monitoripv6test.example.com:%s/test-path' % (HTTP_PORT,),
-      result_http.headers['Location']
-    )
-
-    monitor_file = glob.glob(
-      os.path.join(
-        self.instance_path, '*', 'etc', 'plugin',
-        'check-_monitor-ipv6-test-ipv6-packet-list-test.py'))[0]
-    # get promise module and check that parameters are ok
-    self.assertEqual(
-      getPromisePluginParameterDict(monitor_file),
-      {
-        'frequency': '720',
-        'address': 'monitor-ipv6-test'
-      }
-    )
-
-  def test_monitor_ipv4_test(self):
-    parameter_dict = self.assertSlaveBase('monitor-ipv4-test')
-
-    result = fakeHTTPSResult(
-      parameter_dict['domain'], 'test-path')
-
-    self.assertEqual(
-      self.certificate_pem,
-      der2pem(result.peercert))
-
-    self.assertEqual(http.client.SERVICE_UNAVAILABLE, result.status_code)
-
-    result_http = fakeHTTPResult(
-      parameter_dict['domain'], 'test-path')
-    self.assertEqual(
-      http.client.FOUND,
-      result_http.status_code
-    )
-
-    self.assertEqual(
-      'https://monitoripv4test.example.com:%s/test-path' % (HTTP_PORT,),
-      result_http.headers['Location']
-    )
-
-    monitor_file = glob.glob(
-      os.path.join(
-        self.instance_path, '*', 'etc', 'plugin',
-        'check-_monitor-ipv4-test-ipv4-packet-list-test.py'))[0]
-    # get promise module and check that parameters are ok
-    self.assertEqual(
-      getPromisePluginParameterDict(monitor_file),
-      {
-        'frequency': '720',
-        'ipv4': 'true',
-        'address': 'monitor-ipv4-test',
-      }
-    )
-
   def test_ciphers(self):
     parameter_dict = self.assertSlaveBase(
      'ciphers', expected_parameter_dict={
@@ -6047,12 +5966,6 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
         'url': cls.backend_url,
         'default-path': '${section:option}\nn"\newline\n}\n}proxy\n/slashed',
       },
-      'MONITOR-IPV4-TEST-UNSAFE': {
-        'monitor-ipv4-test': '${section:option}\nafternewline ipv4',
-      },
-      'MONITOR-IPV6-TEST-UNSAFE': {
-        'monitor-ipv6-test': '${section:option}\nafternewline ipv6',
-      },
       'BAD-CIPHERS': {
         'ciphers': 'bad ECDHE-ECDSA-AES256-GCM-SHA384 again',
       },
@@ -6155,9 +6068,9 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
       'monitor-base-url': 'https://[%s]:8401' % self._ipv6_address,
       'backend-client-caucase-url': 'http://[%s]:8990' % self._ipv6_address,
       'domain': 'example.com',
-      'accepted-slave-amount': '5',
+      'accepted-slave-amount': '3',
       'rejected-slave-amount': '28',
-      'slave-amount': '33',
+      'slave-amount': '31',
       'rejected-slave-dict': {
         '_HTTPS-URL': ['slave https-url "https://[fd46::c2ae]:!py!u\'123123\'"'
                        ' invalid'],
@@ -6411,66 +6324,6 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
       result.headers['Location']
     )
 
-  def test_monitor_ipv4_test_unsafe(self):
-    parameter_dict = self.assertSlaveBase('MONITOR-IPV4-TEST-UNSAFE')
-
-    result = fakeHTTPSResult(
-      parameter_dict['domain'], 'test-path')
-
-    self.assertEqual(
-      self.certificate_pem,
-      der2pem(result.peercert))
-
-    self.assertEqual(http.client.SERVICE_UNAVAILABLE, result.status_code)
-
-    result_http = fakeHTTPResult(
-      parameter_dict['domain'], 'test-path')
-    self.assertEqual(http.client.FOUND, result_http.status_code)
-
-    monitor_file = glob.glob(
-      os.path.join(
-        self.instance_path, '*', 'etc', 'plugin',
-        'check-_MONITOR-IPV4-TEST-UNSAFE-ipv4-packet-list-test.py'))[0]
-    # get promise module and check that parameters are ok
-
-    self.assertEqual(
-      getPromisePluginParameterDict(monitor_file),
-      {
-        'frequency': '720',
-        'ipv4': 'true',
-        'address': '${section:option}\nafternewline ipv4',
-      }
-    )
-
-  def test_monitor_ipv6_test_unsafe(self):
-    parameter_dict = self.assertSlaveBase('MONITOR-IPV6-TEST-UNSAFE')
-
-    result = fakeHTTPSResult(
-      parameter_dict['domain'], 'test-path')
-
-    self.assertEqual(
-      self.certificate_pem,
-      der2pem(result.peercert))
-
-    self.assertEqual(http.client.SERVICE_UNAVAILABLE, result.status_code)
-
-    result_http = fakeHTTPResult(
-      parameter_dict['domain'], 'test-path')
-    self.assertEqual(http.client.FOUND, result_http.status_code)
-
-    monitor_file = glob.glob(
-      os.path.join(
-        self.instance_path, '*', 'etc', 'plugin',
-        'check-_MONITOR-IPV6-TEST-UNSAFE-ipv6-packet-list-test.py'))[0]
-    # get promise module and check that parameters are ok
-    self.assertEqual(
-      getPromisePluginParameterDict(monitor_file),
-      {
-        'frequency': '720',
-        'address': '${section:option}\nafternewline ipv6'
-      }
-    )
-
   def test_site_1(self):
     self.assertSlaveBase('SITE_1', hostname='duplicate')
 

software/rapid-cdn/test/test_data/test.TestSlave.test00file_list_log.txt

@@ -53,8 +53,6 @@ T-2/var/log/httpd/_https-only_access_log
 T-2/var/log/httpd/_https-only_backend_log
 T-2/var/log/httpd/_https-url-netloc-list_access_log
 T-2/var/log/httpd/_https-url-netloc-list_backend_log
-T-2/var/log/httpd/_monitor-ipv4-test_access_log
-T-2/var/log/httpd/_monitor-ipv6-test_access_log
 T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_access_log
 T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_backend_log
 T-2/var/log/httpd/_prefer-gzip-encoding-to-backend_access_log

software/rapid-cdn/test/test_data/test.TestSlave.test_file_list_plugin.txt

@@ -35,8 +35,6 @@ T-2/etc/plugin/backend_haproxy_http.py
 T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
 T-2/etc/plugin/caucase-updater.py
-T-2/etc/plugin/check-_monitor-ipv4-test-ipv4-packet-list-test.py
-T-2/etc/plugin/check-_monitor-ipv6-test-ipv6-packet-list-test.py
 T-2/etc/plugin/check-free-disk-space.py
 T-2/etc/plugin/expose-csr-ip-port-listening.py
 T-2/etc/plugin/frontend-frontend-haproxy-configuration-promise.py

software/rapid-cdn/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_plugin.txt

@@ -35,8 +35,6 @@ T-2/etc/plugin/backend_haproxy_http.py
 T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
 T-2/etc/plugin/caucase-updater.py
-T-2/etc/plugin/check-_monitor-ipv4-test-ipv4-packet-list-test.py
-T-2/etc/plugin/check-_monitor-ipv6-test-ipv6-packet-list-test.py
 T-2/etc/plugin/check-free-disk-space.py
 T-2/etc/plugin/expose-csr-ip-port-listening.py
 T-2/etc/plugin/frontend-frontend-haproxy-configuration-promise.py