add bgp comm regex-match

release/models/bgp/openconfig-bgp-errors.yang

@@ -18,7 +18,14 @@ submodule openconfig-bgp-errors {
     "This module defines BGP NOTIFICATION message error codes
     and subcodes";
 
-  oc-ext:openconfig-version "5.6.0";
+  oc-ext:openconfig-version "6.0.0";
+
+  revision "2024-01-31" {
+    description
+      "Update community-sets/members/member union type by replacing
+      the bgp-regex type with posix-eregexp.";
+    reference "6.0.0";
+  }
 
   revision "2023-12-26" {
     description

release/models/bgp/openconfig-bgp-policy.yang

@@ -13,7 +13,7 @@ module openconfig-bgp-policy {
   import openconfig-policy-types { prefix oc-pol-types; }
   import openconfig-bgp-types { prefix oc-bgp-types; }
   import openconfig-extensions { prefix oc-ext; }
-
+  import openconfig-types { prefix oc-types; }
 
   // meta
   organization
@@ -28,7 +28,14 @@ module openconfig-bgp-policy {
     It augments the base routing-policy module with BGP-specific
     options for conditions and actions.";
 
-  oc-ext:openconfig-version "6.3.0";
+  oc-ext:openconfig-version "7.0.0";
+
+  revision "2024-01-31" {
+    description
+      "Update community-sets/members/member union type by replacing
+      the bgp-regex type with posix-eregexp.";
+    reference "7.0.0";
+  }
 
   revision "2023-10-23" {
     description
@@ -578,17 +585,26 @@ module openconfig-bgp-policy {
     leaf-list community-member {
       type union {
         type oc-bgp-types:bgp-std-community-type;
-        type oc-bgp-types:bgp-community-regexp-type;
+        type oc-types:posix-eregexp;
         type oc-bgp-types:bgp-well-known-community-type;
       }
       description
-        "members of the community set.
-        For an ADD operation these are the communities that will be added;
-        the regexp type is not valid in this operation.
+        "Members of the community set.
+        For an ADD operation these are the communities that will be
+        added.  The regexp type is not valid in this operation.
+
         For REMOVE or REPLACE operations then matching communities will
         be removed unless match-set-options is INVERT which will
         reverse this to mean that anything that does not match will be
-        removed.";
+        removed.
+
+        For MATCH operations the posix-eregexp type should be evaluated
+        against each community associated with a prefix one community
+        at a time.  Communities must be represented as strings in formats
+        conforming to oc-bgp-types:bgp-std-community-type.  For example:
+        - `1000:1000` for a standard community
+        - `route-origin:1000:1000` for the origin type extended community,
+        and so on.";
     }
 
     leaf match-set-options {
@@ -660,17 +676,21 @@ module openconfig-bgp-policy {
 
     leaf-list ext-community-member {
       type union {
-        type oc-bgp-types:bgp-ext-community-type;
-        type oc-bgp-types:bgp-community-regexp-type;
+        type oc-bgp-types:bgp-std-community-type;
+        type oc-types:posix-eregexp;
       }
       description
-        "members of the extended community set
+        "Members of the extended community set.
         For an ADD operation these are the communities that will be added;
         the regexp type is not valid in this operation.
+
         For REMOVE or REPLACE operations then matching communities will
         be removed unless match-set-options is INVERT which will
         reverse this to mean that anything that does not match will be
-        removed.";
+        removed.
+
+        For MATCH operations a regexp type should be evaluated against
+        each community associated with a prefix one community at a time.";
     }
 
     leaf match-set-options {

release/models/bgp/openconfig-bgp-types.yang

@@ -5,7 +5,6 @@ module openconfig-bgp-types {
 
   prefix "oc-bgp-types";
 
-  import openconfig-types { prefix "oc-types"; }
   import openconfig-inet-types { prefix "oc-inet"; }
   import openconfig-extensions { prefix "oc-ext"; }
 
@@ -25,7 +24,14 @@ module openconfig-bgp-types {
     policy. It can be imported by modules that make use of BGP
     attributes";
 
-  oc-ext:openconfig-version "5.6.0";
+  oc-ext:openconfig-version "6.0.0";
+
+  revision "2024-02-01" {
+    description
+      "Remove unused bgp-community-regexp-type in favor of
+      oc-types:posix-eregexp";
+    reference "6.0.0";
+  }
 
   revision "2023-12-26" {
     description
@@ -672,15 +678,6 @@ module openconfig-bgp-types {
        RFC 5668 - 4-Octet AS Specific BGP Extended Community";
   }
 
-  typedef bgp-community-regexp-type {
-    // TODO: needs more work to decide what format these regexps can
-    // take.
-    type oc-types:std-regexp;
-    description
-      "Type definition for communities specified as regular
-      expression patterns";
-  }
-
   typedef bgp-origin-attr-type {
     type enumeration {
       enum IGP {

release/models/types/openconfig-types.yang

@@ -21,7 +21,13 @@ module openconfig-types {
     are used across OpenConfig models. It can be imported by modules
     that make use of these types.";
 
-  oc-ext:openconfig-version "0.6.0";
+  oc-ext:openconfig-version "1.0.0";
+
+  revision "2024-01-31" {
+    description
+      "Add posix-eregexp type and promote model to version 1.0.0.";
+    reference "1.0.0";
+  }
 
   revision "2019-04-16" {
     description
@@ -101,6 +107,14 @@ module openconfig-types {
       supported. An initial proposal is POSIX compatible.";
   }
 
+  typedef posix-eregexp {
+    type string;
+    description
+      "This is a string which represents an extended POSIX
+      regular expression.";
+    reference "IEEE Std 1003.1-2017";
+  }
+
   typedef timeticks64 {
     type uint64;
     units "nanoseconds";