software/kvm: Support "wrong" nat-rules in cluster

software/kvm/buildout.hash.cfg

@@ -23,7 +23,7 @@ md5sum = 23493c541efef97ac5fe435114910b8e
 
 [template-kvm-cluster]
 filename = instance-kvm-cluster.cfg.jinja2.in
-md5sum = bdf8549a76ec61e125d51a05e611e004
+md5sum = 28a00c28a972f42627849b25c2792abb
 
 [template-kvm-resilient]
 filename = instance-kvm-resilient.cfg.jinja2

software/kvm/instance-kvm-cluster.cfg.jinja2.in

@@ -94,7 +94,15 @@ config-auto-ballooning = {{ dumps(kvm_parameter_dict.get('auto-ballooning', True
 {{ setconfig('disk-cache', kvm_parameter_dict.get('disk-cache', '')) }}
 {{ setconfig('disk-device-path', kvm_parameter_dict.get('disk-device-path', '')) }}
 
-{% set nat_rules_list = kvm_parameter_dict.get('nat-rules', []) -%}
+{# Note: dirty_nat_rules_list is cleaned up later, as the UI generated by JSON schema #}
+{#       gives freedom to the user to enter values separated by spaces and newlines #}
+{#       but on UI level they are only supported when separated by newlines, which #}
+{#       leads to cryptic failures of the cluster #}
+{% set dirty_nat_rules_list = kvm_parameter_dict.get('nat-rules', []) -%}
+{% set nat_rules_list = [] %}
+{% for nat_rule in dirty_nat_rules_list %}
+{%   do nat_rules_list.extend(nat_rule.split()) %}
+{% endfor %}
 {{ setconfig('nat-rules', nat_rules_list | join(' ')) }}
 config-publish-nat-url = True
 config-use-nat = {{ dumps(use_nat) }}

software/kvm/test/test.py

@@ -993,3 +993,9 @@ class TestNatRulesKvmCluster(InstanceTestCase):
     self.assertIn(
       'hostfwd=tcp:%s:10300-:300' % (self._ipv4_address,),
       host_fwd_entry)
+
+
+@skipUnlessKvm
+class TestNatRulesKvmClusterComplex(TestNatRulesKvmCluster):
+  __partition_reference__ = 'nrkcc'
+  nat_rules = ["100", "200 300"]