From 2c309c018c744b1dbe0d5eb053f3bffd3d4885e6 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 22 Mar 2024 16:30:46 +0100
Subject: [PATCH] Correct NETCONF device configuration

We are using deprecated leaves, which are now removed. Migrate to their
long-available replacements.

Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Change-Id: Ie9b281e6067f58cdd30d46fc34c09005e9ef7025
---
 csit/variables/netconf/device/bug8086/data.xml              | 6 ++++--
 .../netconf/device/configure-via-topology/data.xml          | 6 ++++--
 csit/variables/netconf/device/default/data.xml              | 6 ++++--
 csit/variables/netconf/device/full-uri-device/data.xml      | 6 ++++--
 csit/variables/netconf/device/full-uri-mount/data.xml       | 6 ++++--
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/csit/variables/netconf/device/bug8086/data.xml b/csit/variables/netconf/device/bug8086/data.xml
index cd62c97b8d..cd5c26ebe6 100644
--- a/csit/variables/netconf/device/bug8086/data.xml
+++ b/csit/variables/netconf/device/bug8086/data.xml
@@ -2,8 +2,10 @@
   <node-id>$DEVICE_NAME</node-id>
   <host xmlns="urn:opendaylight:netconf-node-topology">$DEVICE_IP</host>
   <port xmlns="urn:opendaylight:netconf-node-topology">$DEVICE_PORT</port>
-  <username xmlns="urn:opendaylight:netconf-node-topology">$DEVICE_USER</username>
-  <password xmlns="urn:opendaylight:netconf-node-topology">$DEVICE_PASSWORD</password>
+  <login-password-unencrypted xmlns="urn:opendaylight:netconf-node-topology">
+    <username>$DEVICE_USER</username>
+    <password>$DEVICE_PASSWORD</password>
+  </login-password-unencrypted>
   <tcp-only xmlns="urn:opendaylight:netconf-node-topology">false</tcp-only>
   <keepalive-delay xmlns="urn:opendaylight:netconf-node-topology">0</keepalive-delay>
   <schema-cache-directory xmlns="urn:opendaylight:netconf-node-topology">$SCHEMA_DIRECTORY</schema-cache-directory>
diff --git a/csit/variables/netconf/device/configure-via-topology/data.xml b/csit/variables/netconf/device/configure-via-topology/data.xml
index 6c8b352604..2b453c91de 100644
--- a/csit/variables/netconf/device/configure-via-topology/data.xml
+++ b/csit/variables/netconf/device/configure-via-topology/data.xml
@@ -2,8 +2,10 @@
   <node-id>$DEVICE_NAME</node-id>
   <host xmlns="urn:opendaylight:netconf-node-topology">$DEVICE_IP</host>
   <port xmlns="urn:opendaylight:netconf-node-topology">$DEVICE_PORT</port>
-  <username xmlns="urn:opendaylight:netconf-node-topology">$DEVICE_USER</username>
-  <password xmlns="urn:opendaylight:netconf-node-topology">$DEVICE_PASSWORD</password>
+  <login-password-unencrypted xmlns="urn:opendaylight:netconf-node-topology">
+    <username>$DEVICE_USER</username>
+    <password>$DEVICE_PASSWORD</password>
+  </login-password-unencrypted>
   <tcp-only xmlns="urn:opendaylight:netconf-node-topology">false</tcp-only>
   <keepalive-delay xmlns="urn:opendaylight:netconf-node-topology">0</keepalive-delay>
 </node>
diff --git a/csit/variables/netconf/device/default/data.xml b/csit/variables/netconf/device/default/data.xml
index 295f00c35e..052d161000 100644
--- a/csit/variables/netconf/device/default/data.xml
+++ b/csit/variables/netconf/device/default/data.xml
@@ -3,8 +3,10 @@
   <name>$DEVICE_NAME</name>
   <address xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">$DEVICE_IP</address>
   <port xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">$DEVICE_PORT</port>
-  <username xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">$DEVICE_USER</username>
-  <password xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">$DEVICE_PASSWORD</password>
+  <login-password-unencrypted xmlns="urn:opendaylight:netconf-node-topology">
+    <username>$DEVICE_USER</username>
+    <password>$DEVICE_PASSWORD</password>
+  </login-password-unencrypted>
   <tcp-only xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">false</tcp-only>
   <event-executor xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">
     <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netty">prefix:netty-event-executor</type>
diff --git a/csit/variables/netconf/device/full-uri-device/data.xml b/csit/variables/netconf/device/full-uri-device/data.xml
index 6c8b352604..2b453c91de 100644
--- a/csit/variables/netconf/device/full-uri-device/data.xml
+++ b/csit/variables/netconf/device/full-uri-device/data.xml
@@ -2,8 +2,10 @@
   <node-id>$DEVICE_NAME</node-id>
   <host xmlns="urn:opendaylight:netconf-node-topology">$DEVICE_IP</host>
   <port xmlns="urn:opendaylight:netconf-node-topology">$DEVICE_PORT</port>
-  <username xmlns="urn:opendaylight:netconf-node-topology">$DEVICE_USER</username>
-  <password xmlns="urn:opendaylight:netconf-node-topology">$DEVICE_PASSWORD</password>
+  <login-password-unencrypted xmlns="urn:opendaylight:netconf-node-topology">
+    <username>$DEVICE_USER</username>
+    <password>$DEVICE_PASSWORD</password>
+  </login-password-unencrypted>
   <tcp-only xmlns="urn:opendaylight:netconf-node-topology">false</tcp-only>
   <keepalive-delay xmlns="urn:opendaylight:netconf-node-topology">0</keepalive-delay>
 </node>
diff --git a/csit/variables/netconf/device/full-uri-mount/data.xml b/csit/variables/netconf/device/full-uri-mount/data.xml
index 6c8b352604..2b453c91de 100644
--- a/csit/variables/netconf/device/full-uri-mount/data.xml
+++ b/csit/variables/netconf/device/full-uri-mount/data.xml
@@ -2,8 +2,10 @@
   <node-id>$DEVICE_NAME</node-id>
   <host xmlns="urn:opendaylight:netconf-node-topology">$DEVICE_IP</host>
   <port xmlns="urn:opendaylight:netconf-node-topology">$DEVICE_PORT</port>
-  <username xmlns="urn:opendaylight:netconf-node-topology">$DEVICE_USER</username>
-  <password xmlns="urn:opendaylight:netconf-node-topology">$DEVICE_PASSWORD</password>
+  <login-password-unencrypted xmlns="urn:opendaylight:netconf-node-topology">
+    <username>$DEVICE_USER</username>
+    <password>$DEVICE_PASSWORD</password>
+  </login-password-unencrypted>
   <tcp-only xmlns="urn:opendaylight:netconf-node-topology">false</tcp-only>
   <keepalive-delay xmlns="urn:opendaylight:netconf-node-topology">0</keepalive-delay>
 </node>
-- 
2.36.6