fix(ewan-ace): standardize snip naming to match cross-JVD conventions

enterprise_wan/ewan_adv_core_edge/configuration/snips/_variables.md

@@ -8,11 +8,11 @@ with site-specific values when adapting snips to a new deployment.
 | Variable | Example | Used in |
 |----------|---------|---------|
 | `$CORE_INTF` | `et-0/0/1` | physical-uplink-mpls, rewrite-rules-exp |
-| `$ACCESS_INTF` | `xe-0/0/9:0` | rewrite-rules-exp, ccc-vpws-mux |
+| `$ACCESS_INTF` | `xe-0/0/9:0` | rewrite-rules-exp, vlan-ccc-esi |
 | `$LAG_INTF` | `ae0` | lag-flexible-services |
 | `$LAG_MEMBER` | `xe-0/0/9:0` | lag-flexible-services |
-| `$UNIT` | `301` | ccc-vpws-mux, irb-gateway, rewrite-rules-exp |
-| `$VLAN_ID` | `301` | ccc-vpws-mux, irb-gateway |
+| `$UNIT` | `301` | vlan-ccc-esi, irb-gateway, rewrite-rules-exp |
+| `$VLAN_ID` | `301` | vlan-ccc-esi, irb-gateway |
 | `$LOOPBACK_IPV4` | `192.168.0.1/32` | loopback |
 | `$LOOPBACK_IPV6` | `fd00::1/128` | loopback |
 | `$IRB_IPV4` | `10.0.1.1/24` | irb-gateway |
@@ -37,14 +37,14 @@ with site-specific values when adapting snips to a new deployment.
 
 | Variable | Example | Used in |
 |----------|---------|---------|
-| `$VPN_INSTANCE` | `vpws_group_14_1` | evpn-vpws-fxc, evpn-vpws-simple |
+| `$VPN_INSTANCE` | `vpws_group_14_1` | evpn-fxc-vlan-aware, evpn-vpws-vlan-based |
 | `$RD` | `192.168.0.1:14001` | all services |
 | `$RT_IMPORT` | `target:65001:14001` | all services |
 | `$RT_EXPORT` | `target:65001:14001` | all services |
-| `$LOCAL_ID` | `1` | evpn-vpws-fxc, evpn-vpws-simple |
-| `$REMOTE_ID` | `2` | evpn-vpws-fxc, evpn-vpws-simple |
-| `$FXC_INTF` | `lsi.*` | evpn-vpws-fxc |
-| `$ELAN_VNI` | `5001` | evpn-elan-simple (if extended) |
+| `$LOCAL_ID` | `1` | evpn-fxc-vlan-aware, evpn-vpws-vlan-based |
+| `$REMOTE_ID` | `2` | evpn-fxc-vlan-aware, evpn-vpws-vlan-based |
+| `$FXC_INTF` | `lsi.*` | evpn-fxc-vlan-aware |
+| `$ELAN_VNI` | `5001` | evpn-elan-vlan-based (if extended) |
 
 ## CoS / QoS
 

enterprise_wan/ewan_adv_core_edge/configuration/snips/evo/interfaces/irb-gateway.conf

@@ -11,7 +11,7 @@
  *  - Referenced via l3-interface in the mac-vrf vlans stanza (vs routing-interface on Junos)
  *
  * Pair with:
- *  - evo/services/mac-vrf-elan.conf         (mac-vrf with l3-interface irb.$UNIT)
+ *  - evo/services/evpn-elan-vlan-based-irb.conf (mac-vrf with l3-interface irb.$UNIT)
  *  - evo/services/evpn-vrf-ip-prefix.conf   (VRF binding interface irb.$UNIT)
  *
  * Variables (example values from wanedge3_acx7509):

enterprise_wan/ewan_adv_core_edge/configuration/snips/evo/interfaces/lag-flexible-services.conf

@@ -12,8 +12,12 @@
  *  - Member links use ether-options { 802.3ad ae0; } (vs gigether-options on Junos MX)
  *
  * Pair with:
- *  - evo/interfaces/ccc-vpws-mux.conf    (per-unit VPWS/ELAN AC config on this LAG)
- *  - evo/services/evpn-vpws-fxc.conf      (instances referencing ae0.* units)
+ *  - evo/interfaces/vlan-ccc-esi.conf    (per-unit VPWS AC config on this LAG)
+ *  - evo/interfaces/vlan-bridge.conf     (per-unit ELAN AC config on this LAG)
+ *  - evo/services/evpn-vpws-vlan-based.conf     (VPWS instances binding vlan-ccc units)
+ *  - evo/services/evpn-fxc-vlan-aware.conf      (FXC instances referencing ae0.* units)
+ *  - evo/services/evpn-elan-vlan-bundle.conf    (ELAN instances binding vlan-bridge units)
+ *  - evo/services/evpn-elan-vlan-based-irb.conf (ELAN+IRB instances binding vlan-bridge units)
  *  - evo/bootstrap/chassis-network-services.conf
  *  - evo/transport/forwarding-options-hash.conf
  *

enterprise_wan/ewan_adv_core_edge/configuration/snips/evo/interfaces/vlan-bridge.conf

@@ -0,0 +1,33 @@
+/*
+ * Topic:   ELAN attachment-circuit (vlan-bridge encapsulation)
+ * Variant: Evolved-OS (EVO)
+ * Seen on:
+ *   Junos: wanedge1_mx304 wanedge2_mx10004
+ *   EVO:   wanedge3_acx7509 wanedge4_acx7100-48l
+ *
+ * Highlights:
+ *  - encapsulation vlan-bridge carries L2 multipoint ELAN traffic
+ *  - No ESI needed — bridging semantics don't require per-unit multi-homing
+ *    (the parent LAG ESI handles it at the bundle level)
+ *  - No family statement — bridging is implied by the encapsulation
+ *  - Scale: ~1000 vlan-bridge units per ae0 in this JVD
+ *
+ * Pair with:
+ *  - evo/interfaces/lag-flexible-services.conf  (the parent ae interface)
+ *  - evo/services/evpn-elan-vlan-bundle.conf    (ELAN instances binding these units)
+ *  - evo/services/evpn-elan-vlan-based-irb.conf (ELAN+IRB instances binding these units)
+ *
+ * Variables (example values from wanedge3_acx7509):
+ *   $LAG_INTF           e.g. ae0
+ *   $UNIT               e.g. 2001
+ *   $VLAN_ID            e.g. 2001
+ */
+
+interfaces {
+    $LAG_INTF {
+        unit $UNIT {
+            encapsulation vlan-bridge;
+            vlan-id $VLAN_ID;
+        }
+    }
+}

enterprise_wan/ewan_adv_core_edge/configuration/snips/evo/interfaces/vlan-ccc-esi.conf

@@ -0,0 +1,40 @@
+/*
+ * Topic:   VPWS attachment-circuit (vlan-ccc with ESI all-active multi-homing)
+ * Variant: Evolved-OS (EVO)
+ * Seen on:
+ *   Junos: wanedge1_mx304 wanedge2_mx10004
+ *   EVO:   wanedge3_acx7509 wanedge4_acx7100-48l
+ *
+ * Highlights:
+ *  - encapsulation vlan-ccc carries point-to-point VPWS traffic
+ *  - ESI with all-active enables per-flow multi-homing across PE pairs
+ *  - ESI is a 10-byte identifier — must be identical on both multi-homed PEs
+ *  - family ccc is required for circuit cross-connect semantics
+ *  - Scale: ~1500 vlan-ccc units per ae0 in this JVD
+ *
+ * Pair with:
+ *  - evo/interfaces/lag-flexible-services.conf  (the parent ae interface)
+ *  - evo/services/evpn-vpws-vlan-based.conf     (instances binding these vlan-ccc units)
+ *  - evo/services/evpn-fxc-vlan-aware.conf      (FXC instances binding these units)
+ *  - evo/oam/cfm-maintenance-domain.conf
+ *
+ * Variables (example values from wanedge3_acx7509):
+ *   $LAG_INTF           e.g. ae0
+ *   $UNIT               e.g. 1
+ *   $VLAN_ID            e.g. 1
+ *   $ESI                e.g. 00:34:34:34:34:34:34:34:11:01
+ */
+
+interfaces {
+    $LAG_INTF {
+        unit $UNIT {
+            encapsulation vlan-ccc;
+            vlan-id $VLAN_ID;
+            esi {
+                $ESI;
+                all-active;
+            }
+            family ccc;
+        }
+    }
+}

enterprise_wan/ewan_adv_core_edge/configuration/snips/evo/oam/cfm-maintenance-domain.conf

@@ -12,7 +12,7 @@
  *
  * Pair with:
  *  - evo/oam/cfm-sla-iterator.conf           (performance measurement on these MEPs)
- *  - evo/interfaces/ccc-vpws-mux.conf        (AC interfaces referenced by MEPs)
+ *  - evo/interfaces/vlan-ccc-esi.conf        (AC interfaces referenced by MEPs)
  *
  * Variables:
  *   $MD_NAME            e.g. m-d301

enterprise_wan/ewan_adv_core_edge/configuration/snips/evo/services/evpn-elan-vlan-based-irb.conf

@@ -0,0 +1,60 @@
+/*
+ * Topic:   EVPN-ELAN vlan-based with IRB gateway (L2+L3 integrated)
+ * Variant: Evolved-OS (EVO)
+ * Seen on:
+ *   Junos: (none)
+ *   EVO:   wanedge3_acx7509 wanedge4_acx7100-48l
+ *
+ * Highlights:
+ *  - EVO uses instance-type mac-vrf with service-type vlan-based
+ *  - Each VLAN gets explicit vlan-id + l3-interface for IRB routing
+ *  - encapsulation mpls explicitly sets EVPN/MPLS data-plane
+ *  - default-gateway do-not-advertise suppresses Type-5 default from this instance
+ *  - no-control-word is explicit on EVO
+ *  - The IRB interface is associated with a VRF instance for ip-prefix-route advertisement
+ *  - Scale: ~600 vlan-based ELAN instances per WAN edge in this JVD
+ *
+ * Pair with:
+ *  - evo/services/evpn-vrf-ip-prefix.conf  (the L3 VRF binding irb.$UNIT)
+ *  - evo/interfaces/irb-gateway.conf       (IRB unit config)
+ *  - evo/interfaces/vlan-bridge.conf       (the vlan-bridge AC units)
+ *  - evo/interfaces/lag-flexible-services.conf  (the parent ae interface)
+ *
+ * JVD service mapping:
+ *   1225 instances across 2 EVO WAN-edge devices
+ *     wanedge3_acx7509: 600
+ *     wanedge4_acx7100-48l: 625
+ *   Examples: elan_group_95_476, elan_group_95_478, elan_group_95_480
+ *
+ * Variables (example values from wanedge3_acx7509):
+ *   $INSTANCE_NAME      e.g. elan_group_95_476
+ *   $AC_INTF_1          e.g. ae0.476
+ *   $VLAN_NAME          e.g. svbased_476
+ *   $VLAN_ID            e.g. 476
+ *   $IRB_UNIT           e.g. irb.476
+ *   $RD                 e.g. 44.44.44.44:476
+ *   $RT                 e.g. target:62525:476
+ */
+
+routing-instances {
+    $INSTANCE_NAME {
+        instance-type mac-vrf;
+        protocols {
+            evpn {
+                encapsulation mpls;
+                default-gateway do-not-advertise;
+                no-control-word;
+            }
+        }
+        service-type vlan-based;
+        route-distinguisher $RD;
+        vrf-target $RT;
+        vlans {
+            $VLAN_NAME {
+                vlan-id $VLAN_ID;
+                interface $AC_INTF_1;
+                l3-interface $IRB_UNIT;
+            }
+        }
+    }
+}

enterprise_wan/ewan_adv_core_edge/configuration/snips/evo/services/evpn-elan-vlan-bundle.conf

@@ -0,0 +1,52 @@
+/*
+ * Topic:   EVPN-ELAN vlan-bundle (L2 multipoint, no IRB)
+ * Variant: Evolved-OS (EVO)
+ * Seen on:
+ *   Junos: (none)
+ *   EVO:   wanedge3_acx7509 wanedge4_acx7100-48l
+ *
+ * Highlights:
+ *  - EVO uses instance-type mac-vrf (Junos MX uses instance-type evpn)
+ *  - service-type vlan-bundle: multiple ACs grouped under a single vlans stanza
+ *  - Pure L2 switching — no IRB, no per-VLAN L3 gateway
+ *  - no-control-word is explicit on EVO
+ *  - Scale: ~600 vlan-bundle ELAN instances per WAN edge in this JVD
+ *
+ * Pair with:
+ *  - evo/interfaces/vlan-bridge.conf       (the vlan-bridge AC units)
+ *  - evo/interfaces/lag-flexible-services.conf  (the parent ae interface)
+ *
+ * JVD service mapping:
+ *   1200 instances across 2 EVO WAN-edge devices
+ *     wanedge3_acx7509: 600
+ *     wanedge4_acx7100-48l: 600
+ *   Examples: elan_group_500_2001, elan_group_500_2003, elan_group_500_2005
+ *
+ * Variables (example values from wanedge3_acx7509):
+ *   $INSTANCE_NAME      e.g. elan_group_500_2001
+ *   $AC_INTF_1          e.g. ae0.2001
+ *   $AC_INTF_2          e.g. ae0.2002
+ *   $VLAN_NAME          e.g. mvbundle_2001
+ *   $RD                 e.g. 44.44.44.44:2001
+ *   $RT                 e.g. target:62525:2001
+ */
+
+routing-instances {
+    $INSTANCE_NAME {
+        instance-type mac-vrf;
+        protocols {
+            evpn {
+                no-control-word;
+            }
+        }
+        service-type vlan-bundle;
+        route-distinguisher $RD;
+        vrf-target $RT;
+        vlans {
+            $VLAN_NAME {
+                interface $AC_INTF_1;
+                interface $AC_INTF_2;
+            }
+        }
+    }
+}

enterprise_wan/ewan_adv_core_edge/configuration/snips/evo/services/evpn-vpws-fxc.conf → enterprise_wan/ewan_adv_core_edge/configuration/snips/evo/services/evpn-fxc-vlan-aware.conf

@@ -1,20 +1,19 @@
 /*
- * Topic:   EVPN-VPWS with Flexible Cross-Connect (multi-AC VLAN-aware)
+ * Topic:   EVPN FXC vlan-aware (Flexible Cross-Connect, multi-AC)
  * Variant: Evolved-OS (EVO)
  * Seen on:
  *   Junos: wanedge1_mx304 wanedge2_mx10004
  *   EVO:   wanedge3_acx7509 wanedge4_acx7100-48l
  *
  * Highlights:
- *  - Body is structurally identical to the Junos sibling (only local/remote IDs differ per-site)
  *  - Multi-homed VPWS carrying 2+ VLANs per instance via flexible-cross-connect-vlan-aware
  *  - Each AC interface gets its own vpws-service-id pair (local/remote must be swapped on the far end)
  *  - All ACs share a single RD and RT; the service-id disambiguates circuits within the instance
  *  - Scale: ~500 FXC instances per WAN edge in this JVD
  *
  * Pair with:
  *  - evo/interfaces/lag-flexible-services.conf  (the ae0 bundle carrying these ACs)
- *  - evo/interfaces/ccc-vpws-mux.conf           (per-AC unit config on ae0)
+ *  - evo/interfaces/vlan-ccc-esi.conf           (per-AC unit config on ae0)
  *
  * JVD service mapping:
  *   1800 instances across 4 WAN-edge devices

enterprise_wan/ewan_adv_core_edge/configuration/snips/evo/services/evpn-vpws-simple.conf → enterprise_wan/ewan_adv_core_edge/configuration/snips/evo/services/evpn-vpws-vlan-based.conf

@@ -1,19 +1,19 @@
 /*
- * Topic:   EVPN-VPWS point-to-point pseudowire (single AC, control-word)
+ * Topic:   EVPN-VPWS vlan-based point-to-point pseudowire (single AC, control-word)
  * Variant: Evolved-OS (EVO)
  * Seen on:
  *   Junos: wanedge1_mx304 wanedge2_mx10004
  *   EVO:   wanedge3_acx7509 wanedge4_acx7100-48l
  *
  * Highlights:
- *  - Body is structurally identical to the Junos sibling
- *  - Simplest VPWS: one AC interface, one vpws-service-id pair, control-word enabled
+ *  - Single AC interface, one vpws-service-id pair, control-word enabled
  *  - control-word ensures correct sequencing and prevents fat-pipe reordering issues
  *  - local/remote IDs must be mirror-swapped on the PE peer (local 30 ↔ remote 20)
- *  - Scale: ~1000 simple VPWS instances per WAN edge in this JVD
+ *  - Scale: ~1000 VPWS instances per WAN edge in this JVD
  *
  * Pair with:
- *  - evo/interfaces/ccc-vpws-mux.conf  (the per-unit AC config on the physical/LAG interface)
+ *  - evo/interfaces/vlan-ccc-esi.conf        (the per-unit AC config on the LAG interface)
+ *  - evo/interfaces/lag-flexible-services.conf (the parent ae interface)
  *
  * JVD service mapping:
  *   1800 instances across 4 WAN-edge devices

enterprise_wan/ewan_adv_core_edge/configuration/snips/evo/services/evpn-vrf-ip-prefix.conf

@@ -14,7 +14,7 @@
  *  - Scale: ~350 VRF instances per WAN edge in this JVD
  *
  * Pair with:
- *  - evo/services/mac-vrf-elan.conf       (the bridge domain whose IRB feeds this VRF)
+ *  - evo/services/evpn-elan-vlan-based-irb.conf (the bridge domain whose IRB feeds this VRF)
  *  - evo/interfaces/irb-gateway.conf      (IRB unit addressing)
  *
  * JVD service mapping: