From ffae3750e10cd5a93407f7d43380723c636e6e25 Mon Sep 17 00:00:00 2001 From: Gilles Thouenon Date: Thu, 21 Mar 2024 11:07:38 +0100 Subject: [PATCH] Fix karaf client issue in functional test library - Remove logout from the bash command sent with subprocess run to avoid having a runtime exception in karaf when we install the odl-transportpce-nbinotifications feature - remove an useless variable in sims_update_cp_port_ntcf method JIRA: TRNSPRTPCE-782 Signed-off-by: Gilles Thouenon Change-Id: I002c3c154d49ff5f128929084a5802f9eea16c9f --- tests/transportpce_tests/common/test_utils.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/transportpce_tests/common/test_utils.py b/tests/transportpce_tests/common/test_utils.py index 90f237172..b43346f87 100644 --- a/tests/transportpce_tests/common/test_utils.py +++ b/tests/transportpce_tests/common/test_utils.py @@ -261,7 +261,7 @@ def install_karaf_feature(feature_name: str): # -b option needed below because of Karaf client bug reporte in the JIRA ticket mentioned above return subprocess.run([executable, '-b'], input='feature:install ' + feature_name + '\n feature:list | grep ' - + feature_name + ' \n logout \n', + + feature_name + ' \n', universal_newlines=True, check=False) @@ -734,8 +734,7 @@ def sims_update_cp_port_ntcf(sim: tuple, circuitpack: str, payload: dict): username=NODES_LOGIN, password=NODES_PWD) as session: mgr = Manager(session, timeout=120) - reply = mgr.edit_config(xml_body, target="candidate", default_operation="merge") - if "None" in str(reply): + mgr.edit_config(xml_body, target="candidate", default_operation="merge") return True return False -- 2.36.6