From 561e4edf389b369e416e51bde096c84766673cf2 Mon Sep 17 00:00:00 2001 From: Daniel Ankers Date: Wed, 3 Jul 2024 16:45:07 +0100 Subject: [PATCH] Add namespace to tags --- juniper-macros.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/juniper-macros.j2 b/juniper-macros.j2 index 260006a..2229180 100644 --- a/juniper-macros.j2 +++ b/juniper-macros.j2 @@ -120,7 +120,7 @@ chassis { {% if interface.mtu and not interface.lag %} mtu {{ interface.mtu }}; {% endif %} -{% if interface.tags.filter(name__in=['vpls-core','vpls-edge']).count() %} +{% if interface.tags.filter(name__in=['role:vpls-core','role:vpls-edge']).count() %} flexible-vlan-tagging; native-vlan-id 1; encapsulation flexible-ethernet-services; @@ -152,7 +152,7 @@ chassis { {% endif %} {% if interface.ip_addresses.count() > 0 %} unit 0 { -{% if interface.tags.filter(name__in=['vpls-core']).count() %} +{% if interface.tags.filter(name__in=['role:vpls-core']).count() %} vlan-id 1; {% endif %} family inet { @@ -184,7 +184,7 @@ chassis { } } {% elif interface.device.role.name in ['Provider Core'] %} -{% if interface.tags.filter(name__in=['vpls-edge']).count() %} +{% if interface.tags.filter(name__in=['role:vpls-edge']).count() %} {% for vlan in interface.tagged_vlans %} unit {{ vlan.vid }} { encapsulation vlan-vpls; @@ -201,7 +201,7 @@ chassis { interfaces { {% if device.role.name in ['Provider Core'] %} interface-range core-mpls { -{% for interface in device.interfaces.filter(tags__name='vpls-core') %} +{% for interface in device.interfaces.filter(tags__name='role:vpls-core') %} member {{ interface }}; {% endfor %} unit 0 {