Merge branch 'master' into Redistribution-model-cleanup

openconfig · Nov 8, 2024 · d74af9c · d74af9c
2 parents a3013fd + ea290e3
commit d74af9c
Show file tree

Hide file tree

Showing 60 changed files with 3,240 additions and 270 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -3,7 +3,7 @@ tagged with "Note" can be removed from the template.]
 
 [Note: Before this PR can be reviewed please agree to the CLA covering this
 repo. Please also review the contribution guide -
-https://github.com/openconfig/public/blob/master/doc/external-contributions-guide.md]
+https://github.com/openconfig/public/blob/master/doc/contributions-guide.md]
 
 ### Change Scope
 

diff --git a/regexp-tests/openconfig-network-instance-types-test.yang b/regexp-tests/openconfig-network-instance-types-test.yang
@@ -13,6 +13,7 @@ module openconfig-network-instance-types-test {
     pt:pattern-test-pass "99:4294967295";
     pt:pattern-test-pass "999:999999999";
     pt:pattern-test-pass "9999:99999999";
+    pt:pattern-test-fail "09999:99999999"; // regression: not canonical    
     pt:pattern-test-pass "65535:0";
     pt:pattern-test-pass "59999:65536";
     pt:pattern-test-pass "64999:4294967289";
@@ -24,6 +25,7 @@ module openconfig-network-instance-types-test {
     pt:pattern-test-pass "65535:4289999999";
     pt:pattern-test-pass "65535:4199999999";
     pt:pattern-test-pass "65535:3999999999";
+    pt:pattern-test-pass "65535:2999999999"; // regression: [1-3][0-9]{9}, not just 3[0-9]{9}
     pt:pattern-test-fail "0:4294967296";
     pt:pattern-test-fail "65536:777777";
     pt:pattern-test-fail "65540:777777";
@@ -52,6 +54,7 @@ module openconfig-network-instance-types-test {
     pt:pattern-test-fail "1.1.1.1:65600";
     pt:pattern-test-fail "1.1.1.1:66000";
     pt:pattern-test-fail "1.1.1.1:70000";
+    pt:pattern-test-fail "1.1.1.1:09999"; // regression
     pt:pattern-test-fail "256.255.255.255:99";
     pt:pattern-test-fail "1.1.1.256:99";
     pt:pattern-test-fail "256.1.1.1%eth0:99";
@@ -71,7 +74,9 @@ module openconfig-network-instance-types-test {
     pt:pattern-test-pass "4293999999:65535";
     pt:pattern-test-pass "4289999999:65535";
     pt:pattern-test-pass "4199999999:65535";
+    pt:pattern-test-pass "1999999999:65535"; // regression
     pt:pattern-test-pass "3999999999:65535";
+    pt:pattern-test-fail "3999999999:05535"; // regression
     pt:pattern-test-fail "4294967296:0";
     pt:pattern-test-fail "777777:65536";
     pt:pattern-test-fail "777777:65540";

diff --git a/regexp-tests/openconfig-yang-types-test.yang b/regexp-tests/openconfig-yang-types-test.yang
@@ -5,6 +5,19 @@ module openconfig-yang-types-test {
   import pattern-test { prefix "pt"; }
   import openconfig-yang-types { prefix "oc-yang"; }
 
+  leaf hex-string-prefixed {
+    type oc-yang:hex-string-prefixed;
+    pt:pattern-test-pass "0x0000";
+    pt:pattern-test-pass "0xffff";
+    pt:pattern-test-pass "0xFFFF";
+    pt:pattern-test-pass "0x0123456789abcdefABCDEF";
+    pt:pattern-test-pass "0xFEDCBAfedcba9876543210";
+    pt:pattern-test-fail "0xg";
+    pt:pattern-test-fail "0xG";
+    pt:pattern-test-fail "0x0123456789abcdefABCDEFG";
+    pt:pattern-test-fail "0xFED0xba9876543210";
+  }
+
   leaf hex-string {
     type oc-yang:hex-string;
     pt:pattern-test-pass "00000";