Roll back last whitespace fix

juniper-macros.j2

@@ -1,36 +1,63 @@
-{% macro systemsection(device) %}
+{% macro systemsection(device,root_pw,users,syslog_servers,ntp_servers,tacacs_servers) %}
 system {
-    host-name {{ device['hostname'] }};
+    host-name {{ device.name }};
+{% if tacacs_servers %}
+    authentication-order [ tacplus password ];
+{% endif %}
     root-authentication {
-        encrypted-password "{{ device['config_context']['root_pw'] }}"; ## Client Higher
+        encrypted-password "{{ root_pw }}"; ## Client Higher
     }
+{% if tacacs_servers %}
+   tacplus-server {
+{% for server, details in tacacs_servers %}
+        {{ server }} {
+            port 49;
+            secret "{{ details['secret'] }}"; ## SECRET-DATA
+            source-address {{ device.primary_ip4.address.ip }};
+        }
+{% endfor %}
+   }
+{% endif %}
     login {
         class sysadmin {
             permissions [ admin clear configure control firewall-control interface interface-control network reset rollback routing routing-control snmp snmp-control trace-control view view-configuration ];
         }
-{% for user, details in device['config_context']['users']|dictsort %}
+{% for user, details in users|dictsort %}
         user {{ user }} {
             uid 200{{ loop.index }};
             class {{ details['role'] }};
+{% if details['password'] %}
             authentication {
                 encrypted-password "{{ details['password'] }}"; ## SECRET-DATA
             }
+{% endif %}
         }
 {% endfor %}
     }
     services {
+{% if device.role.name in ['Leaf','Spine'] %}
         ssh;
+{% else %}
+        ssh {
+            root-login deny;
+        }
+{% endif %}
     }
     syslog {
-{% for server in device['config_context']['syslog_servers'] %}
+{% for server in syslog_servers %}
         host {{ server }} {
             any notice;
             authorization info;
+{% if device.role.name in ['Leaf','Spine'] %}
+            match "!(.*DH_SVC_SENDMSG_FAILURE.*|.*UI_.*|.*shmlog: unable to create argtype.*|.*DEBUG: PAM_USER.*|.*DEBUG: PAM_ACTUAL_USER.*|.*SNMPD_AUTH_FAILURE.*|.*/usr/sbin/cron.*|.*jl2tpd.*|.*dfcd.*|.*l2ald.*|.*cc_mic_sfp_is_present.*|.*RMOPD_ICMP_SENDMSG_FAILURE.*|.*acx_vpls_mesh_grp_get_info.*|.*last message repeated.*|.*Refreshing mastership.*|.*hw.chassis.startup_time update.*)";
+            facility-override local6;
+{% endif %}
         }
 {% endfor %}
         file interactive-commands {
             interactive-commands any;
         }
+{% if device.role.name in ['Leaf','Spine'] %}
         file linkupdown {
             any info;
             match "LINK_DOWN|LINK_UP";
@@ -39,10 +66,11 @@ system {
             any notice;
             authorization info;
         }
+{% endif %}
     }
-{% if device['config_context']['ntp_servers']|length > 0 %}
+{% if ntp_servers|length > 0 %}
     ntp {
-{% for server in device['config_context']['ntp_servers'] %}
+{% for server in ntp_servers %}
         server {{ server }};
 {% endfor %}
     }
@@ -51,15 +79,17 @@ system {
 {%- endmacro %}
 
 
-{% macro chassissection(device) %}
+{% macro chassissection(device,breakout_ports) %}
 chassis {
+{% if device.interfaces.all()|selectattr('type','eq','lag')|list|count > 0 %}
     aggregated-devices {
         ethernet {
-            device-count {{ device['interfaces']|selectattr('type','eq','LAG')|list|count }};
+            device-count {{ device.interfaces.all()|selectattr('type','eq','lag')|list|count }};
         }
     }
-{% if device['config_context']['breakout_ports'] %}
+{% endif %}
-{% for fpc, fpcdata in device['config_context']['breakout_ports'].items() %}
+{% if breakout_ports %}
+{% for fpc, fpcdata in breakout_ports.items() %}
     fpc {{ fpc }} {
 {% for pic, picdata in fpcdata.items() %}
         pic {{ pic }} {
@@ -73,25 +103,36 @@ chassis {
     }
 {% endfor %}
 {% endif %}
+{% if device.role.name in ['Provider Core'] %}
+    forwarding-options {
+        lpm-profile;
+    }
+{% endif %}
 }
 {%- endmacro %}
 
 
-{% macro interfaceconfig(interface,rack = None) %}
+{% macro interfaceconfig(interface,rack = None) -%}
-    {{ interface['name'] }} {
+{% if not ('-' in interface.name) or interface.description or interface.lag or interface.ip_addresses.count() or interface.connected_endpoints or interface.mode or interface.tagged_vlans.all() or interface.untagged_vlan %}
-{% if interface.get('description') != '' %}
+    {{ interface.name }} {
-        description "{{ interface['description'] }}";
+{% if interface.description %}
+        description "{{ interface.description }}";
 {% endif %}
-{% if interface.get('mtu') and not interface.get('lag') %}
+{% if interface.mtu and not interface.lag %}
-        mtu {{ interface['mtu'] }};
+        mtu {{ interface.mtu }};
 {% endif %}
-{% if interface.get('lag') %}
+{% if interface.device.role.name in ['Provide Core'] %}
+        flexible-vlan-tagging;
+        native-vlan-id 1;
+        encapsulation flexible-ethernet-services;
+{% endif %}
+{% if interface.lag %}
         ether-options {
-            802.3ad {{ interface['lag']['name'] }};
+            802.3ad {{ interface.lag.name }};
         }
 {% endif %}
-{% if interface['name'].startswith('ae') %}
+{% if interface.name.startswith('ae') %}
-{% if interface['_custom_field_data']['esi_lag'] %}
+{% if interface.custom_field_data['esi_lag'] %}
         esi {
             auto-derive {
                 lacp;
@@ -102,35 +143,39 @@ chassis {
         aggregated-ether-options {
             lacp {
                 periodic fast;
-{% if interface['_custom_field_data']['system_id'] %}
+{% if interface.custom_field_data['system_id'] %}
-                system-id {{ interface['_custom_field_data']['system_id'] }};
+                system-id {{ interface.custom_field_data['system_id'] }};
-{% elif interface['_custom_field_data']['esi_lag'] %}
+{% elif interface.custom_field_data['esi_lag'] %}
-                system-id 00:00:{{ '%02d' % rack|int }}:{% if interface['name'][2:]|int < 99 %}{{ '%02d' % interface['name'][2:]|int }}{% else %}{{ '%02x' % interface['name'][2:]|int }}{% endif %}:00:01;
+                system-id 00:00:{{ '%02d' % rack|int }}:{% if interface.name[2:]|int < 99 %}{{ '%02d' % interface.name[2:]|int }}{% else %}{{ '%02x' % interface.name[2:]|int }}{% endif %}:00:01;
 {% endif %}
             }
         }
 {% endif %}
-{% if interface['ip_addresses']|length > 0 %}
+{% if interface.ip_addresses.count() > 0 %}
         unit 0 {
+{% if (interface.connected_endpoints) and (interface.connected_endpoints[0].device.role.name == 'Provider Core') %}
+            vlan-id 1;
+{% endif %}
             family inet {
-                {% if interface['ip_addresses'][0]['status']['name'] == 'Reserved' %}inactive: {% endif %}address {{ interface['ip_addresses'][0]['address'] }};
+                {% if interface.ip_addresses.first().status == 'reserved' %}inactive: {% endif %}address {{ interface.ip_addresses.first().address }};
             }
         }
 {% endif %}
-{% if interface.get('mode') is not none %}
+{% if interface.device.role.name in ['Leaf','Spine'] %}
+{% if interface.mode != '' %}
         unit 0 {
             family ethernet-switching {
-{% if interface['mode']=='ACCESS' %}
+{% if interface.mode=='ACCESS' %}
                 interface-mode access;
                 vlan {
-                    members {{ interface['untagged_vlan']['vid'] }};
+                    members {{ interface.untagged_vlan.vid }};
                 }
-{% elif interface['mode']=='TAGGED' %}
+{% elif interface.mode=='TAGGED' %}
                 interface-mode trunk;
                 vlan {
-                    members [ {% for vlan in interface['tagged_vlans'] %}{{ vlan['vid'] }} {% endfor %}];
+                    members [ {% for vlan in interface.tagged_vlans %}{{ vlan.vid }} {% endfor %}];
                 }
-{% elif interface['mode']=='TAGGED_ALL' %}
+{% elif interface.mode=='TAGGED_ALL' %}
                 interface-mode trunk;
                 vlan {
                     members [ all ];
@@ -139,52 +184,81 @@ chassis {
                 storm-control default;
             }
         }
+{% elif interface.device.role.name in ['Provider Core'] and interface.connected_endpoints %}
+{% if interface.connected_endpoints[0].device.role.name in ['Provider Edge'] %}
+{% for vlan in interface.tagged_vlans %}
+        unit {{ vlan.vid }} {
+            encapsulation vlan-vpls;
+            vlan-id {{ vlan.vid }};
+        }
+{% endfor %}
+{% endif %}
+{% endif %}
 {% endif %}
     }
+{% endif %}
 {%- endmacro %}
 
 {% macro interfacesection(device,vlans) %}
 interfaces {
+{% if device.role.name in ['Provider Core'] %}
+    interface-range core-mpls {
+{% for interface in device.interfaces.filter(cable__isnull=False) %}
+{% if interface.connected_endpoints and interface.connected_endpoints[0].device.role.name in ['Provider Core'] %}
+        member {{ interface }};
+{% endif %}
+{% endfor %}
+        unit 0 {
+            family inet;
+            family mpls;
+        }
+    }
+{% endif %}
 {# Physical interfaces should be sorted by FPC/PIC/Port value - that's a challenge to do in Jinja so we cheat for now by putting the xe- interfaces first. This won't work for all devices! #}
-{% for interface in device['interfaces'] if interface['name'].startswith('xe-') %}
+{% for interface in device.interfaces.filter(name__contains='-')|j2_natsort(attribute="name") %}
+{{- interfaceconfig(interface) }}
+{% endfor %}
+{% for interface in device.interfaces.filter(name__startswith='ae') %}
+{{ interfaceconfig(interface,device.rack.name[5:]) }}
+{% endfor %}
+{% for interface in device.interfaces.filter(name__exact='em0') %}
 {{ interfaceconfig(interface) }}
 {% endfor %}
-{% for interface in device['interfaces'] if interface['name'].startswith('et-') %}
+{% for interface in device.interfaces.filter(name__startswith='irb') %}
-{{ interfaceconfig(interface) }}
-{% endfor %}
-{% for interface in device['interfaces'] if interface['name'].startswith('ae') %}
-{{ interfaceconfig(interface,device['rack']['name'][5:]) }}
-{% endfor %}
-{% for interface in device['interfaces'] if interface['name']=='em0' %}
-{{ interfaceconfig(interface) }}
-{% endfor %}
-{% for interface in device['interfaces'] if interface['name'].startswith('irb') %}
 {% if loop.first %}
     irb {
 {% endif %}
-        unit {{ interface['name'][4:] }} {
+        unit {{ interface.name[4:] }} {
-            description "{{ interface['description'] }}";
+            description "{{ interface.description }}";
             family inet {
-                {% if interface['ip_addresses'][0]['status']['name'] == 'Reserved' %}inactive: {% endif %}address {{ interface['ip_addresses'][0]['address'] }};
+                {% if interface.ip_addresses.first().status == 'reserved' %}inactive: {% endif %}address {{ interface.ip_addresses.first().address }};
             }
         }
 {% if loop.last %}
     }
 {% endif %}
 {% endfor %}
-{% for interface in device['interfaces'] if interface['name'].startswith('lo') %}
+{% for interface in device.interfaces.filter(name__startswith='lo') %}
 {{ interfaceconfig(interface) }}
 {% endfor %}
 }
 {%- endmacro %}
 
-{% macro snmpsection(rack, config_context) %}
+{% macro snmpsection(device, snmp) %}
 snmp {
-    location "Domicilium Datacentre {{ rack['name'] }}";
+{% if device.rack and device.rack.site %}
-    contact "{{ config_context['snmp']['contact'] }}";
+    location "{{ device.rack.site.name }} Rack {{ device.rack.name }}";
-    community {{ config_context['snmp']['community'] }} {
+{% elif device.rack and device.site %}
+    location "{{ device.site.name }} Rack {{ device.rack.name }}";
+{% elif device.site %}
+    location "{{ device.site.name }}"
+{% elif device.rack %}
+    location "{{ device.rack.name }}"
+{% endif %}
+    contact "{{ snmp['contact'] }}";
+    community {{ snmp['community'] }} {
         authorization read-only;
-{% for client in config_context['snmp']['clients'] %}
+{% for client in snmp['clients'] %}
 {% if loop.first %}
         clients {
 {% endif %}
@@ -197,13 +271,43 @@ snmp {
 }
 {%- endmacro %}
 
-{% macro routingoptionssection(primary_ip4, config_context) %}
+{% macro forwardingoptionssection(device) %}
+forwarding-options {
+    hash-key {
+        family inet {
+            layer-4;
+        }
+        family mpls {
+            label-1;
+            label-2;
+            payload {
+                ip {
+                    port-data;
+                }
+            }
+        }
+    }
+    family inet {
+        filter {
+            input protect_RE;
+        }
+    }
+}
+{%- endmacro %}
+
+{% macro routingoptionssection(device, overlay_as = None, gateway = None, routes = None) %}
 routing-options {
-    router-id {{ primary_ip4['address'][:-3] }};
+{% if device.primary_ip4 %}
-    autonomous-system {{ config_context['overlay_as'] }};
+    router-id {{ device.primary_ip4.address.ip }};
-{% if config_context['gateway'] %}
+{% endif %}
+{% if overlay_as %}
+    autonomous-system {{ overlay_as }};
+{% endif %}
+{% if gateway or routes %}
     static {
-        route 0.0.0.0/0 next-hop {{ config_context['gateway'] }};
+{% if gateway %}
+        route 0.0.0.0/0 next-hop {{ gateway }};
+{% endif %}
     }
 {% endif %}
     forwarding-table {
@@ -229,8 +333,8 @@ routing-options {
                 multiplier 3;
                 session-mode automatic;
             }
-{% for dst_switch in spines if dst_switch['primary_ip4']['address'] != device['primary_ip4']['address'] %}
+{% for dst_switch in spines if dst_switch.primary_ip4.address != device.primary_ip4.address %}
-            neighbor {{ dst_switch['primary_ip4']['address'][:-3] }};
+            neighbor {{ dst_switch.primary_ip4.address.ip }};
 {% endfor %}
         }
 {%- endmacro %}
@@ -238,12 +342,12 @@ routing-options {
 {% macro bgpoverlaygroup(device) %}
         group OVERLAY {
             type internal;
-            local-address {{ device['primary_ip4']['address'][:-3] }};
+            local-address {{ device.primary_ip4.address.ip }};
             family evpn {
                 signaling;
             }
-{% if device['device_role']['name'] == 'Spine' %}
+{% if device.role.name == 'Spine' %}
-            cluster {{ device['primary_ip4']['address'][:-3] }};
+            cluster {{ device.primary_ip4.address.ip }};
             multipath;
 {% endif %}
             bfd-liveness-detection {
@@ -251,8 +355,8 @@ routing-options {
                 multiplier 3;
                 session-mode automatic;
             }
-{% for dst_switch in device['peering_interfaces'] %}
+{% for interface in device.interfaces.filter(cable__isnull=False) %}
-            neighbor {{ dst_switch['cable_peer_interface']['device']['primary_ip4']['address'][:-3] }};
+            neighbor {{ interface.connected_endpoints[0].device.primary_ip4.address.ip }};
 {% endfor %}
         }
 {%- endmacro %}
@@ -267,13 +371,13 @@ routing-options {
                 unicast;
             }
             export BGP_LOOPBACK0;
-            local-as {{ device['config_context']['underlay_as'] }};
+            local-as {{ device.local_context_data['underlay_as'] }};
             multipath {
                 multiple-as;
             }
-{% for dst_switch in device['peering_interfaces'] %}
+{% for interface in device.interfaces.filter(cable__isnull=False) %}
-            neighbor {{ dst_switch['cable_peer_interface']['ip_addresses'][0]['address'][:-3] }} {
+            neighbor {{ interface.connected_endpoints[0].ip_addresses.first().address.ip }} {
-                peer-as {{ dst_switch['cable_peer_interface']['device']['local_context_data']['underlay_as'] }};
+                peer-as {{ interface.connected_endpoints[0].device.local_context_data['underlay_as'] }};
             }
 {% endfor %}
         }
@@ -282,18 +386,14 @@ routing-options {
 
 
 {% macro bgpsection(device,spines) %}
-{% if device['device_role']['name'] in ['Spine','Lab-Spine'] %}
+{% if device.role.name in ['Spine','Lab-Spine'] %}
 {% set role='Spine' %}
 {% set other_role='Leaf' %}
 {% else %}
 {% set role='Leaf' %}
 {% set other_role='Spine' %}
 {% endif %}
-{% if device['device_role']['name'] == 'Lab-Spine' %}
+{% set name=device.name %}
-{% set name=device['name'][4:] %}
-{% else %}
-{% set name=device['name'] %}
-{% endif %}
     bgp {
 {{ bgpoverlaygroup(device) }}
 {% if role == 'Spine' %}
@@ -305,34 +405,32 @@ routing-options {
 {%- endmacro %}
 
 
-{% macro sflowsection(device) %}
+{% macro sflowsection(sflow) %}
-{% if device['config_context']['sflow'] %}
     sflow {
-{% for collector in device['config_context']['sflow']['collectors'] %}
+{% for collector in sflow['collectors'] %}
         collector {{ collector }};
 {% endfor %}
-{% for interface in device['config_context']['sflow']['interfaces'] %}
+{% for interface in sflow['interfaces'] %}
         interfaces {{ interface }}.0;
 {% endfor %}
     }
-{% endif %}
 {%- endmacro %}
 
 
 {% macro vlanssection(vlans,device) %}
 vlans {
 {# This next line selects all of the VLANs which are configured on this device #}
-{% for vlan in vlans if (device['interfaces']|selectattr('untagged_vlan.vid','equalto',vlan)|list|count or interfaces|map(attribute='tagged_vlans')|sum(start=[])|selectattr('vid','equalto',vlan)|list|count) or device['interfaces']|selectattr('name', 'equalto', 'irb.'+vlan['vid']|string)|list|count %}
+{% for vlan in vlans if (device.interfaces.all()|selectattr('untagged_vlan.vid','equalto',vlan)|list|count or interfaces|map(attribute='tagged_vlans')|sum(start=[])|selectattr('vid','equalto',vlan)|list|count) or device.interfaces.all()|selectattr('name', 'equalto', 'irb.'+vlan.vid|string)|list|count %}
-    vl{{ vlan['vid'] }} {
+    vl{{ vlan.vid }} {
-{% if vlan['name'] != '' %}
+{% if vlan.name != '' %}
-        description "{{ vlan['name'] }}";
+        description "{{ vlan.name }}";
 {% endif %}
-        vlan-id {{ vlan['vid'] }};
+        vlan-id {{ vlan.vid }};
-{% if device['interfaces']|selectattr('name', 'equalto', 'irb.'+vlan['vid']|string)|list|count %}
+{% if device.interfaces.all()|selectattr('name', 'equalto', 'irb.'+vlan.vid|string)|list|count %}
-        l3-interface irb.{{vlan['vid']}};
+        l3-interface irb.{{vlan.vid}};
 {% endif %}
         vxlan {
-            vni {{ vlan['vid'] }};
+            vni {{ vlan.vid }};
         }
     }
 {% endfor %}

juniper-vxlan.j2

@@ -1,12 +1,11 @@
-{% set device=({'hostname':hostname,'device_role':device_role,'primary_ip4':primary_ip4,'rack':rack,'interfaces':interfaces,'peering_interfaces':peering_interfaces,'config_context':config_context}) %}
 {% import "juniper-macros.j2" as junos %}
-{{ junos.systemsection(device) }}
+{{ junos.systemsection(device,root_pw,users,syslog_servers,ntp_servers) }}
-{% if device_role['name'] == 'Leaf' %}
+{% if device.role.name == 'Leaf' %}
-{{ junos.chassissection(device) }}
+{{ junos.chassissection(device,breakout_ports) }}
 {% endif %}
-{{ junos.interfacesection(device,tenant['vlans']) }}
+{{ junos.interfacesection(device,ipam.VLAN.objects.filter(tenant=device.tenant)) }}
-{{ junos.snmpsection(rack, config_context) }}
+{{ junos.snmpsection(device, snmp) }}
-{% if device_role['name'] == 'Leaf' %}
+{% if device.role.name == 'Leaf' %}
 forwarding-options {
     storm-control-profiles default {
         all;
@@ -18,7 +17,7 @@ policy-options {
         term TERM1 {
             from {
                 protocol direct;
-                route-filter {{ primary_ip4['address'] }} exact;
+                route-filter {{ device.primary_ip4.address }} exact;
             }
             then accept;
         }
@@ -29,28 +28,32 @@ policy-options {
         }
     }
 }
-{{ junos.routingoptionssection(primary_ip4, config_context) }}
+{{ junos.routingoptionssection(device, overlay_as, gateway) }}
 protocols {
-{{ junos.bgpsection(device,tenant['spines']) }}
+{% if device.role.name in ['Leaf','Spine'] %}
-{% if device_role['name'] == 'Leaf' %}
+{{ junos.bgpsection(device,dcim.Device.objects.filter(tenant=device.tenant,role__name='Spine')) }}
+{% if device.role.name == 'Leaf' %}
     evpn {
         encapsulation vxlan;
         extended-vni-list all;
     }
+{% endif %}
 {% endif %}
     lldp {
         interface all;
     }
-{{ junos.sflowsection(device) }}
+{% if sflow %}
+{{ junos.sflowsection(sflow) }}
+{% endif %}
 }
-{% if device_role['name'] == 'Leaf' %}
+{% if device.role.name == 'Leaf' %}
 switch-options {
     vtep-source-interface lo0.0;
-    route-distinguisher {{ primary_ip4['address'][:-3] }}:1;
+    route-distinguisher {{ device.primary_ip4.address.ip }}:1;
     vrf-target {
         target:64512:1111;
         auto;
     }
 }
-{{ junos.vlanssection(tenant['vlans'], device) }}
+{{ junos.vlanssection(ipam.VLAN.objects.filter(tenant=device.tenant), device) }}
 {% endif %}

junos-leaf.j2

@@ -1 +0,0 @@
-juniper-vxlan.j2

junos-spine.j2

@@ -1 +0,0 @@
-juniper-vxlan.j2