Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[sonic-cfggen] Add check to generate valid bgpconfig #440

Merged
merged 2 commits into from
Mar 27, 2017
Merged

[sonic-cfggen] Add check to generate valid bgpconfig #440

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
335dcf6
[sonic-cfggen]Add check to generate valid bgpconfig
Mar 26, 2017
9470481
Use builtin none instead of None
Mar 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions dockers/docker-fpm/bgpd.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ log facility local4
! enable password {# {{ en_passwd }} TODO: param needed #}
{% endblock system_init %}
!
{% if minigraph_bgp_asn != None %}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will the following work better for Jinja2?
{% if minigraph_bgp_asn is defined %}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm It`s defined to None :). Have no effect.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. You're right. But it's unusual to see something != None in python. Usually we write something is not None.
I don't know the right patter for Jinja2.
I found there're 'none' constant is Jinja2 templates http://jinja.pocoo.org/docs/2.9/templates/#expressions

Also I found a special function none() (see the same document).

So my concert here: I don't want to have an expression in our code which might be deprecated.

{% block bgp_init %}
!
! bgp multiple-instance
Expand All @@ -34,6 +35,7 @@ router bgp {{ minigraph_bgp_asn }}
{% endif %}
{% endfor %}
{% endblock bgp_init %}
{% endif %}
{% block vlan_advertisement %}
{% for vlan_interface in minigraph_vlan_interfaces %}
network {{ vlan_interface['subnet'] }}
Expand All @@ -57,8 +59,10 @@ router bgp {{ minigraph_bgp_asn }}
{% endfor %}
{% endblock bgp_sessions %}
!
{% if minigraph_bgp_asn != None %}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The same as above

maximum-paths 64
!
route-map ISOLATE permit 10
set as-path prepend {{ minigraph_bgp_asn }}
{% endif %}
!