Merge branch 'fix-sonic-config-interface-null' into fix-sonic-undefin…

…ed-port-values
metal-stack · Nov 8, 2024 · 046500f · 046500f
2 parents 740264e + 9d9879b
commit 046500f
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/partition/roles/sonic/templates/metal.yaml.j2 b/partition/roles/sonic/templates/metal.yaml.j2
@@ -70,8 +70,13 @@ MGMT_VRF_CONFIG:
   vrf_global:
     mgmtVrfEnabled: "{{ sonic_mgmt_vrf | lower }}"
 {% if sonic_ports_dict|length > 0 %}
+{% set ports_with_vrf_exist = sonic_ports_dict.items() | map('last') | map(attribute="vrf", default="") | select('regex', '.+') | length > 0 %}
+{% set ports_with_ips_exist = sonic_ports_dict.items() | map('last') | map(attribute="ips", default="") | select('regex', '.+') | length > 0 %}
+{% set ports_intersect_with_bgp_ports = sonic_ports_dict.items() | map('first') | intersect(sonic_bgp_ports) | length > 0 %}
+{% if ports_with_vrf_exist or ports_with_ips_exist or ports_intersect_with_bgp_ports %}
 
 INTERFACE:
+{% endif %}
   {% for name, port in sonic_ports_dict.items() %}
   {% if name in sonic_bgp_ports|default([]) or port.vrf is defined %}
   {{ name }}: