From e65644d59778de0e5aa8ee6b888652d677e7e4e2 Mon Sep 17 00:00:00 2001
From: Ebben Aries <exa@juniper.net>
Date: Wed, 15 Jan 2025 15:42:28 -0800
Subject: [PATCH] Add prefixing to ACL when conditionals that are part of
 reusable groupings

  * (M) release/models/acl/openconfig-acl.yang
    - Add prefixing to when conditionals
---
 release/models/acl/openconfig-acl.yang | 31 ++++++++++++++++----------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/release/models/acl/openconfig-acl.yang b/release/models/acl/openconfig-acl.yang
index 6b3977907..de756a4df 100644
--- a/release/models/acl/openconfig-acl.yang
+++ b/release/models/acl/openconfig-acl.yang
@@ -34,7 +34,14 @@ module openconfig-acl {
     packets should be handled. Entries have a type that indicates
     the type of match criteria, e.g., MAC layer, IPv4, IPv6, etc.";
 
-  oc-ext:openconfig-version "1.3.3";
+  oc-ext:openconfig-version "1.4.0";
+
+  revision "2025-01-15" {
+    description
+      "Adjust prefixing for when conditionals that are part of reusable
+      groupings.";
+    reference "1.4.0";
+  }
 
   revision "2023-02-06" {
     description
@@ -451,8 +458,8 @@ module openconfig-acl {
         }
 
         uses oc-match:ethernet-header-top {
-          when "../../config/type='ACL_L2' or " +
-            "../../config/type='ACL_MIXED'" {
+          when "../../config/type='oc-acl:ACL_L2' or " +
+            "../../config/type='oc-acl:ACL_MIXED'" {
             description
               "MAC-layer fields are valid when the ACL type is L2 or
               MIXED";
@@ -460,8 +467,8 @@ module openconfig-acl {
         }
 
         uses oc-match:ipv4-protocol-fields-top {
-          when "../../config/type='ACL_IPV4' or " +
-            "../../config/type='ACL_MIXED'" {
+          when "../../config/type='oc-acl:ACL_IPV4' or " +
+            "../../config/type='oc-acl:ACL_MIXED'" {
             description
               "IPv4-layer fields are valid when the ACL type is
               IPv4 or MIXED";
@@ -469,8 +476,8 @@ module openconfig-acl {
         }
 
         uses oc-match:mpls-header-top {
-          when "../../config/type='ACL_MPLS' or " +
-            "../../config/type='ACL_MIXED'" {
+          when "../../config/type='oc-acl:ACL_MPLS' or " +
+            "../../config/type='oc-acl:ACL_MIXED'" {
             description
               "MPLS-layer fields are valid when the ACL type is
               MPLS or MIXED";
@@ -478,8 +485,8 @@ module openconfig-acl {
         }
 
         uses oc-match:ipv6-protocol-fields-top {
-          when "../../config/type='ACL_IPV6' or " +
-            "../../config/type='ACL_MIXED'" {
+          when "../../config/type='oc-acl:ACL_IPV6' or " +
+            "../../config/type='oc-acl:ACL_MIXED'" {
             description
               "IPv6-layer fields are valid when the ACL type is
               IPv6 or MIXED";
@@ -487,9 +494,9 @@ module openconfig-acl {
         }
 
         uses oc-match:transport-fields-top {
-          when "../../config/type='ACL_IPV6' or " +
-            "../../config/type='ACL_IPV4' or " +
-            "../../config/type='ACL_MIXED'" {
+          when "../../config/type='oc-acl:ACL_IPV6' or " +
+            "../../config/type='oc-acl:ACL_IPV4' or " +
+            "../../config/type='oc-acl:ACL_MIXED'" {
             description
               "Transport-layer fields are valid when specifying
               L3 or MIXED ACL types";