Implement Software Destruction in slapos proxy

Slapos proxy was not really deleting the software, just removing it from its database but not telling the node that requester requested deletion.

As a result, node was not destroying the software and leaving the software folder around.

These changes are about telling the node that requester wanted destruction of software, so that node really delete the folder.

/reviewed-on nexedi/slapos.core!76

slapos/proxy/schema.sql

---version:11
+--version:12
 CREATE TABLE IF NOT EXISTS software%(version)s (
   url VARCHAR(255),
   computer_reference VARCHAR(255) DEFAULT '%(computer)s',
+  requested_state VARCHAR(255) DEFAULT 'available',
   CONSTRAINT uniq PRIMARY KEY (url, computer_reference)
 );
 

slapos/proxy/views.py

@@ -222,8 +222,11 @@ def getFullComputerInformation():
   slap_computer = Computer(computer_id)
   slap_computer._software_release_list = []
   for sr in execute_db('software', 'select * from %s WHERE computer_reference=?', [computer_id]):
-    slap_computer._software_release_list.append(SoftwareRelease(
-      software_release=sr['url'], computer_guid=computer_id))
+    software_release = SoftwareRelease(
+        software_release=sr['url'],
+        computer_guid=computer_id)
+    software_release._requested_state = sr['requested_state']
+    slap_computer._software_release_list.append(software_release)
   slap_computer._computer_partition_list = []
   for partition in execute_db('partition', 'SELECT * FROM %s WHERE computer_reference=?', [computer_id]):
     slap_computer._computer_partition_list.append(partitiondict2partition(
@@ -251,6 +254,14 @@ def setComputerPartitionConnectionXml():
 def buildingSoftwareRelease():
   return 'Ignored'
 
+@app.route('/destroyedSoftwareRelease', methods=['POST'])
+def destroyedSoftwareRelease():
+  execute_db(
+    'software',
+    'DELETE FROM %s WHERE url = ? and computer_reference=? ',
+    [request.form['url'], request.form['computer_id']])
+  return 'OK'
+
 @app.route('/availableSoftwareRelease', methods=['POST'])
 def availableSoftwareRelease():
   return 'Ignored'
@@ -316,12 +327,16 @@ def registerComputerPartition():
 def supplySupply():
   url = request.form['url']
   computer_id = request.form['computer_id']
-  if request.form['state'] == 'destroyed':
-    execute_db('software', 'DELETE FROM %s WHERE url = ? AND computer_reference=?',
-               [url, computer_id])
-  else:
-    execute_db('software', 'INSERT OR REPLACE INTO %s VALUES(?, ?)', [url, computer_id])
-  return '%r added' % url
+  state = request.form['state']
+  if state not in ('available', 'destroyed'):
+    raise ValueError("Wrong state %s" % state)
+
+  execute_db(
+    'software',
+    'INSERT OR REPLACE INTO %s VALUES(?, ?, ?)',
+    [url, computer_id, state])
+
+  return 'Supplied %r to be %s' % (url, state)
 
 
 @app.route('/requestComputerPartition', methods=['POST'])

slapos/slap/slap.py

@@ -120,7 +120,7 @@ class SoftwareRelease(SlapDocument):
   Contains Software Release information
   """
 
-  def __init__(self, software_release=None, computer_guid=None, **kw):
+  def __init__(self, software_release=None, computer_guid=None, requested_state='available', **kw):
     """
     Makes easy initialisation of class parameters
 

slapos/tests/cli.py

@@ -97,7 +97,7 @@ class TestCliProxyShow(CliMixin):
     self.conf.logger = self.logger
 
     # load database
-    schema = bytes2str(pkg_resources.resource_string('slapos.tests.slapproxy', 'database_dump_version_11.sql'))
+    schema = bytes2str(pkg_resources.resource_string('slapos.tests.slapproxy', 'database_dump_version_current.sql'))
     db = sqlite_connect(self.db_file.name)
     db.cursor().executescript(schema)
     db.commit()
@@ -123,7 +123,7 @@ class TestCliProxyShow(CliMixin):
 
     # installed softwares are listed
     logger.info.assert_any_call(
-        '      /srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg          slaprunner     287375f0cba269902ba1bc50242839d7 ' )
+        '      /srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg         available        slaprunner     287375f0cba269902ba1bc50242839d7 ' )
 
     # instance parameters are listed
     # _ parameter is json formatted