related to truststore issue #1

netconf-wg · Apr 2, 2021 · ba8da8e · ba8da8e
1 parent 5163646
commit ba8da8e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/ietf-keystore.yang b/ietf-keystore.yang
@@ -78,7 +78,7 @@ module ietf-keystore {
   typedef symmetric-key-ref {
     type leafref {
       path "/ks:keystore/ks:symmetric-keys/ks:symmetric-key"
-         + "/ks:name";
+           + "/ks:name";
     }
     description
       "This typedef enables modules to easily define a reference
@@ -89,7 +89,7 @@ module ietf-keystore {
   typedef asymmetric-key-ref {
     type leafref {
       path "/ks:keystore/ks:asymmetric-keys/ks:asymmetric-key"
-         + "/ks:name";
+           + "/ks:name";
     }
     description
       "This typedef enables modules to easily define a reference
@@ -147,9 +147,9 @@ module ietf-keystore {
     leaf certificate {
       nacm:default-deny-write;
       type leafref {
-        path "/ks:keystore/ks:asymmetric-keys/ks:asymmetric-key[ks:"
-             + "name = current()/../asymmetric-key]/ks:certificates"
-             + "/ks:certificate/ks:name";
+        path "/ks:keystore/ks:asymmetric-keys/ks:asymmetric-key"
+             + "[ks:name = current()/../asymmetric-key]/"
+             + "ks:certificates/ks:certificate/ks:name";
       }
       must '../asymmetric-key';
       description

diff --git a/refs/validate-all.sh b/refs/validate-all.sh
@@ -20,9 +20,9 @@ run_unix_cmd() {
 }
 
 printf "Testing ietf-keystore.yang (pyang)..."
-command="pyang -Werror --ietf --max-line-length=69 -p ../ ../ietf-keystore\@*.yang ../ietf-crypto-types\@*.yang"
+command="pyang --strict -Werror --ietf --max-line-length=69 -p ../ ../ietf-keystore\@*.yang ../ietf-crypto-types\@*.yang"
 run_unix_cmd $LINENO "$command" 0
-command="pyang --canonical -p ../ ../ietf-keystore\@*.yang ../ietf-crypto-types\@*.yang"
+command="pyang --strict --canonical -p ../ ../ietf-keystore\@*.yang ../ietf-crypto-types\@*.yang"
 run_unix_cmd $LINENO "$command" 0
 printf "okay.\n"
 
@@ -53,7 +53,7 @@ printf "okay.\n"
 
 
 printf "Testing ex-keystore-usage.yang (pyang)..."
-command="pyang --lint --max-line-length=69 -p ../ ../ex-keystore-usage\@*.yang"
+command="pyang --strict --lint --max-line-length=69 -p ../ ../ex-keystore-usage\@*.yang"
 run_unix_cmd $LINENO "$command" 0
 printf "okay.\n"