From e3ec2b031dd12aa1dcd72770ec4b151596f91390 Mon Sep 17 00:00:00 2001 From: Pedja Tomanic Date: Fri, 21 Jun 2019 19:44:36 +0200 Subject: [PATCH 1/6] Fixed redundant local-as config for Junos --- src/netom/templates/netom0/junos-0/bgp/neighbors.j2 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/netom/templates/netom0/junos-0/bgp/neighbors.j2 b/src/netom/templates/netom0/junos-0/bgp/neighbors.j2 index 7d10315..36737f3 100644 --- a/src/netom/templates/netom0/junos-0/bgp/neighbors.j2 +++ b/src/netom/templates/netom0/junos-0/bgp/neighbors.j2 @@ -1,11 +1,16 @@ +{% set printed_localas = false %} {% for name, group in peer_groups.items() %} group {{ name }} { + type {{ peer_type }}; {% for peer in group %} {% if peer.local_address %} local-address {{ peer.local_address }}; {% endif %} -{% if peer.local_as %} +{% if printed_localas == false %} +{% if peer.local_as %} local-as {{ peer.local_as }}; +{% set printed_localas = true %} +{% endif %} {% endif %} {% if peer.enabled == False %} inactive: neighbor {{ peer.neighbor_address }} { @@ -37,4 +42,4 @@ group {{ name }} { } {% endfor %} } -{% endfor %} \ No newline at end of file +{% endfor %} From b776edc588885cd51add60f7f4b4e64ee5556f8a Mon Sep 17 00:00:00 2001 From: Pedja Tomanic Date: Fri, 21 Jun 2019 20:31:22 +0200 Subject: [PATCH 2/6] Fixed redundant local-as config for Junos --- src/netom/templates/netom0/junos-0/bgp/neighbors.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/netom/templates/netom0/junos-0/bgp/neighbors.j2 b/src/netom/templates/netom0/junos-0/bgp/neighbors.j2 index 36737f3..7437419 100644 --- a/src/netom/templates/netom0/junos-0/bgp/neighbors.j2 +++ b/src/netom/templates/netom0/junos-0/bgp/neighbors.j2 @@ -1,4 +1,4 @@ -{% set printed_localas = false %} +{% set printed_localas = { 'flag': false } %} {% for name, group in peer_groups.items() %} group {{ name }} { type {{ peer_type }}; @@ -6,10 +6,10 @@ group {{ name }} { {% if peer.local_address %} local-address {{ peer.local_address }}; {% endif %} -{% if printed_localas == false %} +{% if printed_localas.flag == false %} {% if peer.local_as %} local-as {{ peer.local_as }}; -{% set printed_localas = true %} +{% if printed_localas.update({ 'flag': true }) %}{% endif %} {% endif %} {% endif %} {% if peer.enabled == False %} From d0c0bc88c80d83d26866dcb32f95325af62cf7fc Mon Sep 17 00:00:00 2001 From: Pedja Tomanic Date: Fri, 21 Jun 2019 20:55:05 +0200 Subject: [PATCH 3/6] Updated redundant local-as logic --- src/netom/templates/netom0/junos-0/bgp/neighbors.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/netom/templates/netom0/junos-0/bgp/neighbors.j2 b/src/netom/templates/netom0/junos-0/bgp/neighbors.j2 index 7437419..ebb6dd9 100644 --- a/src/netom/templates/netom0/junos-0/bgp/neighbors.j2 +++ b/src/netom/templates/netom0/junos-0/bgp/neighbors.j2 @@ -6,8 +6,8 @@ group {{ name }} { {% if peer.local_address %} local-address {{ peer.local_address }}; {% endif %} -{% if printed_localas.flag == false %} -{% if peer.local_as %} +{% if peer.local_as %} +{% if printed_localas.flag == false %} local-as {{ peer.local_as }}; {% if printed_localas.update({ 'flag': true }) %}{% endif %} {% endif %} From 6ffe8c87cafb17f68dc71701be0a16fd295ee594 Mon Sep 17 00:00:00 2001 From: Pedja Tomanic Date: Fri, 21 Jun 2019 20:58:26 +0200 Subject: [PATCH 4/6] Fixed redundant local-as for Junos set --- .../templates/netom0/junos-set-0/bgp/neighbors.j2 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/netom/templates/netom0/junos-set-0/bgp/neighbors.j2 b/src/netom/templates/netom0/junos-set-0/bgp/neighbors.j2 index 3f2cae7..26abfba 100644 --- a/src/netom/templates/netom0/junos-set-0/bgp/neighbors.j2 +++ b/src/netom/templates/netom0/junos-set-0/bgp/neighbors.j2 @@ -1,6 +1,13 @@ +{% set printed_localas = { 'flag': false } %} {% for name, group in peer_groups.items() %} {% for peer in group %} set protocols bgp group {{ peer.peer_group }} type {{ peer.peer_type }} +{% if peer.local_as %} +{% if printed_localas.flag == false %} +set protocols bgp group {{ peer.peer_group }} local-as {{ peer.local_as }} +{% if printed_localas.update({ 'flag': true }) %}{% endif %} +{% endif %} +{% endif %} set protocols bgp group {{ peer.peer_group }} neighbor {{ peer.neighbor_address }} peer-as {{ peer.peer_as }} {% if peer.description %} set protocols bgp group {{ peer.peer_group }} neighbor {{ peer.neighbor_address }} description "{{ peer.description }}" @@ -8,9 +15,6 @@ set protocols bgp group {{ peer.peer_group }} neighbor {{ peer.neighbor_address {% if peer.local_address %} set protocols bgp group {{ peer.peer_group }} neighbor {{ peer.neighbor_address }} local-address {{ peer.local_address }} {% endif %} -{% if peer.local_as %}} -set protocols bgp group {{ peer.peer_group }} neighbor {{ peer.neighbor_address }} local-as {{ peer.local_as }} -{% endif %} {% if peer.import_policy %} set protocols bgp group {{ peer.peer_group }} neighbor {{ peer.neighbor_address }} import {{ peer.import_policy }} {% endif %} @@ -27,4 +31,4 @@ set protocols bgp group {{ peer.peer_group }} neighbor {{ peer.neighbor_address deactivate protocols bgp group {{ peer.peer_group }} neighbor {{ peer.neighbor_address }} {% endif %} {% endfor %} -{% endfor %} \ No newline at end of file +{% endfor %} From 65859ad828a6e43d160e04ad8b3df97da52e3831 Mon Sep 17 00:00:00 2001 From: Pedja Tomanic Date: Fri, 21 Jun 2019 21:01:29 +0200 Subject: [PATCH 5/6] Fixed redundant peer-type for Junos set --- src/netom/templates/netom0/junos-set-0/bgp/neighbors.j2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/netom/templates/netom0/junos-set-0/bgp/neighbors.j2 b/src/netom/templates/netom0/junos-set-0/bgp/neighbors.j2 index 26abfba..ac4c59c 100644 --- a/src/netom/templates/netom0/junos-set-0/bgp/neighbors.j2 +++ b/src/netom/templates/netom0/junos-set-0/bgp/neighbors.j2 @@ -1,7 +1,11 @@ {% set printed_localas = { 'flag': false } %} +{% set printed_type = { 'flag': false } %} {% for name, group in peer_groups.items() %} {% for peer in group %} +{% if printed_type.flag == false %} set protocols bgp group {{ peer.peer_group }} type {{ peer.peer_type }} +{% if printed_type.update({ 'flag': true }) %}{% endif %} +{% endif %} {% if peer.local_as %} {% if printed_localas.flag == false %} set protocols bgp group {{ peer.peer_group }} local-as {{ peer.local_as }} From 2f6e95d618700d261e84ef5e47ad50e01773e1fa Mon Sep 17 00:00:00 2001 From: Pedja Tomanic Date: Fri, 21 Jun 2019 21:09:07 +0200 Subject: [PATCH 6/6] Changed getting BGP group name for Junos set --- .../netom0/junos-set-0/bgp/neighbors.j2 | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/netom/templates/netom0/junos-set-0/bgp/neighbors.j2 b/src/netom/templates/netom0/junos-set-0/bgp/neighbors.j2 index ac4c59c..787ec22 100644 --- a/src/netom/templates/netom0/junos-set-0/bgp/neighbors.j2 +++ b/src/netom/templates/netom0/junos-set-0/bgp/neighbors.j2 @@ -3,36 +3,36 @@ {% for name, group in peer_groups.items() %} {% for peer in group %} {% if printed_type.flag == false %} -set protocols bgp group {{ peer.peer_group }} type {{ peer.peer_type }} +set protocols bgp group {{ name }} type {{ peer.peer_type }} {% if printed_type.update({ 'flag': true }) %}{% endif %} {% endif %} {% if peer.local_as %} {% if printed_localas.flag == false %} -set protocols bgp group {{ peer.peer_group }} local-as {{ peer.local_as }} +set protocols bgp group {{ name }} local-as {{ peer.local_as }} {% if printed_localas.update({ 'flag': true }) %}{% endif %} {% endif %} {% endif %} -set protocols bgp group {{ peer.peer_group }} neighbor {{ peer.neighbor_address }} peer-as {{ peer.peer_as }} +set protocols bgp group {{ name }} neighbor {{ peer.neighbor_address }} peer-as {{ peer.peer_as }} {% if peer.description %} -set protocols bgp group {{ peer.peer_group }} neighbor {{ peer.neighbor_address }} description "{{ peer.description }}" +set protocols bgp group {{ name }} neighbor {{ peer.neighbor_address }} description "{{ peer.description }}" {% endif %} {% if peer.local_address %} -set protocols bgp group {{ peer.peer_group }} neighbor {{ peer.neighbor_address }} local-address {{ peer.local_address }} +set protocols bgp group {{ name }} neighbor {{ peer.neighbor_address }} local-address {{ peer.local_address }} {% endif %} {% if peer.import_policy %} -set protocols bgp group {{ peer.peer_group }} neighbor {{ peer.neighbor_address }} import {{ peer.import_policy }} +set protocols bgp group {{ name }} neighbor {{ peer.neighbor_address }} import {{ peer.import_policy }} {% endif %} {% if peer.export_policy %} -set protocols bgp group {{ peer.peer_group }} neighbor {{ peer.neighbor_address }} export {{ peer.export_policy }} +set protocols bgp group {{ name }} neighbor {{ peer.neighbor_address }} export {{ peer.export_policy }} {% endif %} {% if peer.auth_password %} -set protocols bgp group {{ peer.peer_group }} neighbor {{ peer.neighbor_address }} authentication-key {{ peer.auth_password }} +set protocols bgp group {{ name }} neighbor {{ peer.neighbor_address }} authentication-key {{ peer.auth_password }} {% endif %} {% if peer.max_prefixes %} -set protocols bgp group {{ peer.peer_group }} neighbor {{ peer.neighbor_address }} family inet unicast prefix-limit maximum {{ peer.max_prefixes }} +set protocols bgp group {{ name }} neighbor {{ peer.neighbor_address }} family inet unicast prefix-limit maximum {{ peer.max_prefixes }} {% endif %} {% if peer.enabled == False %} -deactivate protocols bgp group {{ peer.peer_group }} neighbor {{ peer.neighbor_address }} +deactivate protocols bgp group {{ name }} neighbor {{ peer.neighbor_address }} {% endif %} {% endfor %} {% endfor %}