matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Skip vnet-vxlan interfaces from generating networks (#5251)

Browse Source 
* Skip Vnet interface from generating networks
This commit is contained in:
Prince Sunny 2020-08-27 14:14:04 -07:00 committed by GitHub
parent b31050d60e
commit 4338d8293f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
View File

@ -1,4 +1,4 @@
{% from "common/functions.conf.j2" import get_ipv4_loopback_address, get_ipv6_loopback_address %} {% from "common/functions.conf.j2" import get_ipv4_loopback_address, get_ipv6_loopback_address, get_vnet_interfaces %}
! !
! template: bgpd/bgpd.main.conf.j2 ! template: bgpd/bgpd.main.conf.j2
! !
@ -14,14 +14,17 @@ ip prefix-list PL_LoopbackV4 permit {{ get_ipv4_loopback_address(LOOPBACK_INTERF
ipv6 prefix-list PL_LoopbackV6 permit {{ get_ipv6_loopback_address(LOOPBACK_INTERFACE, "Loopback0") | replace('/128', '/64') | ip_network }}/64 ipv6 prefix-list PL_LoopbackV6 permit {{ get_ipv6_loopback_address(LOOPBACK_INTERFACE, "Loopback0") | replace('/128', '/64') | ip_network }}/64
{% endif %} {% endif %}
! !
{% if VLAN_INTERFACE is defined %}
{% set vnet_intfs = get_vnet_interfaces(VLAN_INTERFACE) %}
{% endif %}
{% for (name, prefix) in VLAN_INTERFACE|pfx_filter %} {% for (name, prefix) in VLAN_INTERFACE|pfx_filter %}
{% if prefix | ipv4 %} {% if prefix | ipv4 and name not in vnet_intfs %}
ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq {{ loop.index * 5 }} permit {{ prefix }} ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq {{ loop.index * 5 }} permit {{ prefix }}
! !
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% for (name, prefix) in VLAN_INTERFACE|pfx_filter %} {% for (name, prefix) in VLAN_INTERFACE|pfx_filter %}
{% if prefix | ipv6 %} {% if prefix | ipv6 and name not in vnet_intfs %}
ipv6 prefix-list LOCAL_VLAN_IPV6_PREFIX seq {{ loop.index * 5 }} permit {{ prefix }} ipv6 prefix-list LOCAL_VLAN_IPV6_PREFIX seq {{ loop.index * 5 }} permit {{ prefix }}
! !
{% endif %} {% endif %}
@ -78,9 +81,9 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
! !
{% block vlan_advertisement %} {% block vlan_advertisement %}
{% for (name, prefix) in VLAN_INTERFACE|pfx_filter %} {% for (name, prefix) in VLAN_INTERFACE|pfx_filter %}
{% if prefix | ipv4 %} {% if prefix | ipv4 and name not in vnet_intfs %}
network {{ prefix }} network {{ prefix }}
{% elif prefix | ipv6 %} {% elif prefix | ipv6 and name not in vnet_intfs %}
address-family ipv6 address-family ipv6
network {{ prefix }} network {{ prefix }}
exit-address-family exit-address-family

12
dockers/docker-fpm-frr/frr/common/functions.conf.j2
View File

@ -21,3 +21,15 @@
{% endfor %} {% endfor %}
{{ L.ip }} {{ L.ip }}
{%- endmacro %} {%- endmacro %}
{% macro get_vnet_interfaces(interfaces) -%}
{% set L = namespace(intfs=[]) %}
{% set vnet_intfs = [] %}
{% for (key, metadata) in interfaces.iteritems() %}
{% if metadata.has_key("vnet_name") %}
{% set vnet_intfs = vnet_intfs.append(key) %}
{% endif %}
{% endfor %}
{% set L.intfs = vnet_intfs %}
{{ L.intfs }}
{%- endmacro %}

5
src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.json
View File

@ -11,7 +11,10 @@
}, },
"VLAN_INTERFACE": { "VLAN_INTERFACE": {
"Vlan10|10.10.10.1/24": {}, "Vlan10|10.10.10.1/24": {},
"Vlan10|fc01::1/64": {} "Vlan10|fc01::1/64": {},
"Vlan20": {"vnet_name": "Vnet1"},
"Vlan20|20.20.20.1/24": {},
"Vlan20|fd01::1/64": {}
}, },
"constants": { "constants": {
"bgp": { "bgp": {

5
src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.json
View File

@ -11,7 +11,10 @@
}, },
"VLAN_INTERFACE": { "VLAN_INTERFACE": {
"Vlan10|10.10.10.1/24": {}, "Vlan10|10.10.10.1/24": {},
"Vlan10|fc01::1/64": {} "Vlan10|fc01::1/64": {},
"Vlan20": {"vnet_name": "Vnet1"},
"Vlan20|20.20.20.1/24": {},
"Vlan20|fd01::1/64": {}
}, },
"constants": { "constants": {
"bgp": { "bgp": {