From 771cd192d99e43ab8b1f55bdc0f33c443d63dfe1 Mon Sep 17 00:00:00 2001
From: Darren Loher <dloher@google.com>
Date: Tue, 17 Oct 2023 14:13:58 -0700
Subject: [PATCH] add NEXT-STATEMENT to policy-result-type (#949)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update release/models/policy/openconfig-routing-policy.yang
* add continue to policy-result-type

---------

Co-authored-by: Óscar González de Dios <oscar.gonzalezdedios@telefonica.com>
---
 .../policy/openconfig-routing-policy.yang     | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/release/models/policy/openconfig-routing-policy.yang b/release/models/policy/openconfig-routing-policy.yang
index bf419b779..921e127e5 100644
--- a/release/models/policy/openconfig-routing-policy.yang
+++ b/release/models/policy/openconfig-routing-policy.yang
@@ -52,9 +52,14 @@ module openconfig-routing-policy {
     corresponding individual policy statements in order.  When a
     condition statement in a policy statement is satisfied, the
     corresponding action statement is executed.  If the action
-    statement has either accept-route or reject-route actions, policy
-    evaluation of the current policy definition stops, and no further
-    policy definitions in the chain are evaluated.
+    statement has a final disposition configured as policy result, either
+    accept-route or reject-route, evaluation of the current policy definition
+    stops, and no further policy statements are evaluated. In case there is a
+    policy chain, no further policy definitions in the chain are evaluated.
+
+    If the action statement has the NEXT_STATEMENT policy result, all the
+    defined actions are executed and policy evaluation proceeds to the next
+    statement.  The NEXT_STATEMENT is the default policy result action.
 
     If the condition is not satisfied, then evaluation proceeds to
     the next policy statement.  If none of the policy statement
@@ -77,7 +82,13 @@ module openconfig-routing-policy {
     the remaining conditions (using a modified route if the
     subroutine performed any changes to the route).";
 
-  oc-ext:openconfig-version "3.3.0";
+  oc-ext:openconfig-version "3.4.0";
+
+  revision "2023-10-11" {
+    description
+      "Add NEXT_STATEMENT policy-result-type enum value.";
+    reference "3.4.0";
+  }
 
   revision "2022-05-24" {
     description
@@ -162,12 +173,19 @@ module openconfig-routing-policy {
   typedef policy-result-type {
     type enumeration {
       enum ACCEPT_ROUTE {
-        description "Policy accepts the route";
+        description "Policy accepts the route and evaluation of the
+        current policy definition stops.";
       }
       enum REJECT_ROUTE {
-        description "Policy rejects the route";
+        description "Policy rejects the route and evaluation of the
+        current policy definition stops.";
+      }
+      enum NEXT_STATEMENT {
+        description "Any modifications of the route are preserved and the evaluation of the policy will continue to the
+        next statement.";
       }
     }
+    default NEXT_STATEMENT;
     description
       "Type used to specify route disposition in
       a policy chain";