Fix tests when IPv6 range is available

See merge request !1413

software/backupserver/test/test.py

@@ -45,7 +45,7 @@ class TestBackupServer(InstanceTestCase):
     # Check that there is a RSS feed
     self.assertTrue('rss' in parameter_dict)
     self.assertTrue(parameter_dict['rss'].startswith(
-      f'https://[{self._ipv6_address}]:9443/'
+      f'https://[{self.computer_partition_ipv6_address}]:9443/'
     ))
 
     result = requests.get(

software/caucase/test/test.py

@@ -47,7 +47,7 @@ class TestCaucase(SlapOSInstanceTestCase):
     connection_parameter_dict = self.deserializeConnectionParameter()
     self.assertEqual(
       connection_parameter_dict,
-      {'url': 'http://[%s]:8009' % (self._ipv6_address,)}
+      {'url': 'http://[%s]:8009' % (self.computer_partition_ipv6_address,)}
     )
     result = requests.get(connection_parameter_dict['url'])
 
@@ -57,14 +57,14 @@ class TestCaucase(SlapOSInstanceTestCase):
       {
         '_links': {
           'self': {
-            'href': 'http://[%s]:8009' % (self._ipv6_address,)
+            'href': 'http://[%s]:8009' % (self.computer_partition_ipv6_address,)
           },
           'getCAUHAL': {
-            'href': 'http://[%s]:8009//cau' % (self._ipv6_address,),
+            'href': 'http://[%s]:8009//cau' % (self.computer_partition_ipv6_address,),
             'title': 'cau'
           },
           'getCASHAL': {
-            'href': 'http://[%s]:8009//cas' % (self._ipv6_address,),
+            'href': 'http://[%s]:8009//cas' % (self.computer_partition_ipv6_address,),
             'title': 'cas'
           }
         }

software/erp5-zope2/test/test/test_erp5.py

@@ -147,7 +147,7 @@ class TestJupyter(ERP5InstanceTestCase, TestPublishedURLIsReachableMixin):
     param_dict = self.getRootPartitionConnectionParameterDict()
 
     self.assertEqual(
-      'https://[%s]:8888/tree' % self._ipv6_address,
+      'https://[%s]:8888/tree' % self.computer_partition_ipv6_address,
       param_dict['jupyter-url']
     )
 

software/erp5/test/test/test_erp5.py

@@ -138,7 +138,7 @@ class TestJupyter(ERP5InstanceTestCase, TestPublishedURLIsReachableMixin):
     param_dict = self.getRootPartitionConnectionParameterDict()
 
     self.assertEqual(
-      'https://[%s]:8888/tree' % self._ipv6_address,
+      'https://[%s]:8888/tree' % self.getPartitionIPv6(self.getPartitionId("jupyter")),
       param_dict['jupyter-url']
     )
 

software/fluentd/test/test.py

@@ -115,7 +115,7 @@ class WendelinTutorialTestCase(FluentdTestCase):
                                      round(random.uniform(-20, 50), 3))]
 
   def serve(self, port, request_handler_class):
-    server_address = (self._ipv6_address, port)
+    server_address = (self.computer_partition_ipv6_address, port)
     server = OneRequestServer(server_address, request_handler_class)
 
     data = server.get_first_data(FLUSH_INTERVAL)
@@ -181,7 +181,7 @@ class SensorConfTestCase(WendelinTutorialTestCase):
   @type forward
   <server>
     name myserver1
-    host {cls._ipv6_address}
+    host {cls.computer_partition_ipv6_address}
   </server>
   <buffer>
     flush_mode immediate
@@ -199,7 +199,7 @@ print("{measurement_text}")'''
 
   def test_configuration(self):
     self._test_configuration(
-      fr'adding forwarding server \'myserver1\' host="{self._ipv6_address}" port={FLUENTD_PORT} weight=60'
+      fr'adding forwarding server \'myserver1\' host="{self.computer_partition_ipv6_address}" port={FLUENTD_PORT} weight=60'
     )
 
   def test_send_data(self):
@@ -232,11 +232,11 @@ class GatewayConfTestCase(WendelinTutorialTestCase):
 <source>
   @type forward
   port {fluentd_port}
-  bind {cls._ipv6_address}
+  bind {cls.computer_partition_ipv6_address}
 </source>
 <match tag.name>
   @type wendelin
-  streamtool_uri http://[{cls._ipv6_address}]:{wendelin_port}/erp5/portal_ingestion_policies/default
+  streamtool_uri http://[{cls.computer_partition_ipv6_address}]:{wendelin_port}/erp5/portal_ingestion_policies/default
   user      foo
   password  bar
   <buffer>
@@ -249,9 +249,9 @@ class GatewayConfTestCase(WendelinTutorialTestCase):
 
   @classmethod
   def get_configuration(cls):
-    fluentd_port = findFreeTCPPort(cls._ipv6_address)
+    fluentd_port = findFreeTCPPort(cls.computer_partition_ipv6_address)
     cls._fluentd_port = fluentd_port
-    wendelin_port = findFreeTCPPort(cls._ipv6_address)
+    wendelin_port = findFreeTCPPort(cls.computer_partition_ipv6_address)
     cls._wendelin_port = wendelin_port
     return cls.gateway_conf(fluentd_port, wendelin_port)
 
@@ -260,7 +260,7 @@ class GatewayConfTestCase(WendelinTutorialTestCase):
 
   def test_wendelin_data_forwarding(self):
     sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
-    sock.connect((self._ipv6_address, self._fluentd_port))
+    sock.connect((self.computer_partition_ipv6_address, self._fluentd_port))
 
     data = [
       msgpack.ExtType(0, struct.pack('!Q', int(time.time()) << 32)),

software/grafana/test/test.py

@@ -319,7 +319,7 @@ class TestListenInPartition(GrafanaTestCase):
             c.laddr for c in self.process_dict['grafana'].connections()
             if c.status == 'LISTEN'
         ],
-        [(self._ipv6_address, 8180)],
+        [(self.computer_partition_ipv6_address, 8180)],
     )
 
   def test_influxdb_listen(self):
@@ -330,7 +330,7 @@ class TestListenInPartition(GrafanaTestCase):
         ]),
         [
             (self._ipv4_address, 8088),
-            (self._ipv6_address, 8086),
+            (self.computer_partition_ipv6_address, 8086),
         ],
     )
 

software/htmlvalidatorserver/test/test.py

@@ -43,7 +43,7 @@ class TestHtmlValidatorServer(InstanceTestCase):
 
     self.assertTrue('vnu-url' in parameter_dict)
     self.assertEqual(
-      'https://[%s]:8899/' % (self._ipv6_address, ),
+      'https://[%s]:8899/' % (self.computer_partition_ipv6_address, ),
       parameter_dict['vnu-url']
     )
 

software/jstestnode/test/test.py

@@ -52,7 +52,7 @@ class TestJSTestNode(InstanceTestCase):
 
     self.assertEqual(
       {
-        'nginx': 'http://[%s]:9443/' % (self._ipv6_address, )
+        'nginx': 'http://[%s]:9443/' % (self.computer_partition_ipv6_address, )
       },
       connection_dict
     )
@@ -83,7 +83,7 @@ class TestJSTestNode(InstanceTestCase):
 
     # Default access
     result = requests.get(
-      'http://[%s]:9443' % (self._ipv6_address, ), allow_redirects=False)
+      'http://[%s]:9443' % (self.computer_partition_ipv6_address, ), allow_redirects=False)
     self.assertEqual(
       [requests.codes.forbidden, False],
       [result.status_code, result.is_redirect]

software/jupyter/test/test.py

@@ -52,10 +52,10 @@ class TestJupyter(InstanceTestCase):
 
     self.assertEqual(
       {
-        'jupyter-classic-url': 'https://[%s]:8888/tree' % (self._ipv6_address, ),
-        'jupyterlab-url': 'https://[%s]:8888/lab' % (self._ipv6_address, ),
+        'jupyter-classic-url': 'https://[%s]:8888/tree' % (self.computer_partition_ipv6_address, ),
+        'jupyterlab-url': 'https://[%s]:8888/lab' % (self.computer_partition_ipv6_address, ),
         'password': '%s' % (password, ),
-        'url': 'https://[%s]:8888/tree' % (self._ipv6_address, )
+        'url': 'https://[%s]:8888/tree' % (self.computer_partition_ipv6_address, )
       },
       connection_dict
     )

software/nextcloud/test/test.py

@@ -65,6 +65,10 @@ class NextCloudTestCase(InstanceTestCase):
         self.nextcloud_path,
         "Nextcloud path not found in %r" % (partition_path_list,))
 
+    # lookup nextcloud partition ipv6
+    partition_id = os.path.basename(self.partition_dir)
+    self.nextcloud_ipv6 = self.getPartitionIPv6(partition_id)
+
     # parse database info from mariadb url
     d = self.computer_partition.getConnectionParameterDict()
     db_url = d['mariadb-url-list'][2:-2] # parse <url> out of "['<url>']"
@@ -86,9 +90,9 @@ class NextCloudTestCase(InstanceTestCase):
       mail_smtpport="587",
       mail_smtppassword="",
       mail_smtpname="",
-      cli_url="https://[%s]:9988/" % self._ipv6_address,
+      cli_url="https://[%s]:9988/" % self.nextcloud_ipv6,
       partition_dir=self.partition_dir,
-      trusted_domain_list=json.dumps(["[%s]:9988" % self._ipv6_address]),
+      trusted_domain_list=json.dumps(["[%s]:9988" % self.nextcloud_ipv6]),
       trusted_proxy_list=[],
     )
     data_dict.update(config_dict)
@@ -336,7 +340,7 @@ class TestNextCloudParameters(NextCloudTestCase):
       cli_url="nextcloud.example.com",
       partition_dir=self.partition_dir,
       trusted_domain_list=json.dumps([
-        "[%s]:9988" % self._ipv6_address,
+        "[%s]:9988" % self.nextcloud_ipv6,
         "nextcloud.example.com",
         "nextcloud.proxy.com"
       ]),

software/powerdns/test/test.py

@@ -37,7 +37,6 @@ import urllib
 from slapos.recipe.librecipe import generateHashFromFiles
 from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
 
-
 skip = unittest.skip('port conflit between powerdns instances')
 
 setUpModule, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass(
@@ -93,9 +92,10 @@ class PowerDNSTestCase(SlapOSInstanceTestCase):
     ns_record = []
     for replicate_nb in range(1, dns_quantity + 1):
       ns_id = 'ns%s' % replicate_nb
+      partition_id = self.getPartitionId(ns_id)
       ns_record.append(ns_id + '.' + self.default_supported_zone)
       expected_dict[ns_id + '-port'] = str(DNS_PORT)
-      expected_dict[ns_id + '-ipv6'] = self._ipv6_address
+      expected_dict[ns_id + '-ipv6'] = self.getPartitionIPv6(partition_id)
     expected_dict['ns-record'] = ','.join(ns_record)
     expected_dict['slave-amount'] = str(slave_amount)
 
@@ -199,11 +199,11 @@ class PowerDNSSlaveTestCase(PowerDNSTestCase):
       ).getConnectionParameterDict())
     return parameter_dict_list
 
-  def dns_query(self, domain_name, subnet):
+  def dns_query(self, domain_name, subnet, ipv6, port):
     message = dns.message.make_query(domain_name, 'A')
     client_subnet_option = dns.edns.ECSOption(subnet)
     message.use_edns(options=[client_subnet_option])
-    answer = dns.query.udp(message, self._ipv6_address, port=DNS_PORT)
+    answer = dns.query.udp(message, ipv6, port=port)
     return answer.get_rrset(
       dns.message.ANSWER,
       dns.name.from_text(domain_name),
@@ -211,8 +211,9 @@ class PowerDNSSlaveTestCase(PowerDNSTestCase):
       dns.rdatatype.CNAME
     ).to_text().split()[-1]
 
-  def _test_dns_resolver(self):
+  def _test_dns_resolver(self, dns_quantity):
     slave_parameter_dict_dict = self.getSlaveParameterDictDict()
+    connection_dict = self.computer_partition.getConnectionParameterDict()
     subnet_dict = {
       'africa': AFRICAN_SUBNET,
       'china-telecom': CHINA_TELECOM_SUBNET,
@@ -248,21 +249,27 @@ class PowerDNSSlaveTestCase(PowerDNSTestCase):
         slave_parameter_dict['record'], slave_parameter_dict['applicable-zone']
       )
       for region in subnet_dict:
-        self.assertEqual(
-          slave_parameter_dict.get(
-            region,
-            '%s.%s.' % (
-              default_rr_dict[region], slave_parameter_dict['origin'])
-          ),
-          self.dns_query(domain_name, subnet_dict[region])
-        )
+        for replicate_nb in range(1, dns_quantity + 1):
+          ns_id = 'ns%s' % replicate_nb
+          self.assertEqual(
+            slave_parameter_dict.get(
+              region,
+              '%s.%s.' % (
+                default_rr_dict[region], slave_parameter_dict['origin'])
+            ),
+            self.dns_query(
+              domain_name,
+              subnet_dict[region],
+              connection_dict[ns_id + '-ipv6'],
+              int(connection_dict[ns_id + '-port']))
+          )
 
   def _test_slaves(self, dns_quantity=1):
     self._test_parameter_dict(
       dns_quantity=dns_quantity,
       slave_amount=len(self.getSlaveParameterDictDict())
     )
-    self._test_dns_resolver()
+    self._test_dns_resolver(dns_quantity)
 
 
 class TestSlaveRequest(PowerDNSSlaveTestCase):
@@ -421,7 +428,7 @@ class TestSlaveRequestDomains(TestSlaveRequest):
     }
 
 
-# Because all powerdns instances run under the same ip address during tests,
+# Because all powerdns instances run under the same ipv4 address during tests,
 # there is a port conflict between these instances
 @skip
 class TestMultipleInstances(TestSlaveRequestDomains):

software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00cluster_request_instance_parameter_dict.txt

@@ -4,16 +4,6 @@
     "domain": "example.com",
     "full_address_list": [],
     "instance_title": "testing partition 0",
-    "ip_list": [
-      [
-        "T-0",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-0",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "kedifa_port": "15080",
     "plain_http_port": "11080",
     "port": "11443",
@@ -80,16 +70,6 @@
     },
     "full_address_list": [],
     "instance_title": "kedifa",
-    "ip_list": [
-      [
-        "T-1",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-1",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
@@ -119,16 +99,6 @@
     },
     "full_address_list": [],
     "instance_title": "caddy-frontend-1",
-    "ip_list": [
-      [
-        "T-2",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-2",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",

software/rapid-cdn/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00cluster_request_instance_parameter_dict.txt

@@ -5,16 +5,6 @@
     "enable-http2-by-default": "false",
     "full_address_list": [],
     "instance_title": "testing partition 0",
-    "ip_list": [
-      [
-        "T-0",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-0",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "kedifa_port": "15080",
     "plain_http_port": "11080",
     "port": "11443",
@@ -844,16 +834,6 @@
     },
     "full_address_list": [],
     "instance_title": "kedifa",
-    "ip_list": [
-      [
-        "T-1",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-1",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
@@ -885,16 +865,6 @@
     },
     "full_address_list": [],
     "instance_title": "caddy-frontend-1",
-    "ip_list": [
-      [
-        "T-2",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-2",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",

software/rapid-cdn/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test00cluster_request_instance_parameter_dict.txt

@@ -5,16 +5,6 @@
     "caucase_port": "15090",
     "full_address_list": [],
     "instance_title": "testing partition 0",
-    "ip_list": [
-      [
-        "T-0",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-0",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "kedifa_port": "15080",
     "plain_http_port": "11080",
     "port": "11443",
@@ -39,16 +29,6 @@
     },
     "full_address_list": [],
     "instance_title": "kedifa",
-    "ip_list": [
-      [
-        "T-1",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-1",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
@@ -77,16 +57,6 @@
     },
     "full_address_list": [],
     "instance_title": "caddy-frontend-1",
-    "ip_list": [
-      [
-        "T-2",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-2",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",

software/rapid-cdn/test/test_data/test.TestMasterRequest.test00cluster_request_instance_parameter_dict.txt

@@ -3,16 +3,6 @@
     "caucase_port": "15090",
     "full_address_list": [],
     "instance_title": "testing partition 0",
-    "ip_list": [
-      [
-        "T-0",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-0",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "kedifa_port": "15080",
     "plain_http_port": "11080",
     "port": "11443",
@@ -37,16 +27,6 @@
     },
     "full_address_list": [],
     "instance_title": "kedifa",
-    "ip_list": [
-      [
-        "T-1",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-1",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
@@ -75,16 +55,6 @@
     },
     "full_address_list": [],
     "instance_title": "caddy-frontend-1",
-    "ip_list": [
-      [
-        "T-2",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-2",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",

software/rapid-cdn/test/test_data/test.TestMasterRequestDomain.test00cluster_request_instance_parameter_dict.txt

@@ -4,16 +4,6 @@
     "domain": "example.com",
     "full_address_list": [],
     "instance_title": "testing partition 0",
-    "ip_list": [
-      [
-        "T-0",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-0",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "kedifa_port": "15080",
     "plain_http_port": "11080",
     "port": "11443",
@@ -38,16 +28,6 @@
     },
     "full_address_list": [],
     "instance_title": "kedifa",
-    "ip_list": [
-      [
-        "T-1",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-1",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
@@ -77,16 +57,6 @@
     },
     "full_address_list": [],
     "instance_title": "caddy-frontend-1",
-    "ip_list": [
-      [
-        "T-2",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-2",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",

software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test00cluster_request_instance_parameter_dict.txt

@@ -4,16 +4,6 @@
     "domain": "example.com",
     "full_address_list": [],
     "instance_title": "testing partition 0",
-    "ip_list": [
-      [
-        "T-0",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-0",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "kedifa_port": "15080",
     "plain_http_port": "11080",
     "port": "11443",
@@ -52,16 +42,6 @@
     },
     "full_address_list": [],
     "instance_title": "kedifa",
-    "ip_list": [
-      [
-        "T-1",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-1",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
@@ -91,16 +71,6 @@
     },
     "full_address_list": [],
     "instance_title": "caddy-frontend-1",
-    "ip_list": [
-      [
-        "T-2",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-2",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",

software/rapid-cdn/test/test_data/test.TestRe6stVerificationUrlSlave.test00cluster_request_instance_parameter_dict.txt

@@ -4,16 +4,6 @@
     "domain": "example.com",
     "full_address_list": [],
     "instance_title": "testing partition 0",
-    "ip_list": [
-      [
-        "T-0",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-0",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "kedifa_port": "15080",
     "plain_http_port": "11080",
     "port": "11443",
@@ -52,16 +42,6 @@
     },
     "full_address_list": [],
     "instance_title": "kedifa",
-    "ip_list": [
-      [
-        "T-1",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-1",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
@@ -91,16 +71,6 @@
     },
     "full_address_list": [],
     "instance_title": "caddy-frontend-1",
-    "ip_list": [
-      [
-        "T-2",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-2",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",

software/rapid-cdn/test/test_data/test.TestReplicateSlave.test00cluster_request_instance_parameter_dict.txt

@@ -8,16 +8,6 @@
     "domain": "example.com",
     "full_address_list": [],
     "instance_title": "testing partition 0",
-    "ip_list": [
-      [
-        "T-0",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-0",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "kedifa_port": "15080",
     "plain_http_port": "11080",
     "port": "11443",
@@ -56,16 +46,6 @@
     },
     "full_address_list": [],
     "instance_title": "kedifa",
-    "ip_list": [
-      [
-        "T-1",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-1",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
@@ -95,16 +75,6 @@
     },
     "full_address_list": [],
     "instance_title": "caddy-frontend-1",
-    "ip_list": [
-      [
-        "T-2",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-2",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",
@@ -134,16 +104,6 @@
     },
     "full_address_list": [],
     "instance_title": "caddy-frontend-2",
-    "ip_list": [
-      [
-        "T-3",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-3",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-3",

software/rapid-cdn/test/test_data/test.TestReplicateSlave.test00supervisor_state.txt

@@ -38,23 +38,3 @@ T-2:slave-instrospection-nginx-{hash-generic}-on-watch RUNNING
 T-2:slave-introspection-safe-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
 T-2:trafficserver-reload EXITED
-T-3:backend-client-login-certificate-caucase-updater-on-watch STOPPED
-T-3:backend-haproxy-{hash-generic}-on-watch STOPPED
-T-3:backend-haproxy-rsyslogd-{hash-generic}-on-watch STOPPED
-T-3:backend-haproxy-safe-graceful EXITED
-T-3:bootstrap-monitor EXITED
-T-3:certificate_authority-{hash-generic}-on-watch STOPPED
-T-3:crond-{hash-generic}-on-watch STOPPED
-T-3:expose-csr-{hash-generic}-on-watch STOPPED
-T-3:frontend-haproxy-{hash-generic}-on-watch STOPPED
-T-3:frontend-haproxy-rsyslogd-{hash-generic}-on-watch STOPPED
-T-3:frontend-haproxy-safe-graceful EXITED
-T-3:kedifa-login-certificate-caucase-updater-on-watch STOPPED
-T-3:kedifa-updater-{hash-generic}-on-watch STOPPED
-T-3:logrotate-setup-validate EXITED
-T-3:monitor-httpd-{hash-generic}-on-watch STOPPED
-T-3:monitor-httpd-graceful EXITED
-T-3:slave-instrospection-nginx-{hash-generic}-on-watch STOPPED
-T-3:slave-introspection-safe-graceful EXITED
-T-3:trafficserver-{hash-generic}-on-watch STOPPED
-T-3:trafficserver-reload EXITED

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

@@ -4,16 +4,6 @@
     "domain": "example.com",
     "full_address_list": [],
     "instance_title": "testing partition 0",
-    "ip_list": [
-      [
-        "T-0",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-0",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "kedifa_port": "15080",
     "plain_http_port": "11080",
     "port": "11443",
@@ -843,16 +833,6 @@
     },
     "full_address_list": [],
     "instance_title": "kedifa",
-    "ip_list": [
-      [
-        "T-1",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-1",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
@@ -883,16 +863,6 @@
     },
     "full_address_list": [],
     "instance_title": "caddy-frontend-1",
-    "ip_list": [
-      [
-        "T-2",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-2",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",

software/rapid-cdn/test/test_data/test.TestSlaveCiphers.test00cluster_request_instance_parameter_dict.txt

@@ -5,16 +5,6 @@
     "domain": "example.com",
     "full_address_list": [],
     "instance_title": "testing partition 0",
-    "ip_list": [
-      [
-        "T-0",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-0",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "kedifa_port": "15080",
     "plain_http_port": "11080",
     "port": "11443",
@@ -67,16 +57,6 @@
     },
     "full_address_list": [],
     "instance_title": "kedifa",
-    "ip_list": [
-      [
-        "T-1",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-1",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
@@ -107,16 +87,6 @@
     },
     "full_address_list": [],
     "instance_title": "caddy-frontend-1",
-    "ip_list": [
-      [
-        "T-2",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-2",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",

software/rapid-cdn/test/test_data/test.TestSlaveHealthCheck.test00cluster_request_instance_parameter_dict.txt

@@ -4,16 +4,6 @@
     "domain": "example.com",
     "full_address_list": [],
     "instance_title": "testing partition 0",
-    "ip_list": [
-      [
-        "T-0",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-0",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "kedifa_port": "15080",
     "plain_http_port": "11080",
     "port": "11443",
@@ -257,16 +247,6 @@
     },
     "full_address_list": [],
     "instance_title": "kedifa",
-    "ip_list": [
-      [
-        "T-1",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-1",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
@@ -297,16 +277,6 @@
     },
     "full_address_list": [],
     "instance_title": "caddy-frontend-1",
-    "ip_list": [
-      [
-        "T-2",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-2",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",

software/rapid-cdn/test/test_data/test.TestSlaveHostHaproxyClash.test00cluster_request_instance_parameter_dict.txt

@@ -4,16 +4,6 @@
     "domain": "example.com",
     "full_address_list": [],
     "instance_title": "testing partition 0",
-    "ip_list": [
-      [
-        "T-0",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-0",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "kedifa_port": "15080",
     "plain_http_port": "11080",
     "port": "11443",
@@ -65,16 +55,6 @@
     },
     "full_address_list": [],
     "instance_title": "kedifa",
-    "ip_list": [
-      [
-        "T-1",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-1",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
@@ -105,16 +85,6 @@
     },
     "full_address_list": [],
     "instance_title": "caddy-frontend-1",
-    "ip_list": [
-      [
-        "T-2",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-2",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",

software/rapid-cdn/test/test_data/test.TestSlaveHttp3.test00cluster_request_instance_parameter_dict.txt

@@ -6,16 +6,6 @@
     "full_address_list": [],
     "http3-port": "11443",
     "instance_title": "testing partition 0",
-    "ip_list": [
-      [
-        "T-0",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-0",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "kedifa_port": "15080",
     "plain_http_port": "11080",
     "port": "11443",
@@ -845,16 +835,6 @@
     },
     "full_address_list": [],
     "instance_title": "kedifa",
-    "ip_list": [
-      [
-        "T-1",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-1",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
@@ -885,16 +865,6 @@
     },
     "full_address_list": [],
     "instance_title": "caddy-frontend-1",
-    "ip_list": [
-      [
-        "T-2",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-2",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",

software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00cluster_request_instance_parameter_dict.txt

@@ -6,16 +6,6 @@
     "domain": "example.com",
     "full_address_list": [],
     "instance_title": "testing partition 0",
-    "ip_list": [
-      [
-        "T-0",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-0",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "kedifa_port": "15080",
     "plain_http_port": "11080",
     "port": "11443",
@@ -214,16 +204,6 @@
     },
     "full_address_list": [],
     "instance_title": "kedifa",
-    "ip_list": [
-      [
-        "T-1",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-1",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
@@ -255,16 +235,6 @@
     },
     "full_address_list": [],
     "instance_title": "caddy-frontend-1",
-    "ip_list": [
-      [
-        "T-2",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-2",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",

software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00cluster_request_instance_parameter_dict.txt

@@ -6,16 +6,6 @@
     "domain": "example.com",
     "full_address_list": [],
     "instance_title": "testing partition 0",
-    "ip_list": [
-      [
-        "T-0",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-0",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "kedifa_port": "15080",
     "plain_http_port": "11080",
     "port": "11443",
@@ -54,16 +44,6 @@
     },
     "full_address_list": [],
     "instance_title": "kedifa",
-    "ip_list": [
-      [
-        "T-1",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-1",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
@@ -95,16 +75,6 @@
     },
     "full_address_list": [],
     "instance_title": "caddy-frontend-1",
-    "ip_list": [
-      [
-        "T-2",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-2",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",

software/rapid-cdn/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00cluster_request_instance_parameter_dict.txt

@@ -6,16 +6,6 @@
     "domain": "example.com",
     "full_address_list": [],
     "instance_title": "testing partition 0",
-    "ip_list": [
-      [
-        "T-0",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-0",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "kedifa_port": "15080",
     "plain_http_port": "11080",
     "port": "11443",
@@ -54,16 +44,6 @@
     },
     "full_address_list": [],
     "instance_title": "kedifa",
-    "ip_list": [
-      [
-        "T-1",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-1",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-1",
@@ -95,16 +75,6 @@
     },
     "full_address_list": [],
     "instance_title": "caddy-frontend-1",
-    "ip_list": [
-      [
-        "T-2",
-        "@@_ipv4_address@@"
-      ],
-      [
-        "T-2",
-        "@@_ipv6_address@@"
-      ]
-    ],
     "root_instance_title": "testing partition 0",
     "slap_computer_id": "local",
     "slap_computer_partition_id": "T-2",

software/slapos-master/test/test/test_erp5.py

@@ -125,7 +125,7 @@ class TestJupyter(ERP5InstanceTestCase, TestPublishedURLIsReachableMixin):
     param_dict = self.getRootPartitionConnectionParameterDict()
 
     self.assertEqual(
-      f'https://[{self._ipv6_address}]:8888/tree',
+      f'https://[{self.getPartitionIPv6(self.getPartitionId("jupyter"))}]:8888/tree',
       param_dict['jupyter-url']
     )
 

software/slapos-sr-testing/buildout.hash.cfg

@@ -15,4 +15,4 @@
 
 [template]
 filename = instance.cfg
-md5sum = ed0f91f39d5eda903938aa527625f40d
+md5sum = f10fbca22d1d30dd7a4f36e1cd521b97

software/slapos-sr-testing/instance.cfg

@@ -95,6 +95,11 @@ inline =
   echo "To work on a test, execute:"
   echo "   SLAPOS_TEST_DEBUG=1 {{ interpreter }} -m unittest discover -v"
   echo "from a folder containing software release test."
+  echo "Tip: you may want to also add"
+  echo "   SLAPOS_TEST_SKIP_SOFTWARE_REBUILD=1"
+  echo "   SLAPOS_TEST_SKIP_SOFTWARE_CHECK=1"
+  echo "   SLAPOS_TEST_LOG_DIRECTORY=<some-empty-directory>"
+  echo "See https://lab.nexedi.com/nexedi/slapos/tree/master/software/slapos-sr-testing"
   echo
 
 [publish]

software/theia/test/test.py

@@ -34,6 +34,7 @@ import re
 import subprocess
 import sqlite3
 import time
+import unittest
 
 import netaddr
 import pexpect
@@ -248,6 +249,12 @@ class TestTheia(TheiaTestCase):
     proxy_path = self.getPath('srv', 'runner', 'var', 'proxy.db')
     query = "SELECT partition_reference, address FROM partition_network%s" % DB_VERSION
 
+    ipv6, *prefixlen = self._ipv6_address.split('/')
+    if not prefixlen:
+      raise unittest.SkipTest('No IPv6 range')
+    elif int(prefixlen[0]) >= 123:
+      raise unittest.SkipTest('IPv6 range too small: %s' % self._ipv6_address)
+
     with sqlite3.connect(proxy_path) as db:
       rows = db.execute(query).fetchall()
       partitions = set(p for p, _ in rows)

software/theia/test/test_resiliency.py

@@ -184,6 +184,7 @@ class ExportAndImportMixin(object):
 
   def assertPromiseSucess(self):
     # Force promises to recompute regardless of periodicity
+    old_value = self.slap._force_slapos_node_instance_all
     self.slap._force_slapos_node_instance_all = True
     try:
       self.slap.waitForInstance(error_lines=0)
@@ -193,8 +194,8 @@ class ExportAndImportMixin(object):
       self.assertNotIn('ERROR export script', s)
       self.assertNotIn("Promise 'resiliency-import-promise.py' failed", s)
       self.assertNotIn('ERROR import script', s)
-    else:
-      pass
+    finally:
+      self.slap._force_slapos_node_instance_all = old_value
 
   def _doExport(self):
     # Compute last modification of the export exitcode file
@@ -247,6 +248,7 @@ class TestTheiaExportAndImportFailures(ExportAndImportMixin, ResilientTheiaTestC
 
   def assertPromiseFailure(self, *msg):
     # Force promises to recompute regardless of periodicity
+    old_value = self.slap._force_slapos_node_instance_all
     self.slap._force_slapos_node_instance_all = True
     try:
       self.slap.waitForInstance(error_lines=0)
@@ -256,6 +258,8 @@ class TestTheiaExportAndImportFailures(ExportAndImportMixin, ResilientTheiaTestC
         self.assertIn(m, s)
     else:
       self.fail('No promise failed')
+    finally:
+      self.slap._force_slapos_node_instance_all = old_value
 
   def assertScriptFailure(self, func, errorfile, exitfile, *msg):
     self.assertRaises(

stack/erp5/buildout.hash.cfg

@@ -74,7 +74,7 @@ md5sum = 3f7b28085ceff321a3cb785db60f7c3e
 
 [template-erp5]
 filename = instance-erp5.cfg.in
-md5sum = 30a1e738a8211887e75a5e75820e5872
+md5sum = 7fd36876df18e5cf62e050c2b30abcc9
 
 [template-zeo]
 filename = instance-zeo.cfg.in

stack/erp5/instance-erp5.cfg.in

@@ -281,6 +281,8 @@ software-type = zope
 {%   set partition_name = 'zope-' ~ custom_name -%}
 {%   set section_name = 'request-' ~ partition_name -%}
 {%   set promise_software_url_section_name = 'promise-software-url' ~ partition_name -%}
+{%   set check_test_runner_url_section_name = 'check-test-runner-url' ~ partition_name -%}
+{%   set promise_test_runner_url_section_name = 'promise-test-runner-url' ~ partition_name -%}
 {%   set zope_family = zope_parameter_dict.get('family', 'default') -%}
 {%   do zope_family_name_list.append(zope_family) %}
 {%   set backend_path = zope_parameter_dict.get('backend-path', '') % {'site-id': site_id} %}
@@ -315,6 +317,25 @@ config-activity-timeout = {{ dumps(current_zope_family_override_dict.get('activi
 {%   if test_runner_enabled -%}
 config-test-runner-apache-url-list = ${publish-early:{{ zope_family }}-test-runner-url-list}
 
+[{{ check_test_runner_url_section_name }}]
+# Promise to wait for zope partition to receive the expected test-runner URL
+recipe = slapos.cookbook:check_parameter
+value = {{ '${' ~ section_name ~ ':config-test-runner-apache-url-list}' }}
+expected-not-value = not-ready
+expected-value =
+path = ${directory:bin}/${:_buildout_section_name_}
+
+[{{ promise_test_runner_url_section_name }}]
+<= monitor-promise-base
+promise = check_command_execute
+name = ${:_buildout_section_name_}.py
+config-command = {{ '${' ~ check_test_runner_url_section_name ~ ':path}' }}
+
+{% do root_common.section(promise_test_runner_url_section_name) -%}
+
+{%   endif -%}
+
+
 [{{ promise_software_url_section_name }}]
 # Promise to wait for zope partition to use the expected software URL,
 # used on upgrades.
@@ -326,7 +347,6 @@ path = ${directory:bin}/${:_buildout_section_name_}
 
 {% do root_common.section(promise_software_url_section_name) -%}
 
-{%   endif -%}
 {% endfor -%}
 
 {# if not explicitly configured, connect jupyter to first zope family, which  -#}

stack/slapos.cfg

@@ -297,7 +297,7 @@ simplegeneric = 0.8.1
 singledispatch = 3.4.0.3
 six = 1.16.0
 slapos.cookbook = 1.0.329
-slapos.core = 1.10.1
+slapos.core = 1.10.2
 slapos.extension.shared = 1.0
 slapos.libnetworkcache = 0.25
 slapos.rebootstrap = 4.5