Damien/arista-evpn-vxlan-clab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: use Jinja2 none instead of null and add defensive checks for optional relationships (#20)

Browse Source 
Replace all `null` literals with `none` (valid Jinja2/Python) in all three
templates. Add explicit `is defined and is not none and .node is not none`
guards before accessing nested nodes on optional GraphQL relationships, to
avoid `Undefined is not JSON serializable` errors at render time.

Also add `| default(none)` on optional scalar attributes (speed, mode,
lacp_mode, mlag_id, mtu, description, virtual_router_address,
route_distinguisher, learn_restrict, vlan_type, trunk_groups) so that
Infrahub `Undefined` values from unset optional fields are safely coerced
to JSON null rather than crashing tojson serialization.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Damien
2026-02-28 17:41:19 +01:00
parent 584a4ad5a4
commit a415de85bd
3 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
transforms/templates/vlan_yang.j2
View File

@@ -16,18 +16,18 @@
{%- set vlan_node = mapping_edge.node.vlan.node -%}
{%- set vid = vlan_node.vlan_id.value | string -%}
{%- if vid not in vlans -%}
{%- set vni_val = null -%}
{%- set vni_type_val = null -%}
{%- if vlan_node.vni and vlan_node.vni.node -%}
{%- set vni_val = none -%}
{%- set vni_type_val = none -%}
{%- if vlan_node.vni is defined and vlan_node.vni is not none and vlan_node.vni.node is not none -%}
{%- set vni_val = vlan_node.vni.node.vni.value -%}
{%- set vni_type_val = vlan_node.vni.node.vni_type.value -%}
{%- endif -%}
{%- set _ = vlans.update({vid: {
"vlan_id": vlan_node.vlan_id.value,
"name": vlan_node.name.value,
"status": vlan_node.status.value | upper,
"vlan_type": vlan_node.vlan_type.value,
"trunk_groups": vlan_node.trunk_groups.value if vlan_node.trunk_groups.value else [],
"status": vlan_node.status.value | default('') | upper,
"vlan_type": vlan_node.vlan_type.value | default(none),
"trunk_groups": vlan_node.trunk_groups.value | default([]),
"stp_enabled": vlan_node.stp_enabled.value,
"vni": vni_val,
"vni_type": vni_type_val
@@ -38,22 +38,22 @@
{#— Collect VLANs from SVI interfaces —#}
{%- for svi_edge in data.InfraInterfaceVlan.edges -%}
{%- if svi_edge.node.vlan and svi_edge.node.vlan.node -%}
{%- if svi_edge.node.vlan is defined and svi_edge.node.vlan is not none and svi_edge.node.vlan.node is not none -%}
{%- set vlan_node = svi_edge.node.vlan.node -%}
{%- set vid = vlan_node.vlan_id.value | string -%}
{%- if vid not in vlans -%}
{%- set vni_val = null -%}
{%- set vni_type_val = null -%}
{%- if vlan_node.vni and vlan_node.vni.node -%}
{%- set vni_val = none -%}
{%- set vni_type_val = none -%}
{%- if vlan_node.vni is defined and vlan_node.vni is not none and vlan_node.vni.node is not none -%}
{%- set vni_val = vlan_node.vni.node.vni.value -%}
{%- set vni_type_val = vlan_node.vni.node.vni_type.value -%}
{%- endif -%}
{%- set _ = vlans.update({vid: {
"vlan_id": vlan_node.vlan_id.value,
"name": vlan_node.name.value,
"status": vlan_node.status.value | upper,
"vlan_type": vlan_node.vlan_type.value,
"trunk_groups": vlan_node.trunk_groups.value if vlan_node.trunk_groups.value else [],
"status": vlan_node.status.value | default('') | upper,
"vlan_type": vlan_node.vlan_type.value | default(none),
"trunk_groups": vlan_node.trunk_groups.value | default([]),
"stp_enabled": vlan_node.stp_enabled.value,
"vni": vni_val,
"vni_type": vni_type_val