Fix karaf client issue in functional test library 46/110946/1
authorGilles Thouenon <gilles.thouenon@orange.com>
Thu, 21 Mar 2024 10:07:38 +0000 (11:07 +0100)
committerGilles Thouenon <gilles.thouenon@orange.com>
Thu, 21 Mar 2024 10:07:38 +0000 (11:07 +0100)
- 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 <gilles.thouenon@orange.com>
Change-Id: I002c3c154d49ff5f128929084a5802f9eea16c9f

tests/transportpce_tests/common/test_utils.py

index 90f237172783a0cc599c738c0ba30bc3d540f27a..b43346f87cef9ca3bb277a1d590cda21c18be54d 100644 (file)
@@ -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