From 3549dbe4d8dfdc1b7bcb39aa795ba147c86f5066 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 14 Jan 2021 18:55:09 +0100
Subject: bgp: T2174: remove invalid "no bgp default ipv4-unicast" from default
 config

---
 data/templates/frr/bgp.frr.tmpl | 2 --
 src/conf_mode/protocols_bgp.py  | 1 -
 2 files changed, 3 deletions(-)

diff --git a/data/templates/frr/bgp.frr.tmpl b/data/templates/frr/bgp.frr.tmpl
index af04ee1ce..74a9b8c30 100644
--- a/data/templates/frr/bgp.frr.tmpl
+++ b/data/templates/frr/bgp.frr.tmpl
@@ -133,7 +133,6 @@
 {% endmacro %}
 !
 router bgp {{ asn }}
- no bgp default ipv4-unicast
 {% if address_family is defined and address_family is not none %}
 {%   for af in address_family %}
  !
@@ -241,7 +240,6 @@ router bgp {{ asn }}
  bgp default local-preference {{ parameters.default.local_pref }}
 {%     endif %}
 {%     if parameters.default.no_ipv4_unicast is defined %}
-{#     We use this is parameter as default in template (5-th string) #}
  no bgp default ipv4-unicast
 {%     endif %}
 {%   endif %}
diff --git a/src/conf_mode/protocols_bgp.py b/src/conf_mode/protocols_bgp.py
index e77b1fc28..de0148b2f 100755
--- a/src/conf_mode/protocols_bgp.py
+++ b/src/conf_mode/protocols_bgp.py
@@ -63,7 +63,6 @@ def verify(bgp):
             # bail out early if there is no neighbor or peer-group statement
             # this also saves one indention level
             if neighbor not in asn_config:
-                print(f'no {neighbor} found in config')
                 continue
 
             for peer, peer_config in asn_config[neighbor].items():
-- 
cgit v1.2.3