[bgp]: Fix isolate/unisolate command for ipv6 peers (#3183)

* Fix isolate/unisolate command for ipv6 peers
sonic-net · Jul 18, 2019 · 7af5469 · 7af5469
1 parent 6e37e23
commit 7af5469
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 0 deletions.
diff --git a/dockers/docker-fpm-frr/isolate.j2 b/dockers/docker-fpm-frr/isolate.j2
@@ -10,7 +10,13 @@ exit $?
 configure terminal
   router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
 {% for neighbor_addr in BGP_NEIGHBOR %}
+{% if neighbor_addr | ipv4 %}
     neighbor {{ neighbor_addr }} route-map ISOLATE out
+{% else %}
+  address-family ipv6
+    neighbor {{ neighbor_addr }} route-map ISOLATE out
+  exit-address-family
+{% endif %}
 {% endfor %}
   exit
 exit

diff --git a/dockers/docker-fpm-frr/unisolate.j2 b/dockers/docker-fpm-frr/unisolate.j2
@@ -10,7 +10,13 @@ exit $?
 configure terminal
   router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
 {% for neighbor_ip in BGP_NEIGHBOR %}
+{% if neighbor_ip | ipv4 %}
     no neighbor {{ neighbor_ip }} route-map ISOLATE out
+{% else %}
+  address-family ipv6
+    no neighbor {{ neighbor_ip }} route-map ISOLATE out
+  exit-address-family
+{% endif %}
 {% endfor %}
   exit
 exit

diff --git a/dockers/docker-fpm-quagga/isolate.j2 b/dockers/docker-fpm-quagga/isolate.j2
@@ -10,7 +10,13 @@ exit $?
 configure terminal
   router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
 {% for neighbor_addr in BGP_NEIGHBOR %}
+{% if neighbor_addr | ipv4 %}
     neighbor {{ neighbor_addr }} route-map ISOLATE out
+{% else %}
+  address-family ipv6
+    neighbor {{ neighbor_addr }} route-map ISOLATE out
+  exit-address-family
+{% endif %}
 {% endfor %}
   exit
 exit

diff --git a/dockers/docker-fpm-quagga/unisolate.j2 b/dockers/docker-fpm-quagga/unisolate.j2
@@ -10,7 +10,13 @@ exit $?
 configure terminal
   router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
 {% for neighbor_ip in BGP_NEIGHBOR %}
+{% if neighbor_ip | ipv4 %}
     no neighbor {{ neighbor_ip }} route-map ISOLATE out
+{% else %}
+  address-family ipv6
+    no neighbor {{ neighbor_ip }} route-map ISOLATE out
+  exit-address-family
+{% endif %}
 {% endfor %}
   exit
 exit