From e9d0f7679d60ec7f469365ce0ab59ccdd4910121 Mon Sep 17 00:00:00 2001 From: Marek Isalski Date: Sun, 26 Jun 2022 19:25:50 +0100 Subject: [PATCH] neaten up comments --- includes/routeros-v7-aggregation-router/interfaces.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/routeros-v7-aggregation-router/interfaces.j2 b/includes/routeros-v7-aggregation-router/interfaces.j2 index dd9d59f..29f630f 100644 --- a/includes/routeros-v7-aggregation-router/interfaces.j2 +++ b/includes/routeros-v7-aggregation-router/interfaces.j2 @@ -1,6 +1,6 @@ -{%- macro physical_interface_comment(interface) %}{% if interface.label %}{{ interface.label|replace('"','\\"') or "-" }}: {% endif %}{{ interface.description|replace('"','\\"') or "-" }}{% if interface.connected_endpoint %} ({{ interface.connected_endpoint.name|replace('"','\\"')|replace('.voneus.net','') }}{% if interface.connected_endpoint.device.name %} @ {{ interface.connected_endpoint.device.name|replace('.voneus.net','')|replace('"','\\"') }}{% endif %}){% endif %}{% if interface.cable %} via [{{ interface.cable.label.split("/")[-1] }}]{% endif %}{% if interface.link_peer %} to [{{ interface.link_peer.label or interface.link_peer.name }}{% if interface.link_peer.device %} @ {{ interface.link_peer.device.name.split("/")[-1]|replace('"','\\"')|replace('.voneus.net','') }}]{% endif %}{% endif %}{%- endmacro %} +{%- macro physical_interface_comment(interface) %}{% if interface.label %}{{ interface.label|safe_string or "-" }}: {% endif %}{{ interface.description|safe_string or "-" }}{% if interface.connected_endpoint %} ({{ interface.connected_endpoint.name|safe_string|replace('.voneus.net','') }}{% if interface.connected_endpoint.device.name %} @ {{ interface.connected_endpoint.device.name|replace('.voneus.net','')|safe_string }}{% endif %}){% endif %}{% if interface.cable %} via [{{ interface.cable.label.split("/")[-1] }}]{% endif %}{% if interface.link_peer %} to [{{ interface.link_peer.label or interface.link_peer.name }}{% if interface.link_peer.device %} @ {{ interface.link_peer.device.name.split("/")[-1]|safe_string|replace('.voneus.net','') }}]{% endif %}{% endif %}{%- endmacro %} -{%- macro virtual_interface_comment(interface) %}{% if interface.label %}{{ interface.label|replace('"','\\"') or "-" }}: {% endif %}{{ interface.description|replace('"','\\"') or "-" }}{%- endmacro %} +{%- macro virtual_interface_comment(interface) %}{% if interface.label %}{{ interface.label|safe_string or "-" }}: {% endif %}{{ interface.description|safe_string or "-" }}{%- endmacro %} {%- macro interface_addresses(device, interface, interface_context, interface_tags, mtu=False) %} {%- for address in interface|get_addresses %} @@ -47,7 +47,7 @@ {%- endfor %} {%- set subinterface_context = subinterface.tags|get_netbox_tags_contexts|contexts_merge_last %} /interface vlan - add name="{{ subinterface.name }}" interface="{{ interface.name }}" vlan-id={% if subinterface.untagged_vlan %}{{ subinterface.untagged_vlan.vid }}{% elif unit|int %}{{ unit }}{% else %}0{% endif %} + add name="{{ subinterface.name }}" interface="{{ interface.name }}" vlan-id={% if subinterface.untagged_vlan %}{{ subinterface.untagged_vlan.vid }}{% elif unit|int %}{{ unit }}{% else %}0{% endif %} comment="{{ subinterface.description|safe_string }}" {{ interface_addresses(device, subinterface, subinterface_context, subinterface_tags) }} {%- endfor %}