Adapt yang modules

Author: mattiaswal

src/confd/yang/confd/infix-if-wifi.yang

@@ -121,7 +121,7 @@ submodule infix-if-wifi {
       }
 
       leaf secret {
-        type ks:symmetric-key-ref;
+        type ks:central-symmetric-key-ref;
         mandatory true;
         must "../encryption != 'disabled'" {
            error-message

src/confd/yang/confd/infix-keystore.yang

@@ -11,12 +11,21 @@ module infix-keystore {
   import infix-crypto-types {
     prefix infix-ct;
   }
+
+  revision 2025-12-10 {
+    description "Adapt to changes in final version of ietf-keystore";
+  }
   revision 2025-06-17 {
     description "Add Wi-Fi secrets support";
   }
   revision 2025-02-04 {
     description "Initial";
   }
+  deviation "/ks:keystore/ks:asymmetric-keys/ks:asymmetric-key/ks:private-key-type" {
+    deviate replace {
+      mandatory false;
+    }
+  }
   deviation "/ks:keystore/ks:asymmetric-keys/ks:asymmetric-key/ks:public-key-format" {
     deviate replace {
       type identityref {
@@ -46,14 +55,14 @@ module infix-keystore {
         wifi-preshared-key-format  - WiFi preshared key";
     }
   }
-  deviation "/ks:keystore/ks:symmetric-keys/ks:symmetric-key/ks:key-type/ks:cleartext-key/ks:cleartext-key" {
+  deviation "/ks:keystore/ks:symmetric-keys/ks:symmetric-key/ks:key-type/ks:cleartext-symmetric-key" {
     deviate not-supported;
   }
   augment "/ks:keystore/ks:symmetric-keys/ks:symmetric-key/ks:key-type" {
-    case cleartext-key {
-      leaf cleartext-key {
+    case cleartext-symmetric-key {
+      leaf cleartext-symmetric-key {
         type string;
-        must "../../ks:key-format != 'infix-ct:wifi-preshared-key-format' or " +
+        must "../infix-ks:key-format != 'infix-ct:wifi-preshared-key-format' or " +
           "(string-length(.) >= 8 and string-length(.) <= 63)" {
           error-message "WiFi pre-shared key must be 8-63 characters long";
         }

…ang/confd/[email protected] …ang/confd/[email protected]src/confd/yang/confd/[email protected] renamed to src/confd/yang/confd/[email protected] src/confd/yang/confd/[email protected] renamed to src/confd/yang/confd/[email protected]

@@ -29,10 +29,8 @@ module infix-meta {
 
   container meta {
     description "Meta data";
-    status obsolete;
 
     leaf version {
-      status obsolete; // Ensure frontends don't show this, used for migration.
       description "Configuration file format version, automatically generated.";
       type string;
     }

src/confd/yang/confd/infix-meta.yang

@@ -167,6 +167,7 @@ module infix-routing {
     base infix-routing-type;
     description "Static route";
   }
+
   deviation "/rt:routing/rt:control-plane-protocols/rt:control-plane-protocol/rt:type" {
     deviate replace {
       type identityref {
@@ -858,5 +859,4 @@ module infix-routing {
          This is useful for networks where multiple addresses exist on an interface.";
     }
   }
-
 }

src/confd/yang/confd/infix-routing.yang

@@ -25,6 +25,10 @@ module infix-services {
   contact      "[email protected]";
   description  "Infix services, generic.";
 
+  revision 2025-12-10 {
+    description "Adapt to changes in final version of ietf-keystore";
+    reference "internal";
+  }
   revision 2024-12-03 {
     description "Add support for SSH server configuration";
     reference "internal";
@@ -143,7 +147,7 @@ module infix-services {
         + "derived-from-or-self(deref(.)/../ks:private-key-format,  'infix-ct:rsa-private-key-format'))" {
         error-message "Only RSA hostkeys are supported.";
       }
-      type ks:asymmetric-key-ref;
+      type ks:central-asymmetric-key-ref;
     }
 
     list listen {