Merge pull request #2830 from vyos/mergify/bp/sagitta/pr-2829

ospf: T5936: when migrating passive interfaces set_tag() must be set (backport #2829)

2 files changed, 66 insertions, 33 deletions

diff --git a/smoketest/configs/ospf-small b/smoketest/configs/ospf-small
index b3002b1af..c55627b77 100644
--- a/smoketest/configs/ospf-small
+++ b/smoketest/configs/ospf-small
@@ -1,13 +1,63 @@
 interfaces {
     dummy dum0 {
-        address 172.18.254.201/32
+        address 172.18.254.200/32
     }
     ethernet eth0 {
         duplex auto
         smp-affinity auto
         speed auto
         vif 201 {
-            address 172.18.201.10/24
+            address 172.18.201.9/24
+            ip {
+                ospf {
+                    authentication {
+                        md5 {
+                            key-id 10 {
+                                md5-key OSPFVyOSNET
+                            }
+                        }
+                    }
+                    dead-interval 40
+                    hello-interval 10
+                    priority 1
+                    retransmit-interval 5
+                    transmit-delay 1
+                }
+            }
+            ipv6 {
+                ospfv3 {
+                    bfd
+                    cost 40
+                }
+            }
+        }
+        vif 202 {
+            address 172.18.202.9/24
+            ip {
+                ospf {
+                    authentication {
+                        md5 {
+                            key-id 10 {
+                                md5-key OSPFVyOSNET
+                            }
+                        }
+                    }
+                    dead-interval 40
+                    hello-interval 10
+                    priority 1
+                    retransmit-interval 5
+                    transmit-delay 1
+                }
+            }
+            ipv6 {
+                ospfv3 {
+                    bfd
+                    cost 40
+                }
+            }
+        }
+        vif 203 {
+            address 172.18.203.9/24
             ip {
                 ospf {
                     authentication {
@@ -51,48 +101,31 @@ protocols {
     ospf {
         area 0 {
             network 172.18.201.0/24
-            network 172.18.254.201/32
+            network 172.18.202.0/24
+            network 172.18.203.0/24
+            network 172.18.254.200/32
         }
         log-adjacency-changes {
         }
         parameters {
             abr-type cisco
-            router-id 172.18.254.201
+            router-id 172.18.254.200
         }
         passive-interface default
         passive-interface-exclude eth0.201
+        passive-interface-exclude eth0.202
+        passive-interface-exclude eth0.203
     }
     ospfv3 {
         area 0.0.0.0 {
-            interface eth0
+            interface eth0.201
+            interface eth0.202
+            interface eth0.203
             interface eth1
-            interface eth2
-        }
-    }
-    static {
-        route 0.0.0.0/0 {
-            next-hop 172.18.201.254 {
-                distance 10
-            }
         }
     }
 }
 service {
-    lldp {
-        interface all {
-        }
-        snmp {
-            enable
-        }
-    }
-    snmp {
-        community public {
-            authorization ro
-            network 172.16.100.0/24
-        }
-        contact "VyOS maintainers and contributors <maintainers@vyos.io>"
-        location "Jenkins"
-    }
     ssh {
         disable-host-validation
         port 22
@@ -120,11 +153,9 @@ system {
     }
     name-server 172.16.254.30
     ntp {
-        server 0.pool.ntp.org {
-        }
-        server 1.pool.ntp.org {
+        server time1.vyos.net {
         }
-        server 2.pool.ntp.org {
+        server time2.vyos.net {
         }
     }
     sysctl {
diff --git a/src/migration-scripts/ospf/0-to-1 b/src/migration-scripts/ospf/0-to-1
index 8f02acada..a6cb9feb8 100755
--- a/src/migration-scripts/ospf/0-to-1
+++ b/src/migration-scripts/ospf/0-to-1
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2021 VyOS maintainers and contributors
+# Copyright (C) 2021-2024 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -28,6 +28,7 @@ def ospf_passive_migration(config, ospf_base):
                     default = True
                     continue
                 config.set(ospf_base + ['interface', interface, 'passive'])
+                config.set_tag(ospf_base + ['interface'])
 
             config.delete(ospf_base + ['passive-interface'])
             config.set(ospf_base + ['passive-interface'], value='default')
@@ -35,6 +36,7 @@ def ospf_passive_migration(config, ospf_base):
         if config.exists(ospf_base + ['passive-interface-exclude']):
             for interface in config.return_values(ospf_base + ['passive-interface-exclude']):
                 config.set(ospf_base + ['interface', interface, 'passive', 'disable'])
+                config.set_tag(ospf_base + ['interface'])
             config.delete(ospf_base + ['passive-interface-exclude'])
 
 if len(argv) < 2: