firewall: T3900: fix migration and smoketests

Commit 770edf016838523 ("T3900: T6394: extend functionalities in firewall")
changed the position in the CLI for conntrack timeout. This lead to failing
smoketests because of a regression in the migrator.

1 files changed, 3 insertions, 2 deletions

diff --git a/src/migration-scripts/firewall/15-to-16 b/src/migration-scripts/firewall/15-to-16
index 7c8d38fe6..28df1256e 100755
--- a/src/migration-scripts/firewall/15-to-16
+++ b/src/migration-scripts/firewall/15-to-16
@@ -42,8 +42,9 @@ if not config.exists(conntrack_base):
 
 for protocol in ['icmp', 'tcp', 'udp', 'other']:
     if config.exists(conntrack_base + [protocol]):
-        if not config.exists(firewall_base):
+        if not config.exists(firewall_base + ['timeout']):
             config.set(firewall_base + ['timeout'])
+
         config.copy(conntrack_base + [protocol], firewall_base + ['timeout', protocol])
         config.delete(conntrack_base + [protocol])
 
@@ -52,4 +53,4 @@ try:
         f.write(config.to_string())
 except OSError as e:
     print("Failed to save the modified config: {}".format(e))
-    exit(1)
\ No newline at end of file
+    exit(1)