kvm: Adapt boot-image-url for "kvm: Fix kvm-resilient usage"

software/kvm/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = e6d5c7bb627b4f1d3e7c99721b7c58fe
 
 [template-kvm]
 filename = instance-kvm.cfg.jinja2
-md5sum = ee6ce6d6b34bc9eb84139152770cb422
+md5sum = 5e41dfce45f7be1c5e849cc7ffcc555b
 
 [template-kvm-cluster]
 filename = instance-kvm-cluster.cfg.jinja2.in

software/kvm/instance-kvm.cfg.jinja2

+{# Workaround empty parameter passing #}
+{# In case of resilient '' is converted to 'None' string, but with slapproxy '' becomes None #}
+{% for k, v in slapparameter_dict.items() %}
+{%   if v == 'None' or v is none %}
+{%     do slapparameter_dict.__setitem__(k, '') %}
+{%   endif %}
+{% endfor %}
 {% set additional_frontend = slapparameter_dict.get('frontend-additional-instance-guid') %}
 {% set enable_http = str(slapparameter_dict.get('enable-http-server', False)).lower() == 'true' -%}
 {% set use_tap = str(slapparameter_dict.get('use-tap', True)).lower() == 'true' -%}
@@ -92,22 +99,14 @@ config-state = empty
 config-url = ${monitor-base:base-url}/private/boot-image-url-select/${:filename} with username ${monitor-publish-parameters:monitor-user} and password ${monitor-publish-parameters:monitor-password}
 
 [boot-image-url-select-source-config]
-# generates configuration of the image from the user parameter
-# special "magic" is used, to properly support multiline boot-image-url-select
-# but in the same time correctly generate the configuration file
 recipe = slapos.recipe.template:jinja2
 template = inline:
-{#- Do special trick to support boot-image-url-select being None, if key is present with value "" #}
 {%- raw %}
-  {%- set boot_image_url_select = slap_parameter.get('boot-image-url-select') or '' %}
-  {%- if boot_image_url_select == 'None' %}
-  {#- That's insane protection, is it 'None' because of type = array? #}
-  {%-   set boot_image_url_select = '' %}
-  {%- endif %}
   {{ boot_image_url_select }}
 {% endraw -%}
+boot-image-url-select = {{ dumps(slapparameter_dict['boot-image-url-select']) }}
 context =
-  section slap_parameter slap-parameter
+  key boot_image_url_select :boot-image-url-select
 rendered = ${directory:etc}/boot-image-url-select.json
 
 [boot-image-url-select-processed-config]
@@ -199,17 +198,14 @@ config-state = empty
 config-url = ${monitor-base:base-url}/private/boot-image-url-list/${:filename} with username ${monitor-publish-parameters:monitor-user} and password ${monitor-publish-parameters:monitor-password}
 
 [boot-image-url-list-source-config]
-# generates configuration of the image from the user parameter
-# special "magic" is used, to properly support multiline boot-image-url-list
-# but in the same time correctly generate the configuration file
 recipe = slapos.recipe.template:jinja2
 template = inline:
-{#- Do special trick to support boot-image-url-list being None, if key is present with value "" #}
 {%- raw %}
-  {{ slap_parameter.get('boot-image-url-list') or '' }}
+  {{ boot_image_url_list }}
 {% endraw -%}
+boot-image-url-list = {{ dumps(slapparameter_dict['boot-image-url-list']) }}
 context =
-  section slap_parameter slap-parameter
+  key boot_image_url_list :boot-image-url-list
 rendered = ${directory:etc}/boot-image-url-list.conf
 
 [boot-image-url-list-processed-config]

software/kvm/test/test.py

@@ -566,6 +566,7 @@ class TestInstanceNbdServer(InstanceTestCase):
 @skipUnlessKvm
 class TestBootImageUrlList(InstanceTestCase):
   __partition_reference__ = 'biul'
+  kvm_instance_partition_reference = 'biul0'
 
   # variations
   key = 'boot-image-url-list'
@@ -642,8 +643,10 @@ class TestBootImageUrlList(InstanceTestCase):
     self.rerequestInstance(partition_parameter_kw)
     self.slap.waitForInstance(max_retry=10)
     # check that image is correctly downloaded and linked
+    kvm_instance_partition = os.path.join(
+      self.slap.instance_directory, self.kvm_instance_partition_reference)
     image_repository = os.path.join(
-      self.computer_partition_root_path, 'srv', self.image_directory)
+      kvm_instance_partition, 'srv', self.image_directory)
     image = os.path.join(image_repository, self.fake_image_md5sum)
     image_link = os.path.join(image_repository, 'image_001')
     self.assertTrue(os.path.exists(image))
@@ -675,7 +678,7 @@ class TestBootImageUrlList(InstanceTestCase):
           if entry.startswith('file') and 'media=cdrom' in entry:
             # do cleanups
             entry = entry.replace(software_root, '')
-            entry = entry.replace(self.computer_partition_root_path, '')
+            entry = entry.replace(kvm_instance_partition, '')
             running_image_list.append(entry)
       return running_image_list
 
@@ -691,7 +694,7 @@ class TestBootImageUrlList(InstanceTestCase):
     self.rerequestInstance(partition_parameter_kw, state='stopped')
     self.slap.waitForInstance(max_retry=1)
     self.rerequestInstance(partition_parameter_kw, state='started')
-    self.slap.waitForInstance(max_retry=1)
+    self.slap.waitForInstance(max_retry=3)  # giving chance to settle
 
     # now the image is available in the kvm, and its above default image
     self.assertEqual(
@@ -706,7 +709,8 @@ class TestBootImageUrlList(InstanceTestCase):
 
     # cleanup of images works, also asserts that configuration changes are
     # reflected
-    self.rerequestInstance({self.key: ''})
+    partition_parameter_kw[self.key] = ''
+    self.rerequestInstance(partition_parameter_kw)
     self.slap.waitForInstance(max_retry=2)
     self.assertEqual(
       os.listdir(image_repository),
@@ -718,7 +722,7 @@ class TestBootImageUrlList(InstanceTestCase):
     self.rerequestInstance(partition_parameter_kw, state='stopped')
     self.slap.waitForInstance(max_retry=1)
     self.rerequestInstance(partition_parameter_kw, state='started')
-    self.slap.waitForInstance(max_retry=1)
+    self.slap.waitForInstance(max_retry=3)
 
     # again only default image is available in the running process
     self.assertEqual(
@@ -728,12 +732,15 @@ class TestBootImageUrlList(InstanceTestCase):
     )
 
   def assertPromiseFails(self, promise):
+    partition_directory = os.path.join(
+      self.slap.instance_directory,
+      self.kvm_instance_partition_reference)
     monitor_run_promise = os.path.join(
-      self.computer_partition_root_path, 'software_release', 'bin',
+      partition_directory, 'software_release', 'bin',
       'monitor.runpromise'
     )
     monitor_configuration = os.path.join(
-      self.computer_partition_root_path, 'etc', 'monitor.conf')
+      partition_directory, 'etc', 'monitor.conf')
 
     self.assertNotEqual(
       0,
@@ -786,9 +793,19 @@ class TestBootImageUrlList(InstanceTestCase):
     self.assertPromiseFails(self.config_state_promise)
 
 
+@skipIfPython3
+@skipUnlessKvm
+class TestBootImageUrlListResilient(TestBootImageUrlList):
+  kvm_instance_partition_reference = 'biul2'
+  @classmethod
+  def getInstanceSoftwareType(cls):
+    return 'kvm-resilient'
+
+
 @skipUnlessKvm
 class TestBootImageUrlSelect(TestBootImageUrlList):
   __partition_reference__ = 'bius'
+  kvm_instance_partition_reference = 'bius0'
 
   # variations
   key = 'boot-image-url-select'
@@ -832,7 +849,8 @@ class TestBootImageUrlSelect(TestBootImageUrlList):
     for image_directory in [
       'boot-image-url-list-repository', 'boot-image-url-select-repository']:
       image_repository = os.path.join(
-        self.computer_partition_root_path, 'srv', image_directory)
+        self.slap.instance_directory, self.kvm_instance_partition_reference,
+        'srv', image_directory)
       image = os.path.join(image_repository, self.fake_image_md5sum)
       image_link = os.path.join(image_repository, 'image_001')
       self.assertTrue(os.path.exists(image))
@@ -913,6 +931,15 @@ class TestBootImageUrlSelect(TestBootImageUrlList):
     )
 
 
+@skipIfPython3
+@skipUnlessKvm
+class TestBootImageUrlSelectResilient(TestBootImageUrlSelect):
+  kvm_instance_partition_reference = 'bius2'
+  @classmethod
+  def getInstanceSoftwareType(cls):
+    return 'kvm-resilient'
+
+
 @skipUnlessKvm
 class TestBootImageUrlListKvmCluster(InstanceTestCase):
   __partition_reference__ = 'biulkc'