diff --git a/release/models/policy-forwarding/openconfig-policy-forwarding.yang b/release/models/policy-forwarding/openconfig-policy-forwarding.yang index c6d37209a..c87e6eb59 100644 --- a/release/models/policy-forwarding/openconfig-policy-forwarding.yang +++ b/release/models/policy-forwarding/openconfig-policy-forwarding.yang @@ -62,11 +62,14 @@ module openconfig-policy-forwarding { A forwarding-policy specifies the match criteria that it intends to use to determine the packets that it reroutes - this may - consist of a number of criteria, such as DSCP. The action of the - policy results in a forwarding action being applied to matching - packets. For example, decapsulating the packet from a GRE header. - In order to enact the policy based on particular interfaces - the - forwarding-policy is applied to an interface via referencing it + consist of a number of criteria, such as DSCP. The match criteria + is specified as rules. If no rules are specified, then the policy + will match all packets. + + The action of the policy results in a forwarding action being applied + to matching packets. For example, decapsulating the packet from a GRE + header. In order to enact the policy based on particular interfaces - + the forwarding-policy is applied to an interface via referencing it within an 'apply-forwarding-policy' statement associated with an interface. @@ -81,7 +84,13 @@ module openconfig-policy-forwarding { The forwarding action of the corresponding policy is set to PATH_GROUP and references the configured group of LSPs."; - oc-ext:openconfig-version "0.6.1"; + oc-ext:openconfig-version "0.7.0"; + + revision "2024-11-14" { + description + "Clarify that if no rules are present, all packets will be matched."; + reference "0.7.0"; + } revision "2023-04-25" { description @@ -159,3 +168,4 @@ module openconfig-policy-forwarding { } } } + diff --git a/release/models/policy/openconfig-routing-policy.yang b/release/models/policy/openconfig-routing-policy.yang index 8a61d8be0..2edd79170 100644 --- a/release/models/policy/openconfig-routing-policy.yang +++ b/release/models/policy/openconfig-routing-policy.yang @@ -51,11 +51,17 @@ module openconfig-routing-policy { Evaluation of each policy definition proceeds by evaluating its 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 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. + corresponding action statement is executed. A policy statement with no + conditions defined is evaluated as statisfied, meaning all routes are + matched. A routing-policy statement with no condition AND no action, or + a policy-definition without any statements should be treated as errors + (grpc error: INVALID_ARGUMENT, netconfig error missing-element). + + If the action 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 @@ -87,8 +93,14 @@ module openconfig-routing-policy { default value for the default-(import|export)-policy leaf must be applied. See RFC6020 7.6.1 which applies to this model."; - oc-ext:openconfig-version "3.4.2"; + oc-ext:openconfig-version "3.5.0"; + revision "2024-11-26" { + description + "Clarify that a policy statement with no conditions defined is evaluated + as statisfied."; + reference "3.5.0"; + } revision "2023-11-01" { description "Refactor apply policy to separate default policy in it's own common