From ce136a5399a4df9c2971bfd496760f460a8129a4 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 29 Jan 2026 22:16:30 +0000
Subject: [PATCH 1/2] Initial plan


From 46f25d7fd4a01d1434a9715084637d1a1711ac5d Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 29 Jan 2026 22:19:57 +0000
Subject: [PATCH 2/2] Fix migration script to wrap symmetric-key in key-type
 container

The migration script was incorrectly placing symmetric-key directly
under the symmetric-key node, but according to the YANG schema, it
should be wrapped in a key-type container. This fixes the libyang
error: "Node 'cleartext-key' not found as a child of 'symmetric-key'
node" when migrating from v1.5 to v1.7.

Co-authored-by: troglobit <183517+troglobit@users.noreply.github.com>
---
 .../share/migrate/1.7/20-keystore-cleartext-key-rename.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/confd/share/migrate/1.7/20-keystore-cleartext-key-rename.sh b/src/confd/share/migrate/1.7/20-keystore-cleartext-key-rename.sh
index b55b42d79..7bc9a4ba0 100755
--- a/src/confd/share/migrate/1.7/20-keystore-cleartext-key-rename.sh
+++ b/src/confd/share/migrate/1.7/20-keystore-cleartext-key-rename.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Rename cleartext-key to symmetric-key
+# Rename cleartext-key to symmetric-key and wrap in key-type container
 
 file=$1
 temp=${file}.tmp
@@ -8,10 +8,12 @@ jq '
 if .["ietf-keystore:keystore"]?."symmetric-keys"?."symmetric-key" then
   .["ietf-keystore:keystore"]."symmetric-keys"."symmetric-key" |= map(
     if ."infix-keystore:cleartext-key" then
-      # Rename cleartext-key to symmetric-key
+      # Rename cleartext-key to symmetric-key and wrap in key-type
       ."infix-keystore:cleartext-key" as $key_value |
       del(."infix-keystore:cleartext-key") | . + {
-        "infix-keystore:symmetric-key": $key_value
+        "key-type": {
+          "infix-keystore:symmetric-key": $key_value
+        }
       }
     else
       .