juniper-macros.j2

@@ -1,6 +1,6 @@
-{% macro systemsection(device,name) %}
+{% macro systemsection(device) %}
 system {
-    host-name {{ name }};
+    host-name {{ device['name'] }};
     root-authentication {
         encrypted-password "{{ device['config_context']['root_pw'] }}"; ## Client Higher
     }
@@ -305,20 +305,6 @@ routing-options {
 {%- endmacro %}
 
 
-{% macro sflowsection(device) %}
-{% if device['config_context']['sflow'] %}
-    sflow {
-{% for collector in device['config_context']['sflow']['collectors'] %}
-        collector {{ collector }};
-{% endfor %}
-{% for interface in device['config_context']['sflow']['interfaces'] %}
-        interface {{ interface }};
-{% endfor %}
-    }
-{% endif %}
-{%- endmacro %}
-
-
 {% macro vlanssection(vlans,device) %}
 vlans {
 {# This next line selects all of the VLANs which are configured on this device #}

juniper-vxlan.j2

@@ -1,6 +1,6 @@
 {% set device=({'name':name,'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,name) }}
+{{ junos.systemsection(device) }}
 {% if device_role['name'] == 'Leaf' %}
 {{ junos.chassissection(device) }}
 {% endif %}
@@ -41,7 +41,6 @@ protocols {
     lldp {
         interface all;
     }
-{{ junos.sflowsection(device) }}
 }
 {% if device_role['name'] == 'Leaf' %}
 switch-options {