confd: Adapt YANG models after libyang/netopeer2 upgrade

We previously run a draft version of a lot of YANG models,
netconf-server,ssh-server and mode. Now they are released
with minor changes.

infix-meta is an exception, here we had to remove the obsolete
marker of the node and value, since this is no longer allowed in
libyang.

Author: mattiaswal

board/aarch64/raspberrypi-rpi64/README.md

@@ -108,7 +108,7 @@ To configure WiFi as a client, first store your WiFi password in the keystore:
 admin@infix:/> configure
 admin@infix:/config/> edit keystore symmetric-key mywifi
 admin@infix:/config/keystore/…/mywifi/> set key-format wifi-preshared-key-format
-admin@infix:/config/keystore/…/mywifi/> set cleartext-key YourWiFiPassword
+admin@infix:/config/keystore/…/mywifi/> set cleartext-symmetric-key YourWiFiPassword
 admin@infix:/config/keystore/…/mywifi/> leave
 ```
 

doc/wifi.md

@@ -84,7 +84,7 @@ and 63 characters
 admin@example:/> configure
 admin@example:/config/> edit keystore symmetric-key example
 admin@example:/config/keystore/…/example/> set key-format wifi-preshared-key-format
-admin@example:/config/keystore/…/example/> set cleartext-key mysecret
+admin@example:/config/keystore/…/example/> set cleartext-symmetric-key mysecret
 admin@example:/config/keystore/…/example/> leave
 admin@example:/>
 ```

src/confd/src/if-wifi.c

@@ -87,7 +87,7 @@ int wifi_gen(struct lyd_node *dif, struct lyd_node *cif, struct dagger *net)
 	country     = lydx_get_cattr(wifi, "country-code");
 	encryption  = lydx_get_cattr(wifi, "encryption");
 	secret_node = lydx_get_xpathf(cif, "../../keystore/symmetric-keys/symmetric-key[name='%s']", secret_name);
-	secret      = lydx_get_cattr(secret_node, "cleartext-key");
+	secret      = lydx_get_cattr(secret_node, "cleartext-symmetric-key");
 
 	if (!enabled)
 		return wifi_gen_del(cif, net);

src/confd/yang/confd.inc

@@ -37,7 +37,7 @@ MODULES=(
 	"[email protected]"
 	"[email protected]"
 	"[email protected]"
-	"infix-meta@2024-10-18.yang"
+	"infix-meta@2025-12-10.yang"
 	"[email protected]"
 	"[email protected]"
 	"[email protected]"

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

@@ -37,6 +37,11 @@ submodule infix-if-wifi {
      It supports WiFi client mode and enables comprehensive management of
      wireless connections, including encryption, country codes, and scanning.";
 
+  revision 2025-12-12 {
+    description "Adapt to new revision of model ietf-keystore.";
+    reference "internal";
+  }
+
   revision 2025-05-27 {
     description "Initial revision.";
     reference "internal";
@@ -121,7 +126,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

…yang/confd/[email protected] …yang/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]

@@ -11,6 +11,10 @@ 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";
   }
@@ -46,14 +50,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";
         }

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

@@ -12,6 +12,10 @@ module infix-meta {
   description  "Infix metadata.";
 
 
+  revision 2025-12-10 {
+    description "Remove the obsolete, not allowed in libyang.";
+    reference "internal";
+  }
   revision 2024-10-18 {
     description "Mark entire meta container obsolete.";
     reference "internal";
@@ -29,10 +33,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;
     }