The '!' symbol in frr is just a separator/comment and doesn't do anything. We usually add the '!' and the start of a block, so we remove it after the start block.
Signed-off-by: Gabriel Goller <[email protected]> --- src/PVE/Network/SDN/Frr.pm | 1 - src/test/zones/evpn/advertise_subnets/expected_controller_config | 1 - .../evpn/disable_arp_nd_suppression/expected_controller_config | 1 - src/test/zones/evpn/ebgp/expected_controller_config | 1 - src/test/zones/evpn/ebgp_loopback/expected_controller_config | 1 - src/test/zones/evpn/exitnode/expected_controller_config | 1 - .../zones/evpn/exitnode_local_routing/expected_controller_config | 1 - src/test/zones/evpn/exitnode_primary/expected_controller_config | 1 - src/test/zones/evpn/exitnode_snat/expected_controller_config | 1 - src/test/zones/evpn/exitnodenullroute/expected_controller_config | 1 - src/test/zones/evpn/ipv4/expected_controller_config | 1 - src/test/zones/evpn/ipv4ipv6/expected_controller_config | 1 - src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config | 1 - src/test/zones/evpn/ipv6/expected_controller_config | 1 - src/test/zones/evpn/ipv6underlay/expected_controller_config | 1 - src/test/zones/evpn/isis/expected_controller_config | 1 - src/test/zones/evpn/isis_loopback/expected_controller_config | 1 - src/test/zones/evpn/isis_standalone/expected_controller_config | 1 - src/test/zones/evpn/multipath_relax/expected_controller_config | 1 - src/test/zones/evpn/multiplezones/expected_controller_config | 1 - src/test/zones/evpn/openfabric_fabric/expected_controller_config | 1 - src/test/zones/evpn/ospf_fabric/expected_controller_config | 1 - src/test/zones/evpn/rt_import/expected_controller_config | 1 - src/test/zones/evpn/vxlanport/expected_controller_config | 1 - 24 files changed, 24 deletions(-) diff --git a/src/PVE/Network/SDN/Frr.pm b/src/PVE/Network/SDN/Frr.pm index 6d5f43084412..9f81369c079b 100644 --- a/src/PVE/Network/SDN/Frr.pm +++ b/src/PVE/Network/SDN/Frr.pm @@ -230,7 +230,6 @@ sub raw_config_to_string { "hostname $nodename", "log syslog informational", "service integrated-vtysh-config", - "!", ); push @final_config, @$raw_config; diff --git a/src/test/zones/evpn/advertise_subnets/expected_controller_config b/src/test/zones/evpn/advertise_subnets/expected_controller_config index 10a601eb8d09..1b6145601b08 100644 --- a/src/test/zones/evpn/advertise_subnets/expected_controller_config +++ b/src/test/zones/evpn/advertise_subnets/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config b/src/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config index d67552a9ed6b..9ee41a9cd637 100644 --- a/src/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config +++ b/src/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/ebgp/expected_controller_config b/src/test/zones/evpn/ebgp/expected_controller_config index ad9753919e6f..f9472b314b3e 100644 --- a/src/test/zones/evpn/ebgp/expected_controller_config +++ b/src/test/zones/evpn/ebgp/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/ebgp_loopback/expected_controller_config b/src/test/zones/evpn/ebgp_loopback/expected_controller_config index 22f1b10fa906..38f62d06540c 100644 --- a/src/test/zones/evpn/ebgp_loopback/expected_controller_config +++ b/src/test/zones/evpn/ebgp_loopback/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/exitnode/expected_controller_config b/src/test/zones/evpn/exitnode/expected_controller_config index 160a0a0528ff..cc3ae9c4b3ae 100644 --- a/src/test/zones/evpn/exitnode/expected_controller_config +++ b/src/test/zones/evpn/exitnode/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/exitnode_local_routing/expected_controller_config b/src/test/zones/evpn/exitnode_local_routing/expected_controller_config index 50f226b51e98..8dc8c6b044c9 100644 --- a/src/test/zones/evpn/exitnode_local_routing/expected_controller_config +++ b/src/test/zones/evpn/exitnode_local_routing/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/exitnode_primary/expected_controller_config b/src/test/zones/evpn/exitnode_primary/expected_controller_config index 1397160af3d1..f11e3ba0258e 100644 --- a/src/test/zones/evpn/exitnode_primary/expected_controller_config +++ b/src/test/zones/evpn/exitnode_primary/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/exitnode_snat/expected_controller_config b/src/test/zones/evpn/exitnode_snat/expected_controller_config index 160a0a0528ff..cc3ae9c4b3ae 100644 --- a/src/test/zones/evpn/exitnode_snat/expected_controller_config +++ b/src/test/zones/evpn/exitnode_snat/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/exitnodenullroute/expected_controller_config b/src/test/zones/evpn/exitnodenullroute/expected_controller_config index 781e6e21a8e9..3e95d77b7984 100644 --- a/src/test/zones/evpn/exitnodenullroute/expected_controller_config +++ b/src/test/zones/evpn/exitnodenullroute/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 ip route 10.0.0.0/24 null0 diff --git a/src/test/zones/evpn/ipv4/expected_controller_config b/src/test/zones/evpn/ipv4/expected_controller_config index d67552a9ed6b..9ee41a9cd637 100644 --- a/src/test/zones/evpn/ipv4/expected_controller_config +++ b/src/test/zones/evpn/ipv4/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/ipv4ipv6/expected_controller_config b/src/test/zones/evpn/ipv4ipv6/expected_controller_config index d67552a9ed6b..9ee41a9cd637 100644 --- a/src/test/zones/evpn/ipv4ipv6/expected_controller_config +++ b/src/test/zones/evpn/ipv4ipv6/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config b/src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config index d67552a9ed6b..9ee41a9cd637 100644 --- a/src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config +++ b/src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/ipv6/expected_controller_config b/src/test/zones/evpn/ipv6/expected_controller_config index d67552a9ed6b..9ee41a9cd637 100644 --- a/src/test/zones/evpn/ipv6/expected_controller_config +++ b/src/test/zones/evpn/ipv6/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/ipv6underlay/expected_controller_config b/src/test/zones/evpn/ipv6underlay/expected_controller_config index 6f453be54723..ddc5338f02b0 100644 --- a/src/test/zones/evpn/ipv6underlay/expected_controller_config +++ b/src/test/zones/evpn/ipv6underlay/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/isis/expected_controller_config b/src/test/zones/evpn/isis/expected_controller_config index e47afaa6d556..2361879e0cc2 100644 --- a/src/test/zones/evpn/isis/expected_controller_config +++ b/src/test/zones/evpn/isis/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/isis_loopback/expected_controller_config b/src/test/zones/evpn/isis_loopback/expected_controller_config index 487ca86b8d8b..f4a6e353377b 100644 --- a/src/test/zones/evpn/isis_loopback/expected_controller_config +++ b/src/test/zones/evpn/isis_loopback/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/isis_standalone/expected_controller_config b/src/test/zones/evpn/isis_standalone/expected_controller_config index 92a6f3843646..2cf4dcbf359a 100644 --- a/src/test/zones/evpn/isis_standalone/expected_controller_config +++ b/src/test/zones/evpn/isis_standalone/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! interface eth0 ip router isis isis1 ! diff --git a/src/test/zones/evpn/multipath_relax/expected_controller_config b/src/test/zones/evpn/multipath_relax/expected_controller_config index 4a4617bdd1d5..783d05cf24d5 100644 --- a/src/test/zones/evpn/multipath_relax/expected_controller_config +++ b/src/test/zones/evpn/multipath_relax/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/multiplezones/expected_controller_config b/src/test/zones/evpn/multiplezones/expected_controller_config index ab3d85142315..6096221b2eef 100644 --- a/src/test/zones/evpn/multiplezones/expected_controller_config +++ b/src/test/zones/evpn/multiplezones/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/openfabric_fabric/expected_controller_config b/src/test/zones/evpn/openfabric_fabric/expected_controller_config index 397655e34722..a96adc329c5f 100644 --- a/src/test/zones/evpn/openfabric_fabric/expected_controller_config +++ b/src/test/zones/evpn/openfabric_fabric/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_evpn vni 100 exit-vrf diff --git a/src/test/zones/evpn/ospf_fabric/expected_controller_config b/src/test/zones/evpn/ospf_fabric/expected_controller_config index dd0e9d8a5573..bb9313244d53 100644 --- a/src/test/zones/evpn/ospf_fabric/expected_controller_config +++ b/src/test/zones/evpn/ospf_fabric/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_evpn vni 100 exit-vrf diff --git a/src/test/zones/evpn/rt_import/expected_controller_config b/src/test/zones/evpn/rt_import/expected_controller_config index c5b65724b9b6..367aaf3d2671 100644 --- a/src/test/zones/evpn/rt_import/expected_controller_config +++ b/src/test/zones/evpn/rt_import/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/vxlanport/expected_controller_config b/src/test/zones/evpn/vxlanport/expected_controller_config index d67552a9ed6b..9ee41a9cd637 100644 --- a/src/test/zones/evpn/vxlanport/expected_controller_config +++ b/src/test/zones/evpn/vxlanport/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf -- 2.47.3
