From 2c309c018c744b1dbe0d5eb053f3bffd3d4885e6 Mon Sep 17 00:00:00 2001 From: Robert Varga 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 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 @@ $DEVICE_NAME $DEVICE_IP $DEVICE_PORT - $DEVICE_USER - $DEVICE_PASSWORD + + $DEVICE_USER + $DEVICE_PASSWORD + false 0 $SCHEMA_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 @@ $DEVICE_NAME $DEVICE_IP $DEVICE_PORT - $DEVICE_USER - $DEVICE_PASSWORD + + $DEVICE_USER + $DEVICE_PASSWORD + false 0 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 @@ $DEVICE_NAME
$DEVICE_IP
$DEVICE_PORT - $DEVICE_USER - $DEVICE_PASSWORD + + $DEVICE_USER + $DEVICE_PASSWORD + false prefix:netty-event-executor 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 @@ $DEVICE_NAME $DEVICE_IP $DEVICE_PORT - $DEVICE_USER - $DEVICE_PASSWORD + + $DEVICE_USER + $DEVICE_PASSWORD + false 0 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 @@ $DEVICE_NAME $DEVICE_IP $DEVICE_PORT - $DEVICE_USER - $DEVICE_PASSWORD + + $DEVICE_USER + $DEVICE_PASSWORD + false 0 -- 2.36.6