kvm: Fix disk wipe if many disks are used

software/kvm/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = 0d34ff81779115bf899f7bc752877b70
 
 [template-kvm]
 filename = instance-kvm.cfg.jinja2
-md5sum = 4c5d8c723b6adb96fcac9690c0c900f7
+md5sum = 9d0980144f91d10d8a5cee041f385d34
 
 [template-kvm-cluster]
 filename = instance-kvm-cluster.cfg.jinja2.in

software/kvm/instance-kvm.cfg.jinja2

@@ -1031,11 +1031,13 @@ context =
 
 {%   do part_list.append('wipe-disk-device-wrapper') -%}
 [wipe-disk-device-wrapper]
-recipe = slapos.cookbook:wrapper
-wrapper-path = ${directory:prerm}/slapos_wipe_device_disk
-command-line =
-  dd if=/dev/zero of={{disk_device_path}} bs=4096 count=500k
-
+recipe = slapos.recipe.template:jinja2
+template = inline:
+{%- for disk_device in disk_device_path.split() %}
+  dd if=/dev/zero of={{ disk_device }} bs=4096 count=500k
+{%- endfor %}
+rendered = ${directory:prerm}/slapos_wipe_device_disk
+mode = 0700
 {% endif -%}
 
 {%   do part_list.append('whitelist-firewall') -%}

software/kvm/test/test.py

@@ -127,6 +127,20 @@ class KvmMixin(object):
         if q['name'] != 'watchdog' and q['group'] != 'watchdog']))
     return running_process_info.replace(hash_value, '{hash}')
 
+  def raising_waitForInstance(self, max_retry):
+    with self.assertRaises(SlapOSNodeCommandError):
+      self.slap.waitForInstance(max_retry=max_retry)
+
+  def rerequestInstance(self, parameter_dict, state='started'):
+    software_url = self.getSoftwareURL()
+    software_type = self.getInstanceSoftwareType()
+    return self.slap.request(
+        software_release=software_url,
+        software_type=software_type,
+        partition_reference=self.default_partition_reference,
+        partition_parameter_kw=parameter_dict,
+        state=state)
+
 
 @skipUnlessKvm
 class TestInstance(InstanceTestCase, KvmMixin):
@@ -582,17 +596,7 @@ class FakeImageHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
       return
 
 
-class FakeImageServerMixin(object):
-  def rerequestInstance(self, parameter_dict, state='started'):
-    software_url = self.getSoftwareURL()
-    software_type = self.getInstanceSoftwareType()
-    return self.slap.request(
-        software_release=software_url,
-        software_type=software_type,
-        partition_reference=self.default_partition_reference,
-        partition_parameter_kw=parameter_dict,
-        state=state)
-
+class FakeImageServerMixin(KvmMixin):
   def startImageHttpServer(self):
     self.image_source_directory = tempfile.mkdtemp()
     server = SocketServer.TCPServer(
@@ -689,10 +693,6 @@ class TestBootImageUrlList(InstanceTestCase, FakeImageServerMixin):
     self.stopImageHttpServer()
     super(InstanceTestCase, self).tearDown()
 
-  def raising_waitForInstance(self, max_retry):
-    with self.assertRaises(SlapOSNodeCommandError):
-      self.slap.waitForInstance(max_retry=max_retry)
-
   def test(self):
     partition_parameter_kw = {
       self.key: self.test_input % (
@@ -1270,3 +1270,31 @@ class TestWhitelistFirewallRequestCluster(TestWhitelistFirewallRequest):
         }
       }
     })}
+
+
+@skipUnlessKvm
+class TestDiskDevicePathWipeDiskOndestroy(InstanceTestCase, KvmMixin):
+  __partition_reference__ = 'ddpwdo'
+  kvm_instance_partition_reference = 'ddpwdo0'
+
+  def test(self):
+    self.rerequestInstance({
+      'disk-device-path': '/dev/virt0 /dev/virt1',
+      'wipe-disk-ondestroy': True
+    })
+    self.slap.waitForInstance(max_retry=2)
+    instance_path = os.path.join(
+      self.slap.instance_directory, self.kvm_instance_partition_reference)
+
+    slapos_wipe_device_disk = os.path.join(
+      instance_path, 'etc', 'prerm', 'slapos_wipe_device_disk')
+
+    # check prerm script, it's trusted that prerm manager really works
+    self.assertTrue(os.path.exists(slapos_wipe_device_disk))
+    with open(slapos_wipe_device_disk) as fh:
+      self.assertEqual(
+        fh.read().strip(),
+        r"""dd if=/dev/zero of=/dev/virt0 bs=4096 count=500k
+dd if=/dev/zero of=/dev/virt1 bs=4096 count=500k"""
+      )
+    self.assertTrue(os.access(slapos_wipe_device_disk, os.X_OK))