slapproxy: Make rows unique for forwarded requests

See merge request !423

slapos/proxy/schema.sql

---version:15
+--version:16
 CREATE TABLE IF NOT EXISTS local_software_release_root%(version)s (
   path VARCHAR(255)
 );
@@ -54,5 +54,6 @@ CREATE TABLE IF NOT EXISTS partition_network%(version)s (
 
 CREATE TABLE IF NOT EXISTS forwarded_partition_request%(version)s (
   partition_reference VARCHAR(255), -- a.k.a source_instance_id
-  master_url VARCHAR(255)
+  master_url VARCHAR(255),
+  CONSTRAINT uniq PRIMARY KEY (partition_reference, master_url)
 );

slapos/proxy/views.py

@@ -194,7 +194,7 @@ def _upgradeDatabaseIfNeeded():
     for row in execute_db(table, 'SELECT * from %s', db_version=current_schema_version):
       columns = ', '.join(row.keys())
       placeholders = ':'+', :'.join(row.keys())
-      query = 'INSERT INTO %s (%s) VALUES (%s)' % ('%s', columns, placeholders)
+      query = 'INSERT OR REPLACE INTO %s (%s) VALUES (%s)' % ('%s', columns, placeholders)
       execute_db(table, query, row)
   # then drop old tables
   for previous_table in previous_table_list:

slapos/tests/test_slapproxy.py

@@ -1781,7 +1781,7 @@ database_uri = %(rootdir)s/lib/external_proxy.db
     """
     Test there is no instance on local proxy.
     Test there is instance on external proxy.
-    Test there is instance reference in external table of databse of local proxy.
+    Test there is instance reference in external table of database of local proxy.
     """
     # Adjust name to match forwarding prefix
     name = '%s_%s' % (requester or 'user', name)
@@ -1853,7 +1853,7 @@ database_uri = %(rootdir)s/lib/external_proxy.db
 
   def testForwardToMasterInList(self):
     """
-    Test that explicitely asking a master_url in SLA causes
+    Test that explicitly asking a master_url in SLA causes
     proxy to forward request to this master.
     """
     dummy_parameter_dict = {'foo': 'bar'}
@@ -1871,6 +1871,32 @@ database_uri = %(rootdir)s/lib/external_proxy.db
         self.external_master_url
     )
 
+  def testForwardToMasterInList_NoDuplicates(self):
+    """
+    Test that multiple explicitly forwarded requests for the same instance
+    do not result in duplicate entries in the proxy database.
+    """
+    dummy_parameter_dict = {'foo': 'bar'}
+    instance_reference = 'MyFirstInstance'
+    self.format_for_number_of_partitions(1)
+    self.external_proxy_format_for_number_of_partitions(1)
+
+    filter_kw = {'master_url': self.external_master_url}
+
+    for _ in range(2):
+      partition = self.request(self.software_release_not_in_list, None, instance_reference, 'slappart0',
+                               filter_kw=filter_kw, partition_parameter_kw=dummy_parameter_dict)
+
+    # Explicitly do the relevant test, even if _checkInstanceIsFowarded does it too
+    entries = slapos.proxy.views.execute_db('forwarded_partition_request', 'SELECT * from %s', db=self.db)
+    self.assertEqual(len(entries), 1)
+
+    self._checkInstanceIsFowarded(instance_reference, 'slappart0', dummy_parameter_dict, self.software_release_not_in_list)
+    self.assertEqual(
+        partition._master_url,
+        self.external_master_url
+    )
+
   def testForwardToMasterNotInList(self):
     """
     Test that explicitely asking a master_url in SLA causes
@@ -1904,6 +1930,32 @@ database_uri = %(rootdir)s/lib/external_proxy.db
     self.assertEqual(self.external_software_release, partition.getSoftwareRelease())
     self.assertEqual({}, partition.getConnectionParameterDict())
 
+  def testForwardRequest_SoftwareReleaseList_NoDuplicates(self):
+    """
+    Test that multiple automatically forwarded requests for the same instance
+    do not result in duplicate entries in the proxy database.
+    """
+    dummy_parameter_dict = {'foo': 'bar'}
+    instance_reference = 'MyFirstInstance'
+    self.format_for_number_of_partitions(1)
+    self.external_proxy_format_for_number_of_partitions(1)
+
+    for _ in range(2):
+      partition = self.request(self.external_software_release, None, instance_reference, 'slappart0',
+                               partition_parameter_kw=dummy_parameter_dict)
+
+    # Explicitly do the relevant test, even if _checkInstanceIsFowarded does it too
+    entries = slapos.proxy.views.execute_db('forwarded_partition_request', 'SELECT * from %s', db=self.db)
+    self.assertEqual(len(entries), 1)
+
+    self._checkInstanceIsFowarded(instance_reference, 'slappart0', dummy_parameter_dict, self.external_software_release)
+
+    instance_parameter_dict = partition.getInstanceParameterDict()
+    instance_parameter_dict.pop('timestamp')
+    self.assertEqual(dummy_parameter_dict, instance_parameter_dict)
+    self.assertEqual(self.external_software_release, partition.getSoftwareRelease())
+    self.assertEqual({}, partition.getConnectionParameterDict())
+
   def testForwardRequestFromPartition(self):
     """
     Test that instance request is forwarded and requested from computer partition.
@@ -2236,7 +2288,7 @@ class _MigrationTestCase(TestInformation, TestRequest, TestSlaveRequest, TestMul
   """
   dump_filename = NotImplemented
   initial_table_list = NotImplemented
-  current_version = '15'
+  current_version = '16'
 
   def setUp(self):
     TestInformation.setUp(self)
@@ -2317,6 +2369,14 @@ class _MigrationTestCase(TestInformation, TestRequest, TestSlaveRequest, TestMul
         [(u'slappart0', u'computer', u'slappart0', u'127.0.0.1', u'255.255.255.255'), (u'slappart0', u'computer', u'slappart0', u'fc00::1', u'ffff:ffff:ffff::'), (u'slappart1', u'computer', u'slappart1', u'127.0.0.1', u'255.255.255.255'), (u'slappart1', u'computer', u'slappart1', u'fc00::1', u'ffff:ffff:ffff::'), (u'slappart2', u'computer', u'slappart2', u'127.0.0.1', u'255.255.255.255'), (u'slappart2', u'computer', u'slappart2', u'fc00::1', u'ffff:ffff:ffff::'), (u'slappart3', u'computer', u'slappart3', u'127.0.0.1', u'255.255.255.255'), (u'slappart3', u'computer', u'slappart3', u'fc00::1', u'ffff:ffff:ffff::'), (u'slappart4', u'computer', u'slappart4', u'127.0.0.1', u'255.255.255.255'), (u'slappart4', u'computer', u'slappart4', u'fc00::1', u'ffff:ffff:ffff::'), (u'slappart5', u'computer', u'slappart5', u'127.0.0.1', u'255.255.255.255'), (u'slappart5', u'computer', u'slappart5', u'fc00::1', u'ffff:ffff:ffff::'), (u'slappart6', u'computer', u'slappart6', u'127.0.0.1', u'255.255.255.255'), (u'slappart6', u'computer', u'slappart6', u'fc00::1', u'ffff:ffff:ffff::'), (u'slappart7', u'computer', u'slappart7', u'127.0.0.1', u'255.255.255.255'), (u'slappart7', u'computer', u'slappart7', u'fc00::1', u'ffff:ffff:ffff::'), (u'slappart8', u'computer', u'slappart8', u'127.0.0.1', u'255.255.255.255'), (u'slappart8', u'computer', u'slappart8', u'fc00::1', u'ffff:ffff:ffff::'), (u'slappart9', u'computer', u'slappart9', u'127.0.0.1', u'255.255.255.255'), (u'slappart9', u'computer', u'slappart9', u'fc00::1', u'ffff:ffff:ffff::')]
     )
 
+    # Check that duplicate forwarded requests in the initial table result in a single entry in the new table
+    if any(t.startswith('forwarded_partition_request') for t in self.initial_table_list):
+      forwarded_request_list = self.db.execute("select * from forwarded_partition_request{}".format(self.current_version)).fetchall()
+      self.assertEqual(
+          forwarded_request_list,
+          [('forwarded_instance', 'https://bogus/master/url')]
+      )
+
     # Check that we only have new tables
     table_list = self.db.execute("SELECT name FROM sqlite_master WHERE type='table' ORDER BY name").fetchall()
     self.assertEqual([x[0] for x in table_list],
@@ -2376,4 +2436,10 @@ class TestMigrateVersion14ToLatest(_MigrationTestCase):
   initial_table_list = ['computer14', 'forwarded_partition_request14', 'partition14', 'partition_network14', 'slave14', 'software14', ]
 
 
+class TestMigrateVersion15ToLatest(_MigrationTestCase):
+  dump_filename = 'database_dump_version_15.sql'
+  initial_table_list = ['computer15', 'forwarded_partition_request15', 'local_software_release_root15', 'partition15',
+                        'partition_network15', 'slave15', 'software15', ]
+
+
 del _MigrationTestCase

slapos/tests/test_slapproxy/README.md

+# How to update tests after database version upgrade ?
+
+You've just updated the version of the database in `slapos/proxy/schema.sql`,
+and you need to update the tests. You're in the right place!
+
+Let's call `XX` the current version number and `YY` the new version.
+Let's call `UU` the version number before `XX`.
+
+
+## Prerequisites
+
+A SlapOS node in which command `slapos` uses version `XX` of the database.
+- e.g. a Theia in which you're locally developping `slapos.core`
+
+A Python virtual environment in which the `slapos.core` egg is installed
+from the local repository with your changes, including the version upgrade
+to `YY`.
+
+For example, beside the `slapos.core` repository
+
+```
+$ python3 -m venv pyenv
+$ source pyenv/bin/activate
+(pyenv) $ cd slapos.core
+(pyenv) $ pip install -e .
+(pyenv) $ deactivate
+$
+```
+
+The command `pip install -e <path>` installs the egg from sources at `<path>`
+in editable mode, so that any change the source code is immediately taken
+into account.
+
+This provides a `slapos` command that uses version `YY` of the database
+(assuming `slapos/proxy/schema.sql` has been updated in the source code)
+whenever the virtual environment is activated.
+
+
+## In `test_slapproxy.py`
+
+- In `_MigrationTestCase`, update `current_version` from `XX` to `YY`.
+
+- Add a `TestMigrateVersionXXToLatest` test case (see the existing ones).
+  - If tables were added in version `XX`, adjust the `initial_table_list`.
+
+
+## In `test_slapproxy/`
+
+Go to `test_slapproxy/` (assuming you are at the root of `slapos.core`):
+
+```
+$ cd slapos/tests/test_slapproxy
+```
+
+With the Python virtual environment deactivated, run:
+
+```
+$ ./generate_dump.sh computer database_dump_version_UU.sql database_dump_version_XX.sql
+```
+
+This will call `slapos proxy start` with the `slapos` that uses version `XX`,
+load the `database_dump_version_UU.sql` and migrate it to version `XX`, and
+then dump it into a new file `database_dump_version_XX.sql`.
+
+Now activate the virtual environment and run:
+```
+(pyenv) $ ./generate_dump.sh slaprunner database_dump_version_current.sql database_dump_version_current.sql
+```
+
+This will call `slapos proxy start` with `slapos` from the virtual environment
+which has version `YY`, load `database_dump_version_current.sql` which is in
+version `XX`, migrate it to `YY`, and then dump it back overwriting the file.

slapos/tests/test_slapproxy/database_dump_version_11.sql

@@ -120,4 +120,6 @@ CREATE TABLE forwarded_partition_request11 (
   partition_reference VARCHAR(255), -- a.k.a source_instance_id
   master_url VARCHAR(255)
 );
+INSERT INTO "forwarded_partition_request11" VALUES('forwarded_instance','https://bogus/master/url');
+INSERT INTO "forwarded_partition_request11" VALUES('forwarded_instance','https://bogus/master/url');
 COMMIT;

slapos/tests/test_slapproxy/database_dump_version_12.sql

@@ -121,4 +121,6 @@ CREATE TABLE forwarded_partition_request12 (
   partition_reference VARCHAR(255), -- a.k.a source_instance_id
   master_url VARCHAR(255)
 );
+INSERT INTO "forwarded_partition_request12" VALUES('forwarded_instance','https://bogus/master/url');
+INSERT INTO "forwarded_partition_request12" VALUES('forwarded_instance','https://bogus/master/url');
 COMMIT;

slapos/tests/test_slapproxy/database_dump_version_13.sql

@@ -121,4 +121,6 @@ CREATE TABLE forwarded_partition_request13 (
   partition_reference VARCHAR(255), -- a.k.a source_instance_id
   master_url VARCHAR(255)
 );
+INSERT INTO "forwarded_partition_request13" VALUES('forwarded_instance','https://bogus/master/url');
+INSERT INTO "forwarded_partition_request13" VALUES('forwarded_instance','https://bogus/master/url');
 COMMIT;

slapos/tests/test_slapproxy/database_dump_version_14.sql

@@ -122,4 +122,6 @@ CREATE TABLE forwarded_partition_request14 (
   partition_reference VARCHAR(255), -- a.k.a source_instance_id
   master_url VARCHAR(255)
 );
+INSERT INTO "forwarded_partition_request14" VALUES('forwarded_instance','https://bogus/master/url');
+INSERT INTO "forwarded_partition_request14" VALUES('forwarded_instance','https://bogus/master/url');
 COMMIT;

slapos/tests/test_slapproxy/database_dump_version_15.sql

+PRAGMA foreign_keys=OFF;
+BEGIN TRANSACTION;
+CREATE TABLE local_software_release_root15 (
+  path VARCHAR(255)
+);
+INSERT INTO "local_software_release_root15" VALUES('/');
+CREATE TABLE software15 (
+  url VARCHAR(255),
+  computer_reference VARCHAR(255) DEFAULT 'computer',
+  requested_state VARCHAR(255) DEFAULT 'available',
+  CONSTRAINT uniq PRIMARY KEY (url, computer_reference)
+);
+INSERT INTO "software15" VALUES('/srv/slapgrid//srv//runner/project//slapos/software.cfg','computer','available');
+CREATE TABLE computer15 (
+  reference VARCHAR(255) DEFAULT 'computer',
+  address VARCHAR(255),
+  netmask VARCHAR(255),
+  CONSTRAINT uniq PRIMARY KEY (reference)
+);
+INSERT INTO "computer15" VALUES('computer','127.0.0.1','255.255.255.255');
+CREATE TABLE partition15 (
+  reference VARCHAR(255),
+  computer_reference VARCHAR(255) DEFAULT 'computer',
+  slap_state VARCHAR(255) DEFAULT 'free',
+  software_release VARCHAR(255),
+  xml TEXT,
+  connection_xml TEXT,
+  slave_instance_list TEXT,
+  software_type VARCHAR(255),
+  partition_reference VARCHAR(255), -- name of the instance
+  requested_by VARCHAR(255), -- only used for debugging,
+                             -- slapproxy does not support proper scope
+  requested_state VARCHAR(255) NOT NULL DEFAULT 'started',
+  timestamp REAL,
+  CONSTRAINT uniq PRIMARY KEY (reference, computer_reference)
+);
+INSERT INTO "partition15" VALUES('slappart0','computer','busy','/srv/slapgrid//srv//runner/project//slapos/software.cfg','<?xml version=''1.0'' encoding=''utf-8''?>
+<instance>
+  <parameter id="json">{
+  "site-id": "erp5"
+  }
+}</parameter>
+</instance>
+',NULL,NULL,'production','slapos',NULL,'started',NULL);
+INSERT INTO "partition15" VALUES('slappart1','computer','busy','/srv/slapgrid//srv//runner/project//slapos/software.cfg','<?xml version=''1.0'' encoding=''utf-8''?>
+<instance/>
+','<?xml version=''1.0'' encoding=''utf-8''?>
+<instance>
+  <parameter id="url">mysql://127.0.0.1:45678/erp5</parameter>
+</instance>
+',NULL,'mariadb','MariaDB DataBase','slappart0','started',NULL);
+INSERT INTO "partition15" VALUES('slappart2','computer','busy','/srv/slapgrid//srv//runner/project//slapos/software.cfg','<?xml version=''1.0'' encoding=''utf-8''?>
+<instance>
+  <parameter id="cloudooo-json"></parameter>
+</instance>
+','<?xml version=''1.0'' encoding=''utf-8''?>
+<instance>
+  <parameter id="url">cloudooo://127.0.0.1:23000/</parameter>
+</instance>
+',NULL,'cloudooo','Cloudooo','slappart0','started',NULL);
+INSERT INTO "partition15" VALUES('slappart3','computer','busy','/srv/slapgrid//srv//runner/project//slapos/software.cfg','<?xml version=''1.0'' encoding=''utf-8''?>
+<instance/>
+','<?xml version=''1.0'' encoding=''utf-8''?>
+<instance>
+  <parameter id="url">memcached://127.0.0.1:11000/</parameter>
+</instance>
+',NULL,'memcached','Memcached','slappart0','started',NULL);
+INSERT INTO "partition15" VALUES('slappart4','computer','busy','/srv/slapgrid//srv//runner/project//slapos/software.cfg','<?xml version=''1.0'' encoding=''utf-8''?>
+<instance/>
+','<?xml version=''1.0'' encoding=''utf-8''?>
+<instance>
+  <parameter id="url">memcached://127.0.0.1:13301/</parameter>
+</instance>
+',NULL,'kumofs','KumoFS','slappart0','started',NULL);
+INSERT INTO "partition15" VALUES('slappart5','computer','busy','/srv/slapgrid//srv//runner/project//slapos/software.cfg','<?xml version=''1.0'' encoding=''utf-8''?>
+<instance>
+  <parameter id="kumofs-url">memcached://127.0.0.1:13301/</parameter>
+  <parameter id="memcached-url">memcached://127.0.0.1:11000/</parameter>
+  <parameter id="cloudooo-url">cloudooo://127.0.0.1:23000/</parameter>
+</instance>
+','<?xml version=''1.0'' encoding=''utf-8''?>
+<instance>
+  <parameter id="url">https://[fc00::1]:10001</parameter>
+</instance>
+',NULL,'tidstorage','TidStorage','slappart0','started',NULL);
+INSERT INTO "partition15" VALUES('slappart6','computer','free',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'started',NULL);
+INSERT INTO "partition15" VALUES('slappart7','computer','free',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'started',NULL);
+INSERT INTO "partition15" VALUES('slappart8','computer','free',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'started',NULL);
+INSERT INTO "partition15" VALUES('slappart9','computer','free',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'started',NULL);
+CREATE TABLE slave15 (
+  reference VARCHAR(255), -- unique slave reference
+  computer_reference VARCHAR(255) DEFAULT 'computer',
+  connection_xml TEXT,
+  hosted_by VARCHAR(255),
+  asked_by VARCHAR(255) -- only used for debugging,
+                        -- slapproxy does not support proper scope
+);
+CREATE TABLE partition_network15 (
+  partition_reference VARCHAR(255),
+  computer_reference VARCHAR(255) DEFAULT 'computer',
+  reference VARCHAR(255),
+  address VARCHAR(255),
+  netmask VARCHAR(255)
+);
+INSERT INTO "partition_network15" VALUES('slappart0','computer','slappart0','127.0.0.1','255.255.255.255');
+INSERT INTO "partition_network15" VALUES('slappart0','computer','slappart0','fc00::1','ffff:ffff:ffff::');
+INSERT INTO "partition_network15" VALUES('slappart1','computer','slappart1','127.0.0.1','255.255.255.255');
+INSERT INTO "partition_network15" VALUES('slappart1','computer','slappart1','fc00::1','ffff:ffff:ffff::');
+INSERT INTO "partition_network15" VALUES('slappart2','computer','slappart2','127.0.0.1','255.255.255.255');
+INSERT INTO "partition_network15" VALUES('slappart2','computer','slappart2','fc00::1','ffff:ffff:ffff::');
+INSERT INTO "partition_network15" VALUES('slappart3','computer','slappart3','127.0.0.1','255.255.255.255');
+INSERT INTO "partition_network15" VALUES('slappart3','computer','slappart3','fc00::1','ffff:ffff:ffff::');
+INSERT INTO "partition_network15" VALUES('slappart4','computer','slappart4','127.0.0.1','255.255.255.255');
+INSERT INTO "partition_network15" VALUES('slappart4','computer','slappart4','fc00::1','ffff:ffff:ffff::');
+INSERT INTO "partition_network15" VALUES('slappart5','computer','slappart5','127.0.0.1','255.255.255.255');
+INSERT INTO "partition_network15" VALUES('slappart5','computer','slappart5','fc00::1','ffff:ffff:ffff::');
+INSERT INTO "partition_network15" VALUES('slappart6','computer','slappart6','127.0.0.1','255.255.255.255');
+INSERT INTO "partition_network15" VALUES('slappart6','computer','slappart6','fc00::1','ffff:ffff:ffff::');
+INSERT INTO "partition_network15" VALUES('slappart7','computer','slappart7','127.0.0.1','255.255.255.255');
+INSERT INTO "partition_network15" VALUES('slappart7','computer','slappart7','fc00::1','ffff:ffff:ffff::');
+INSERT INTO "partition_network15" VALUES('slappart8','computer','slappart8','127.0.0.1','255.255.255.255');
+INSERT INTO "partition_network15" VALUES('slappart8','computer','slappart8','fc00::1','ffff:ffff:ffff::');
+INSERT INTO "partition_network15" VALUES('slappart9','computer','slappart9','127.0.0.1','255.255.255.255');
+INSERT INTO "partition_network15" VALUES('slappart9','computer','slappart9','fc00::1','ffff:ffff:ffff::');
+CREATE TABLE forwarded_partition_request15 (
+  partition_reference VARCHAR(255), -- a.k.a source_instance_id
+  master_url VARCHAR(255)
+);
+INSERT INTO "forwarded_partition_request15" VALUES('forwarded_instance','https://bogus/master/url');
+INSERT INTO "forwarded_partition_request15" VALUES('forwarded_instance','https://bogus/master/url');
+COMMIT;

slapos/tests/test_slapproxy/database_dump_version_current.sql

 PRAGMA foreign_keys=OFF;
 BEGIN TRANSACTION;
-CREATE TABLE local_software_release_root15 (
+CREATE TABLE local_software_release_root16 (
   path VARCHAR(255)
 );
-INSERT INTO "local_software_release_root15" VALUES('/');
-CREATE TABLE software15 (
+INSERT INTO "local_software_release_root16" VALUES('/');
+INSERT INTO "local_software_release_root16" VALUES('/');
+CREATE TABLE software16 (
   url VARCHAR(255),
   computer_reference VARCHAR(255) DEFAULT 'slaprunner',
   requested_state VARCHAR(255) DEFAULT 'available',
   CONSTRAINT uniq PRIMARY KEY (url, computer_reference)
 );
-INSERT INTO "software15" VALUES('/srv/slapgrid/slappart8/srv/runner/project/slapos/software/seleniumrunner/software.cfg','slaprunner','available');
-INSERT INTO "software15" VALUES('/srv/slapgrid/slappart8/srv/runner/project/slapos/software/evil/software.cfg','slaprunner','available');
-INSERT INTO "software15" VALUES('/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg','slaprunner','available');
-CREATE TABLE computer15 (
+INSERT INTO "software16" VALUES('/srv/slapgrid/slappart8/srv/runner/project/slapos/software/seleniumrunner/software.cfg','slaprunner','available');
+INSERT INTO "software16" VALUES('/srv/slapgrid/slappart8/srv/runner/project/slapos/software/evil/software.cfg','slaprunner','available');
+INSERT INTO "software16" VALUES('/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg','slaprunner','available');
+CREATE TABLE computer16 (
   reference VARCHAR(255) DEFAULT 'slaprunner',
   address VARCHAR(255),
   netmask VARCHAR(255),
   CONSTRAINT uniq PRIMARY KEY (reference)
 );
-INSERT INTO "computer15" VALUES('slaprunner','10.0.30.235','255.255.255.255');
-CREATE TABLE partition15 (
+INSERT INTO "computer16" VALUES('slaprunner','10.0.30.235','255.255.255.255');
+CREATE TABLE partition16 (
   reference VARCHAR(255),
   computer_reference VARCHAR(255) DEFAULT 'slaprunner',
   slap_state VARCHAR(255) DEFAULT 'free',
@@ -36,7 +37,7 @@ CREATE TABLE partition15 (
   timestamp REAL,
   CONSTRAINT uniq PRIMARY KEY (reference, computer_reference)
 );
-INSERT INTO "partition15" VALUES('slappart0','slaprunner','busy','/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg','<?xml version=''1.0'' encoding=''utf-8''?>
+INSERT INTO "partition16" VALUES('slappart0','slaprunner','busy','/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg','<?xml version=''1.0'' encoding=''utf-8''?>
 <instance>
   <parameter id="_">{
   "mariadb": {
@@ -84,7 +85,7 @@ INSERT INTO "partition15" VALUES('slappart0','slaprunner','busy','/srv/slapgrid/
   <parameter id="_">{"hosts-dict": {"erp5-cloudooo": "cloudooo.erp5.net", "erp5-smtp": "127.0.0.2", "erp5-catalog-0": "10.0.30.235", "erp5-memcached-volatile": "10.0.30.235", "erp5-memcached-persistent": "10.0.30.235"}, "login-test-runner-url-list": ["https://10.0.30.235:2157/unit_test_0/", "https://10.0.30.235:2157/unit_test_1/", "https://10.0.30.235:2157/unit_test_2/"], "monitor-setup-url": "https://monitor.app.officejs.com/#page=settings_configurator&amp;url=/public/feeds&amp;username=admin&amp;password=password", "family-login-v6": "https://[::1]:2159", "deadlock-debugger-password": "password", "family-login": "https://10.0.30.235:2159", "inituser-login": "zope", "inituser-password": "password", "family-activities": "https://10.0.30.235:2155", "monitor-base-url": "", "site-id": "erp5", "mariadb-test-database-list": ["mysql://testuser_0:testpassword0@10.0.30.235:2099/erp5_test_0", "mysql://testuser_1:testpassword1@10.0.30.235:2099/erp5_test_1", "mysql://testuser_2:testpassword2@10.0.30.235:2099/erp5_test_2", "mysql://testuser_3:testpassword3@10.0.30.235:2099/erp5_test_3", "mysql://testuser_4:testpassword4@10.0.30.235:2099/erp5_test_4", "mysql://testuser_5:testpassword5@10.0.30.235:2099/erp5_test_5", "mysql://testuser_6:testpassword6@10.0.30.235:2099/erp5_test_6", "mysql://testuser_7:testpassword7@10.0.30.235:2099/erp5_test_7", "mysql://testuser_8:testpassword8@10.0.30.235:2099/erp5_test_8", "mysql://testuser_9:testpassword9@10.0.30.235:2099/erp5_test_9", "mysql://testuser_10:testpassword10@10.0.30.235:2099/erp5_test_10", "mysql://testuser_11:testpassword11@10.0.30.235:2099/erp5_test_11"], "mariadb-database-list": ["mysql://user:insecure@10.0.30.235:2099/erp5"], "memcached-volatile-url": "memcached://10.0.30.235:2013/", "memcached-persistent-url": "memcached://10.0.30.235:2003/", "caucase-http-url": "http://[::1]:8890", "activities-test-runner-url-list": ["https://10.0.30.235:2153/unit_test_0/", "https://10.0.30.235:2153/unit_test_1/", "https://10.0.30.235:2153/unit_test_2/"], "family-activities-v6": "https://[::1]:2155"}</parameter>
 </instance>
 ',NULL,'default','slaprunner-dev-local-frontend-2',NULL,'started',NULL);
-INSERT INTO "partition15" VALUES('slappart1','slaprunner','busy','/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg','<?xml version=''1.0'' encoding=''utf-8''?>
+INSERT INTO "partition16" VALUES('slappart1','slaprunner','busy','/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg','<?xml version=''1.0'' encoding=''utf-8''?>
 <instance>
   <parameter id="_">{"use-ipv6": false, "auto-sign-csr-amount": 2, "server-port": 8890, "name": "caucase", "server-https-port": 8891}</parameter>
 </instance>
@@ -93,7 +94,7 @@ INSERT INTO "partition15" VALUES('slappart1','slaprunner','busy','/srv/slapgrid/
   <parameter id="_">{"http-url": "http://[::1]:8890", "https-url": "https://[::1]:8891", "init-user": "admin"}</parameter>
 </instance>
 ',NULL,'caucase','caucase','slappart0','started',NULL);
-INSERT INTO "partition15" VALUES('slappart2','slaprunner','busy','/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg','<?xml version=''1.0'' encoding=''utf-8''?>
+INSERT INTO "partition16" VALUES('slappart2','slaprunner','busy','/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg','<?xml version=''1.0'' encoding=''utf-8''?>
 <instance>
   <parameter id="_">{"use-ipv6": false, "monitor-passwd": "password", "tcpv4-port": 2000, "name": "memcached-persistent"}</parameter>
 </instance>
@@ -102,7 +103,7 @@ INSERT INTO "partition15" VALUES('slappart2','slaprunner','busy','/srv/slapgrid/
   <parameter id="_">{"url": "memcached://10.0.30.235:2003/", "monitor-base-url": ""}</parameter>
 </instance>
 ',NULL,'kumofs','memcached-persistent','slappart0','started',NULL);
-INSERT INTO "partition15" VALUES('slappart3','slaprunner','busy','/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg','<?xml version=''1.0'' encoding=''utf-8''?>
+INSERT INTO "partition16" VALUES('slappart3','slaprunner','busy','/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg','<?xml version=''1.0'' encoding=''utf-8''?>
 <instance>
   <parameter id="_">{"use-ipv6": false, "monitor-passwd": "password", "tcpv4-port": 2010, "name": "memcached-volatile", "ram-storage-size": 64}</parameter>
 </instance>
@@ -111,7 +112,7 @@ INSERT INTO "partition15" VALUES('slappart3','slaprunner','busy','/srv/slapgrid/
   <parameter id="_">{"url": "memcached://10.0.30.235:2013/", "monitor-base-url": ""}</parameter>
 </instance>
 ',NULL,'kumofs','memcached-volatile','slappart0','started',NULL);
-INSERT INTO "partition15" VALUES('slappart4','slaprunner','busy','/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg','<?xml version=''1.0'' encoding=''utf-8''?>
+INSERT INTO "partition16" VALUES('slappart4','slaprunner','busy','/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg','<?xml version=''1.0'' encoding=''utf-8''?>
 <instance>
   <parameter id="_">{"monitor-passwd": "password", "name": "mariadb", "use-ipv6": false, "tcpv4-port": 2099, "test-database-amount": 12, "innodb-log-file-size": 134217728, "slowest-query-threshold": "", "innodb-buffer-pool-size": 1073741824, "max-slowqueries-threshold": 1000}</parameter>
 </instance>
@@ -120,7 +121,7 @@ INSERT INTO "partition15" VALUES('slappart4','slaprunner','busy','/srv/slapgrid/
   <parameter id="_">{"monitor-base-url": "", "server-id": 3739295806, "database-list": ["mysql://user:insecure@10.0.30.235:2099/erp5"], "test-database-list": ["mysql://testuser_0:testpassword0@10.0.30.235:2099/erp5_test_0", "mysql://testuser_1:testpassword1@10.0.30.235:2099/erp5_test_1", "mysql://testuser_2:testpassword2@10.0.30.235:2099/erp5_test_2", "mysql://testuser_3:testpassword3@10.0.30.235:2099/erp5_test_3", "mysql://testuser_4:testpassword4@10.0.30.235:2099/erp5_test_4", "mysql://testuser_5:testpassword5@10.0.30.235:2099/erp5_test_5", "mysql://testuser_6:testpassword6@10.0.30.235:2099/erp5_test_6", "mysql://testuser_7:testpassword7@10.0.30.235:2099/erp5_test_7", "mysql://testuser_8:testpassword8@10.0.30.235:2099/erp5_test_8", "mysql://testuser_9:testpassword9@10.0.30.235:2099/erp5_test_9", "mysql://testuser_10:testpassword10@10.0.30.235:2099/erp5_test_10", "mysql://testuser_11:testpassword11@10.0.30.235:2099/erp5_test_11"]}</parameter>
 </instance>
 ',NULL,'mariadb','mariadb','slappart0','started',NULL);
-INSERT INTO "partition15" VALUES('slappart5','slaprunner','busy','/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg','<?xml version=''1.0'' encoding=''utf-8''?>
+INSERT INTO "partition16" VALUES('slappart5','slaprunner','busy','/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg','<?xml version=''1.0'' encoding=''utf-8''?>
 <instance>
   <parameter id="_">{"use-ipv6": false, "monitor-passwd": "password", "tcpv4-port": 2100, "name": "zodb", "zodb-dict": {"root": {"family": "1"}}}</parameter>
 </instance>
@@ -129,7 +130,7 @@ INSERT INTO "partition15" VALUES('slappart5','slaprunner','busy','/srv/slapgrid/
   <parameter id="_">{"storage-dict": {"root": {"storage": "root", "server": "10.0.30.235:2100"}}, "tidstorage-ip": "", "monitor-base-url": "", "tidstorage-port": ""}</parameter>
 </instance>
 ',NULL,'zodb-zeo','zodb','slappart0','started',NULL);
-INSERT INTO "partition15" VALUES('slappart6','slaprunner','busy','/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg','<?xml version=''1.0'' encoding=''utf-8''?>
+INSERT INTO "partition16" VALUES('slappart6','slaprunner','busy','/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg','<?xml version=''1.0'' encoding=''utf-8''?>
 <instance>
   <parameter id="_">{"zodb-dict": {"root": {"storage-dict": {"cache-size": "20MB"}, "mount-point": "/", "type": "zeo", "cache-size": 50000}}, "site-id": "erp5", "webdav": false, "saucelabs-dict": {}, "tidstorage-port": "", "hosts-dict": {}, "hostalias-dict": {}, "large-file-threshold": "10MB", "bt5-repository-url": "/srv/slapgrid/slappart8/srv/runner/software/287375f0cba269902ba1bc50242839d7/parts/erp5/bt5 /srv/slapgrid/slappart8/srv/runner/software/287375f0cba269902ba1bc50242839d7/parts/erp5/product/ERP5/bootstrap", "test-runner-apache-url-list": ["https://10.0.30.235:2153/unit_test_0/", "https://10.0.30.235:2153/unit_test_1/", "https://10.0.30.235:2153/unit_test_2/"], "timezone": "Asia/Tokyo", "cloudooo-url": "https://cloudooo.erp5.net/", "mysql-test-url-list": ["mysql://testuser_0:testpassword0@10.0.30.235:2099/erp5_test_0", "mysql://testuser_1:testpassword1@10.0.30.235:2099/erp5_test_1", "mysql://testuser_2:testpassword2@10.0.30.235:2099/erp5_test_2", "mysql://testuser_3:testpassword3@10.0.30.235:2099/erp5_test_3", "mysql://testuser_4:testpassword4@10.0.30.235:2099/erp5_test_4", "mysql://testuser_5:testpassword5@10.0.30.235:2099/erp5_test_5", "mysql://testuser_6:testpassword6@10.0.30.235:2099/erp5_test_6", "mysql://testuser_7:testpassword7@10.0.30.235:2099/erp5_test_7", "mysql://testuser_8:testpassword8@10.0.30.235:2099/erp5_test_8", "mysql://testuser_9:testpassword9@10.0.30.235:2099/erp5_test_9", "mysql://testuser_10:testpassword10@10.0.30.235:2099/erp5_test_10", "mysql://testuser_11:testpassword11@10.0.30.235:2099/erp5_test_11"], "inituser-password": "password", "deadlock-debugger-password": "password", "port-base": 2200, "longrequest-logger-interval": -1, "memcached-url": "memcached://10.0.30.235:2013/", "smtp-url": "smtp://127.0.0.2:0/", "test-runner-enabled": true, "kumofs-url": "memcached://10.0.30.235:2003/", "inituser-login": "zope", "thread-amount": 2, "zodb-zeo": {"root": {"storage": "root", "server": "10.0.30.235:2100"}}, "id-store-interval": null, "caucase-url": "http://[::1]:8890", "test-runner-node-count": 3, "cloudooo-retry-count": "2", "mysql-url-list": ["mysql://user:insecure@10.0.30.235:2099/erp5"], "wendelin-core-zblk-fmt": "", "timerserver-interval": 1, "monitor-passwd": "password", "name": "activities", "tidstorage-ip": "", "bt5": "erp5_full_text_myisam_catalog erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_run_my_doc", "private-dev-shm": "", "developer-list": ["zope"], "use-ipv6": false, "instance-count": 4, "longrequest-logger-timeout": 1}</parameter>
 </instance>
@@ -138,7 +139,7 @@ INSERT INTO "partition15" VALUES('slappart6','slaprunner','busy','/srv/slapgrid/
   <parameter id="_">{"hosts-dict": {"erp5-cloudooo": "cloudooo.erp5.net", "erp5-smtp": "127.0.0.2", "erp5-catalog-0": "10.0.30.235", "erp5-memcached-volatile": "10.0.30.235", "erp5-memcached-persistent": "10.0.30.235"}, "test-runner-address-list": [["10.0.30.235", 2200], ["10.0.30.235", 2201], ["10.0.30.235", 2202]], "monitor-base-url": "", "zope-address-list": [["10.0.30.235:2203", 2, false], ["10.0.30.235:2204", 2, false], ["10.0.30.235:2205", 2, false], ["10.0.30.235:2206", 2, false]]}</parameter>
 </instance>
 ',NULL,'zope','zope-activities','slappart0','started',NULL);
-INSERT INTO "partition15" VALUES('slappart7','slaprunner','busy','/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg','<?xml version=''1.0'' encoding=''utf-8''?>
+INSERT INTO "partition16" VALUES('slappart7','slaprunner','busy','/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg','<?xml version=''1.0'' encoding=''utf-8''?>
 <instance>
   <parameter id="_">{"zodb-dict": {"root": {"storage-dict": {"cache-size": "20MB"}, "mount-point": "/", "type": "zeo", "cache-size": 50000}}, "site-id": "erp5", "webdav": false, "saucelabs-dict": {}, "tidstorage-port": "", "hosts-dict": {}, "hostalias-dict": {}, "large-file-threshold": "10MB", "bt5-repository-url": "/srv/slapgrid/slappart8/srv/runner/software/287375f0cba269902ba1bc50242839d7/parts/erp5/bt5 /srv/slapgrid/slappart8/srv/runner/software/287375f0cba269902ba1bc50242839d7/parts/erp5/product/ERP5/bootstrap", "test-runner-apache-url-list": ["https://10.0.30.235:2157/unit_test_0/", "https://10.0.30.235:2157/unit_test_1/", "https://10.0.30.235:2157/unit_test_2/"], "timezone": "Asia/Tokyo", "cloudooo-url": "https://cloudooo.erp5.net/", "mysql-test-url-list": ["mysql://testuser_0:testpassword0@10.0.30.235:2099/erp5_test_0", "mysql://testuser_1:testpassword1@10.0.30.235:2099/erp5_test_1", "mysql://testuser_2:testpassword2@10.0.30.235:2099/erp5_test_2", "mysql://testuser_3:testpassword3@10.0.30.235:2099/erp5_test_3", "mysql://testuser_4:testpassword4@10.0.30.235:2099/erp5_test_4", "mysql://testuser_5:testpassword5@10.0.30.235:2099/erp5_test_5", "mysql://testuser_6:testpassword6@10.0.30.235:2099/erp5_test_6", "mysql://testuser_7:testpassword7@10.0.30.235:2099/erp5_test_7", "mysql://testuser_8:testpassword8@10.0.30.235:2099/erp5_test_8", "mysql://testuser_9:testpassword9@10.0.30.235:2099/erp5_test_9", "mysql://testuser_10:testpassword10@10.0.30.235:2099/erp5_test_10", "mysql://testuser_11:testpassword11@10.0.30.235:2099/erp5_test_11"], "inituser-password": "password", "deadlock-debugger-password": "password", "port-base": 2200, "longrequest-logger-interval": -1, "memcached-url": "memcached://10.0.30.235:2013/", "smtp-url": "smtp://127.0.0.2:0/", "test-runner-enabled": true, "kumofs-url": "memcached://10.0.30.235:2003/", "inituser-login": "zope", "thread-amount": 10, "zodb-zeo": {"root": {"storage": "root", "server": "10.0.30.235:2100"}}, "id-store-interval": null, "caucase-url": "http://[::1]:8890", "test-runner-node-count": 3, "cloudooo-retry-count": "2", "mysql-url-list": ["mysql://user:insecure@10.0.30.235:2099/erp5"], "wendelin-core-zblk-fmt": "", "timerserver-interval": 1, "monitor-passwd": "password", "name": "backend", "tidstorage-ip": "", "bt5": "erp5_full_text_myisam_catalog erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_run_my_doc", "private-dev-shm": "", "developer-list": ["zope"], "use-ipv6": false, "instance-count": 2, "longrequest-logger-timeout": 1}</parameter>
 </instance>
@@ -147,7 +148,7 @@ INSERT INTO "partition15" VALUES('slappart7','slaprunner','busy','/srv/slapgrid/
   <parameter id="_">{"hosts-dict": {"erp5-cloudooo": "cloudooo.erp5.net", "erp5-smtp": "127.0.0.2", "erp5-catalog-0": "10.0.30.235", "erp5-memcached-volatile": "10.0.30.235", "erp5-memcached-persistent": "10.0.30.235"}, "test-runner-address-list": [["10.0.30.235", 2200], ["10.0.30.235", 2201], ["10.0.30.235", 2202]], "monitor-base-url": "", "zope-address-list": [["10.0.30.235:2203", 10, false], ["10.0.30.235:2204", 10, false]]}</parameter>
 </instance>
 ',NULL,'zope','zope-backend','slappart0','started',NULL);
-INSERT INTO "partition15" VALUES('slappart8','slaprunner','busy','/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg','<?xml version=''1.0'' encoding=''utf-8''?>
+INSERT INTO "partition16" VALUES('slappart8','slaprunner','busy','/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg','<?xml version=''1.0'' encoding=''utf-8''?>
 <instance>
   <parameter id="_">{"haproxy-server-check-path": "/", "apachedex-configuration": "--erp5-base +erp5 .*/VirtualHostRoot/erp5(/|\\?|$) --base +other / --skip-user-agent Zabbix --error-detail --js-embed --quiet", "backend-path-dict": {"activities": "/", "login": "/"}, "name": "balancer", "zope-family-entry-request-zope-activities-test-runner-address-list": [["10.0.30.235", 2200], ["10.0.30.235", 2201], ["10.0.30.235", 2202]], "crl-update-periodicity": "daily", "ssl-authentication-dict": {"activities": false, "login": false}, "zope-family-entry-request-zope-activities": [["10.0.30.235:2203", 2, false], ["10.0.30.235:2204", 2, false], ["10.0.30.235:2205", 2, false], ["10.0.30.235:2206", 2, false]], "zope-family-entry-request-zope-backend": [["10.0.30.235:2203", 10, false], ["10.0.30.235:2204", 10, false]], "zope-family-dict": {"activities": ["zope-family-entry-request-zope-activities"], "login": ["zope-family-entry-request-zope-backend"]}, "zope-family-entry-request-zope-backend-test-runner-address-list": [["10.0.30.235", 2200], ["10.0.30.235", 2201], ["10.0.30.235", 2202]], "ssl": {}, "caucase-url": "http://[::1]:8890", "monitor-passwd": "password", "use-ipv6": false, "apachedex-promise-threshold": 70, "tcpv4-port": 2150}</parameter>
 </instance>
@@ -156,7 +157,7 @@ INSERT INTO "partition15" VALUES('slappart8','slaprunner','busy','/srv/slapgrid/
   <parameter id="_">{"activities": "https://10.0.30.235:2155", "login-test-runner-url-list": ["https://10.0.30.235:2157/unit_test_0/", "https://10.0.30.235:2157/unit_test_1/", "https://10.0.30.235:2157/unit_test_2/"], "monitor-base-url": "", "login-v6": "https://[::1]:2159", "activities-v6": "https://[::1]:2155", "login": "https://10.0.30.235:2159", "activities-test-runner-url-list": ["https://10.0.30.235:2153/unit_test_0/", "https://10.0.30.235:2153/unit_test_1/", "https://10.0.30.235:2153/unit_test_2/"]}</parameter>
 </instance>
 ',NULL,'balancer','balancer','slappart0','started',NULL);
-INSERT INTO "partition15" VALUES('slappart9','slaprunner','busy','/srv/slapgrid/slappart8/srv/runner/project/slapos/software/seleniumrunner/software.cfg','<?xml version=''1.0'' encoding=''utf-8''?>
+INSERT INTO "partition16" VALUES('slappart9','slaprunner','busy','/srv/slapgrid/slappart8/srv/runner/project/slapos/software/seleniumrunner/software.cfg','<?xml version=''1.0'' encoding=''utf-8''?>
 <instance/>
 ','<?xml version=''1.0'' encoding=''utf-8''?>
 <instance>
@@ -164,22 +165,22 @@ INSERT INTO "partition15" VALUES('slappart9','slaprunner','busy','/srv/slapgrid/
   <parameter id="display">:123</parameter>
 </instance>
 ',NULL,'RootSoftwareInstance','seleniumrunner',NULL,'started',NULL);
-INSERT INTO "partition15" VALUES('slappart10','slaprunner','busy','/srv/slapgrid/slappart8/srv/runner/project/slapos/software/evil/software.cfg','<?xml version=''1.0'' encoding=''utf-8''?>
+INSERT INTO "partition16" VALUES('slappart10','slaprunner','busy','/srv/slapgrid/slappart8/srv/runner/project/slapos/software/evil/software.cfg','<?xml version=''1.0'' encoding=''utf-8''?>
 <instance/>','<?xml version=''1.0'' encoding=''utf-8''?>
 <instance>
   <parameter id="_">Ahah this is not json 😜 </parameter>
 </instance>
 ',NULL,'RootSoftwareInstance','evil-instance-with-_-not-json',NULL,'started',NULL);
-INSERT INTO "partition15" VALUES('slappart11','slaprunner','free',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'started',NULL);
-INSERT INTO "partition15" VALUES('slappart12','slaprunner','free',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'started',NULL);
-INSERT INTO "partition15" VALUES('slappart13','slaprunner','free',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'started',NULL);
-INSERT INTO "partition15" VALUES('slappart14','slaprunner','free',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'started',NULL);
-INSERT INTO "partition15" VALUES('slappart15','slaprunner','free',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'started',NULL);
-INSERT INTO "partition15" VALUES('slappart16','slaprunner','free',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'started',NULL);
-INSERT INTO "partition15" VALUES('slappart17','slaprunner','free',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'started',NULL);
-INSERT INTO "partition15" VALUES('slappart18','slaprunner','free',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'started',NULL);
-INSERT INTO "partition15" VALUES('slappart19','slaprunner','free',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'started',NULL);
-CREATE TABLE slave15 (
+INSERT INTO "partition16" VALUES('slappart11','slaprunner','free',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'started',NULL);
+INSERT INTO "partition16" VALUES('slappart12','slaprunner','free',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'started',NULL);
+INSERT INTO "partition16" VALUES('slappart13','slaprunner','free',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'started',NULL);
+INSERT INTO "partition16" VALUES('slappart14','slaprunner','free',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'started',NULL);
+INSERT INTO "partition16" VALUES('slappart15','slaprunner','free',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'started',NULL);
+INSERT INTO "partition16" VALUES('slappart16','slaprunner','free',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'started',NULL);
+INSERT INTO "partition16" VALUES('slappart17','slaprunner','free',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'started',NULL);
+INSERT INTO "partition16" VALUES('slappart18','slaprunner','free',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'started',NULL);
+INSERT INTO "partition16" VALUES('slappart19','slaprunner','free',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'started',NULL);
+CREATE TABLE slave16 (
   reference VARCHAR(255), -- unique slave reference
   computer_reference VARCHAR(255) DEFAULT 'slaprunner',
   connection_xml TEXT,
@@ -187,55 +188,56 @@ CREATE TABLE slave15 (
   asked_by VARCHAR(255) -- only used for debugging,
                         -- slapproxy does not support proper scope
 );
-CREATE TABLE partition_network15 (
+CREATE TABLE partition_network16 (
   partition_reference VARCHAR(255),
   computer_reference VARCHAR(255) DEFAULT 'slaprunner',
   reference VARCHAR(255),
   address VARCHAR(255),
   netmask VARCHAR(255)
 );
-INSERT INTO "partition_network15" VALUES('slappart0','slaprunner','slappart0','10.0.30.235','255.255.255.255');
-INSERT INTO "partition_network15" VALUES('slappart0','slaprunner','slappart0','::1','ffff:ffff:ffff::');
-INSERT INTO "partition_network15" VALUES('slappart1','slaprunner','slappart1','10.0.30.235','255.255.255.255');
-INSERT INTO "partition_network15" VALUES('slappart1','slaprunner','slappart1','::1','ffff:ffff:ffff::');
-INSERT INTO "partition_network15" VALUES('slappart2','slaprunner','slappart2','10.0.30.235','255.255.255.255');
-INSERT INTO "partition_network15" VALUES('slappart2','slaprunner','slappart2','::1','ffff:ffff:ffff::');
-INSERT INTO "partition_network15" VALUES('slappart3','slaprunner','slappart3','10.0.30.235','255.255.255.255');
-INSERT INTO "partition_network15" VALUES('slappart3','slaprunner','slappart3','::1','ffff:ffff:ffff::');
-INSERT INTO "partition_network15" VALUES('slappart4','slaprunner','slappart4','10.0.30.235','255.255.255.255');
-INSERT INTO "partition_network15" VALUES('slappart4','slaprunner','slappart4','::1','ffff:ffff:ffff::');
-INSERT INTO "partition_network15" VALUES('slappart5','slaprunner','slappart5','10.0.30.235','255.255.255.255');
-INSERT INTO "partition_network15" VALUES('slappart5','slaprunner','slappart5','::1','ffff:ffff:ffff::');
-INSERT INTO "partition_network15" VALUES('slappart6','slaprunner','slappart6','10.0.30.235','255.255.255.255');
-INSERT INTO "partition_network15" VALUES('slappart6','slaprunner','slappart6','::1','ffff:ffff:ffff::');
-INSERT INTO "partition_network15" VALUES('slappart7','slaprunner','slappart7','10.0.30.235','255.255.255.255');
-INSERT INTO "partition_network15" VALUES('slappart7','slaprunner','slappart7','::1','ffff:ffff:ffff::');
-INSERT INTO "partition_network15" VALUES('slappart8','slaprunner','slappart8','10.0.30.235','255.255.255.255');
-INSERT INTO "partition_network15" VALUES('slappart8','slaprunner','slappart8','::1','ffff:ffff:ffff::');
-INSERT INTO "partition_network15" VALUES('slappart9','slaprunner','slappart9','10.0.30.235','255.255.255.255');
-INSERT INTO "partition_network15" VALUES('slappart9','slaprunner','slappart9','::1','ffff:ffff:ffff::');
-INSERT INTO "partition_network15" VALUES('slappart10','slaprunner','slappart10','10.0.30.235','255.255.255.255');
-INSERT INTO "partition_network15" VALUES('slappart10','slaprunner','slappart10','::1','ffff:ffff:ffff::');
-INSERT INTO "partition_network15" VALUES('slappart11','slaprunner','slappart11','10.0.30.235','255.255.255.255');
-INSERT INTO "partition_network15" VALUES('slappart11','slaprunner','slappart11','::1','ffff:ffff:ffff::');
-INSERT INTO "partition_network15" VALUES('slappart12','slaprunner','slappart12','10.0.30.235','255.255.255.255');
-INSERT INTO "partition_network15" VALUES('slappart12','slaprunner','slappart12','::1','ffff:ffff:ffff::');
-INSERT INTO "partition_network15" VALUES('slappart13','slaprunner','slappart13','10.0.30.235','255.255.255.255');
-INSERT INTO "partition_network15" VALUES('slappart13','slaprunner','slappart13','::1','ffff:ffff:ffff::');
-INSERT INTO "partition_network15" VALUES('slappart14','slaprunner','slappart14','10.0.30.235','255.255.255.255');
-INSERT INTO "partition_network15" VALUES('slappart14','slaprunner','slappart14','::1','ffff:ffff:ffff::');
-INSERT INTO "partition_network15" VALUES('slappart15','slaprunner','slappart15','10.0.30.235','255.255.255.255');
-INSERT INTO "partition_network15" VALUES('slappart15','slaprunner','slappart15','::1','ffff:ffff:ffff::');
-INSERT INTO "partition_network15" VALUES('slappart16','slaprunner','slappart16','10.0.30.235','255.255.255.255');
-INSERT INTO "partition_network15" VALUES('slappart16','slaprunner','slappart16','::1','ffff:ffff:ffff::');
-INSERT INTO "partition_network15" VALUES('slappart17','slaprunner','slappart17','10.0.30.235','255.255.255.255');
-INSERT INTO "partition_network15" VALUES('slappart17','slaprunner','slappart17','::1','ffff:ffff:ffff::');
-INSERT INTO "partition_network15" VALUES('slappart18','slaprunner','slappart18','10.0.30.235','255.255.255.255');
-INSERT INTO "partition_network15" VALUES('slappart18','slaprunner','slappart18','::1','ffff:ffff:ffff::');
-INSERT INTO "partition_network15" VALUES('slappart19','slaprunner','slappart19','10.0.30.235','255.255.255.255');
-INSERT INTO "partition_network15" VALUES('slappart19','slaprunner','slappart19','::1','ffff:ffff:ffff::');
-CREATE TABLE forwarded_partition_request15 (
+INSERT INTO "partition_network16" VALUES('slappart0','slaprunner','slappart0','10.0.30.235','255.255.255.255');
+INSERT INTO "partition_network16" VALUES('slappart0','slaprunner','slappart0','::1','ffff:ffff:ffff::');
+INSERT INTO "partition_network16" VALUES('slappart1','slaprunner','slappart1','10.0.30.235','255.255.255.255');
+INSERT INTO "partition_network16" VALUES('slappart1','slaprunner','slappart1','::1','ffff:ffff:ffff::');
+INSERT INTO "partition_network16" VALUES('slappart2','slaprunner','slappart2','10.0.30.235','255.255.255.255');
+INSERT INTO "partition_network16" VALUES('slappart2','slaprunner','slappart2','::1','ffff:ffff:ffff::');
+INSERT INTO "partition_network16" VALUES('slappart3','slaprunner','slappart3','10.0.30.235','255.255.255.255');
+INSERT INTO "partition_network16" VALUES('slappart3','slaprunner','slappart3','::1','ffff:ffff:ffff::');
+INSERT INTO "partition_network16" VALUES('slappart4','slaprunner','slappart4','10.0.30.235','255.255.255.255');
+INSERT INTO "partition_network16" VALUES('slappart4','slaprunner','slappart4','::1','ffff:ffff:ffff::');
+INSERT INTO "partition_network16" VALUES('slappart5','slaprunner','slappart5','10.0.30.235','255.255.255.255');
+INSERT INTO "partition_network16" VALUES('slappart5','slaprunner','slappart5','::1','ffff:ffff:ffff::');
+INSERT INTO "partition_network16" VALUES('slappart6','slaprunner','slappart6','10.0.30.235','255.255.255.255');
+INSERT INTO "partition_network16" VALUES('slappart6','slaprunner','slappart6','::1','ffff:ffff:ffff::');
+INSERT INTO "partition_network16" VALUES('slappart7','slaprunner','slappart7','10.0.30.235','255.255.255.255');
+INSERT INTO "partition_network16" VALUES('slappart7','slaprunner','slappart7','::1','ffff:ffff:ffff::');
+INSERT INTO "partition_network16" VALUES('slappart8','slaprunner','slappart8','10.0.30.235','255.255.255.255');
+INSERT INTO "partition_network16" VALUES('slappart8','slaprunner','slappart8','::1','ffff:ffff:ffff::');
+INSERT INTO "partition_network16" VALUES('slappart9','slaprunner','slappart9','10.0.30.235','255.255.255.255');
+INSERT INTO "partition_network16" VALUES('slappart9','slaprunner','slappart9','::1','ffff:ffff:ffff::');
+INSERT INTO "partition_network16" VALUES('slappart10','slaprunner','slappart10','10.0.30.235','255.255.255.255');
+INSERT INTO "partition_network16" VALUES('slappart10','slaprunner','slappart10','::1','ffff:ffff:ffff::');
+INSERT INTO "partition_network16" VALUES('slappart11','slaprunner','slappart11','10.0.30.235','255.255.255.255');
+INSERT INTO "partition_network16" VALUES('slappart11','slaprunner','slappart11','::1','ffff:ffff:ffff::');
+INSERT INTO "partition_network16" VALUES('slappart12','slaprunner','slappart12','10.0.30.235','255.255.255.255');
+INSERT INTO "partition_network16" VALUES('slappart12','slaprunner','slappart12','::1','ffff:ffff:ffff::');
+INSERT INTO "partition_network16" VALUES('slappart13','slaprunner','slappart13','10.0.30.235','255.255.255.255');
+INSERT INTO "partition_network16" VALUES('slappart13','slaprunner','slappart13','::1','ffff:ffff:ffff::');
+INSERT INTO "partition_network16" VALUES('slappart14','slaprunner','slappart14','10.0.30.235','255.255.255.255');
+INSERT INTO "partition_network16" VALUES('slappart14','slaprunner','slappart14','::1','ffff:ffff:ffff::');
+INSERT INTO "partition_network16" VALUES('slappart15','slaprunner','slappart15','10.0.30.235','255.255.255.255');
+INSERT INTO "partition_network16" VALUES('slappart15','slaprunner','slappart15','::1','ffff:ffff:ffff::');
+INSERT INTO "partition_network16" VALUES('slappart16','slaprunner','slappart16','10.0.30.235','255.255.255.255');
+INSERT INTO "partition_network16" VALUES('slappart16','slaprunner','slappart16','::1','ffff:ffff:ffff::');
+INSERT INTO "partition_network16" VALUES('slappart17','slaprunner','slappart17','10.0.30.235','255.255.255.255');
+INSERT INTO "partition_network16" VALUES('slappart17','slaprunner','slappart17','::1','ffff:ffff:ffff::');
+INSERT INTO "partition_network16" VALUES('slappart18','slaprunner','slappart18','10.0.30.235','255.255.255.255');
+INSERT INTO "partition_network16" VALUES('slappart18','slaprunner','slappart18','::1','ffff:ffff:ffff::');
+INSERT INTO "partition_network16" VALUES('slappart19','slaprunner','slappart19','10.0.30.235','255.255.255.255');
+INSERT INTO "partition_network16" VALUES('slappart19','slaprunner','slappart19','::1','ffff:ffff:ffff::');
+CREATE TABLE forwarded_partition_request16 (
   partition_reference VARCHAR(255), -- a.k.a source_instance_id
-  master_url VARCHAR(255)
+  master_url VARCHAR(255),
+  CONSTRAINT uniq PRIMARY KEY (partition_reference, master_url)
 );
 COMMIT;

slapos/tests/test_slapproxy/generate_dump.sh

@@ -42,12 +42,6 @@ sqlite3 ${TMPD}/proxy.db < $DUMP_BEFORE
 
 slapos proxy start --cfg ${TMPD}/slapos.cfg &
 
-# If you are running tests locally and you want to refer to the slapos being tested,
-# you can use the test python executable in this way:
-# cd ../../..
-# python -m slapos.cli.entry proxy start --cfg ${TMPD}/slapos.cfg &
-# cd -
-
 SLAPOS_PROXY_PID=$!
 
 curl --silent --retry-connrefused --retry 3 http://127.0.0.1:${PORT}/getComputerInformation?computer_id=$COMPUTER_ID