From 62de9547cc46bb1510f2795cbfb7be1dfca2048e Mon Sep 17 00:00:00 2001
From: Aleksandr Kurbatov <ak@geant.org>
Date: Thu, 10 Apr 2025 13:20:01 +0100
Subject: [PATCH] Update Juniper L2c template to support VLAN-range
---
.../roles/l2circuits/templates/juniper/deploy/l2circuit.j2 | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/geant/gap_ansible/roles/l2circuits/templates/juniper/deploy/l2circuit.j2 b/geant/gap_ansible/roles/l2circuits/templates/juniper/deploy/l2circuit.j2
index e4021485..a642a9b3 100644
--- a/geant/gap_ansible/roles/l2circuits/templates/juniper/deploy/l2circuit.j2
+++ b/geant/gap_ansible/roles/l2circuits/templates/juniper/deploy/l2circuit.j2
@@ -1,9 +1,13 @@
set interfaces {{ l2circuits_lag_name }} unit {{ l2circuits_vlan }} description "SRV_L2CIRCUIT CUSTOMER {{ local_partner_name | upper }} {{ remote_partner_name | upper }} #{{ l2circuits_custom_service_name | replace(' ', '_') }} ${{ local_side.sbp.gs_id }}"
set interfaces {{ l2circuits_lag_name }} unit {{ l2circuits_vlan }} encapsulation vlan-ccc
-set interfaces {{ l2circuits_lag_name }} unit {{ l2circuits_vlan }} vlan-id {{ l2circuits_vlan }}
set interfaces {{ l2circuits_lag_name }} unit {{ l2circuits_vlan }} family ccc
+{% if l2circuits_l2c_type == 'Ethernet' %}
+set interfaces {{ l2circuits_lag_name }} unit {{ l2circuits_vlan }} vlan-id {{ l2circuits_vlan }}
set interfaces {{ l2circuits_lag_name }} unit {{ l2circuits_vlan }} input-vlan-map pop
set interfaces {{ l2circuits_lag_name }} unit {{ l2circuits_vlan }} output-vlan-map push
+{% elif l2circuits_l2c_type == 'VLAN' %}
+set interfaces {{ l2circuits_lag_name }} unit {{ l2circuits_vlan }} vlan-id-range {{ subscription.layer_2_circuit.vlan_range_lower_bound }}-{{ subscription.layer_2_circuit.vlan_range_upper_bound }}
+{% endif %}
set protocols l2circuit neighbor {{ remote_side.sbp.edge_port.node.router_lo_ipv4_address }} interface {{ l2circuits_lag_name }}.{{ l2circuits_vlan }} virtual-circuit-id {{ l2circuits_l2c_vcid }}
set protocols l2circuit neighbor {{ remote_side.sbp.edge_port.node.router_lo_ipv4_address }} interface {{ l2circuits_lag_name }}.{{ l2circuits_vlan }} control-word
--
GitLab