proxy: remove no longer existing partitions on updateConfiguration

Calling computer.updateConfiguration should remove previously defined
partitions that are no longer part of the configuration.

slapos/proxy/views.py

@@ -350,11 +350,14 @@ def loadComputerConfigurationFromXML():
   computer_dict = loads(xml.encode('utf-8'))
   execute_db('computer', 'INSERT OR REPLACE INTO %s values(:reference, :address, :netmask)',
              computer_dict)
+
+  # remove references to old partitions.
+  execute_db('partition', 'DELETE FROM %s WHERE computer_reference = :reference', computer_dict)
+  execute_db('partition_network', 'DELETE FROM %s WHERE computer_reference = :reference', computer_dict)
+
   for partition in computer_dict['partition_list']:
     partition['computer_reference'] = computer_dict['reference']
     execute_db('partition', 'INSERT OR IGNORE INTO %s (reference, computer_reference) values(:reference, :computer_reference)', partition)
-    execute_db('partition_network', 'DELETE FROM %s WHERE partition_reference = ? AND computer_reference = ?',
-               [partition['reference'], partition['computer_reference']])
     for address in partition['address_list']:
       address['reference'] = partition['tap']['name']
       address['partition_reference'] = partition['reference']

slapos/tests/test_slapproxy.py

@@ -160,6 +160,47 @@ database_uri = %(tempdir)s/lib/proxy.db
     views.is_schema_already_executed = False
 
 
+class TestLoadComputerConfiguration(BasicMixin, unittest.TestCase):
+  """tests /loadComputerConfigurationFromXML the endpoint for format
+  """
+  def test_loadComputerConfigurationFromXML_remove_partitions(self):
+    computer_dict = {
+        'reference': self.computer_id,
+        'address': '12.34.56.78',
+        'netmask': '255.255.255.255',
+        'partition_list': [
+            {
+                'reference': 'slappart1',
+                'address_list': [
+                    {
+                        'addr': '1.2.3.4',
+                        'netmask': '255.255.255.255'
+                    },
+                ],
+                'tap': {'name': 'tap0'},
+            }
+        ],
+    }
+    rv = self.app.post('/loadComputerConfigurationFromXML', data={
+        'computer_id': self.computer_id,
+        'xml': dumps(computer_dict),
+    })
+    self.assertEqual(rv._status_code, 200)
+    # call again with different partition reference, old partition will be removed
+    # and a new partition will be used.
+    computer_dict['partition_list'][0]['reference'] = 'something else'
+    rv = self.app.post('/loadComputerConfigurationFromXML', data={
+        'computer_id': self.computer_id,
+        'xml': dumps(computer_dict),
+    })
+    self.assertEqual(rv._status_code, 200)
+    computer = loads(
+        self.app.get('/getFullComputerInformation', query_string={'computer_id': self.computer_id}).data)
+    self.assertEqual(
+        ['something else'],
+        [p.getId() for p in computer._computer_partition_list])
+
+
 class TestInformation(BasicMixin, unittest.TestCase):
   """
   Test Basic response of slapproxy

[Jérome Perrin]

@Nicolas @tomo @jm @luke

this was too brutal, if we look at how slapos format does, this method should not delete existing partitions.

Instead of:

1. delete all partitions
2. create the one passed in computer_dict['partition_list']

we should probably do something like:

1. delete all partitions except the ones passed in computer_dict['partition_list']
2. create or update the one passed in computer_dict['partition_list']

[Jérome Perrin]

I don't really have time to work on this today, but I feel guilty :)

Here's a non regression test: jerome/slapos.core@df5fb21e

[Nicolas Wavrant]

I wrote a fix and submitted here : !159 (merged)

I'll try to run it with @jerome 's test (but first I need to set up an environment where I can run slapos.core tests).

Please check it and comment if something seems bad to you.