From 7e4328a86d625a850ed808bbab0cfcbb1f6fee40 Mon Sep 17 00:00:00 2001 From: Guillermo Calvino Date: Fri, 18 Nov 2022 16:52:50 +0100 Subject: [PATCH] Bug 2194: OSM_HOSTNAME variable doesn't get the IP of the host when robot tests are used with Charmed OSM Change-Id: I96882f584dcdab60cafa27edcf7dbdae7fb65a4b Signed-off-by: Guillermo Calvino --- robot-systest/lib/juju_lib.robot | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/robot-systest/lib/juju_lib.robot b/robot-systest/lib/juju_lib.robot index 94db455..27601cc 100644 --- a/robot-systest/lib/juju_lib.robot +++ b/robot-systest/lib/juju_lib.robot @@ -16,17 +16,19 @@ ${success_return_code} 0 *** Keywords *** Get Scale Number - [Arguments] ${host} ${username} ${password} ${privatekey} ${application_name} ${model_name} + [Arguments] ${endpoint} ${username} ${password} ${privatekey} ${application_name} ${model_name} Should Not Be Empty ${application_name} ${model_name} + ${host}= Remove String Using Regexp ${endpoint} :([0-9]+)$ ${stdout}= Execute Remote Command Check Rc Return Output ${host} ${username} ${password} ${privatekey} juju show-status ${application_name} --format yaml -m ${model_name} | grep scale | awk -F ': ' '{print $2}' log ${stdout} [Return] ${stdout} Get Model Name - [Arguments] ${host} ${username} ${password} ${privatekey} ${ns_id} ${kdu_name} + [Arguments] ${endpoint} ${username} ${password} ${privatekey} ${ns_id} ${kdu_name} Should Not Be Empty ${ns_id} ${kdu_name} + ${host}= Remove String Using Regexp ${endpoint} :([0-9]+)$ ${stdout}= Execute Remote Command Check Rc Return Output ${host} ${username} ${password} ${privatekey} juju models | grep -i ${kdu_name} | grep -i ${ns_id} | cut -f1 -d " " log ${stdout} ${model_name}= Set Variable ${kdu_name}-${ns_id} -- 2.25.1