X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Flib%2Fjuju_lib.robot;h=45208a8b82b48805d78f17854ec3b1e38e1f7fa4;hb=8ceaee06848023c31ec4a18becff9ab8ff5d517f;hp=62f557e2ca791039885a8928439f1b1c925716a1;hpb=f4ebaa88025189ede4f073ab8a1f27c95efff867;p=osm%2Ftests.git

diff --git a/robot-systest/lib/juju_lib.robot b/robot-systest/lib/juju_lib.robot
index 62f557e..45208a8 100644
--- a/robot-systest/lib/juju_lib.robot
+++ b/robot-systest/lib/juju_lib.robot
@@ -16,19 +16,53 @@ ${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}
+    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}
+    Log   ${stdout}
     ${model_name}=   Set Variable   ${kdu_name}-${ns_id}
     Should Be Equal As Strings   ${model_name}   ${stdout}
     [Return]   ${stdout}
+
+Get Application Name VDU Level Charm
+    [Arguments]   ${endpoint}   ${username}   ${password}   ${privatekey}   ${model_name}   ${vdu_profile_id}   ${ee_name}
+
+    Should Not Be Empty   ${model_name}
+    ${host}=   Remove String Using Regexp   ${endpoint}   :([0-9]+)$
+    ${stdout}=   Execute Remote Command Check Rc Return Output   ${host}   ${username}   ${password}   ${privatekey}   juju status -m ${model_name} | grep "\\-vdu" | grep -v "*" | grep -i ${vdu_profile_id} | cut -f1 -d " "
+    Log   ${stdout}
+    Should Not Be Empty   ${stdout}
+    Should Contain   ${stdout}   ${ee_name}
+    [Return]   ${stdout}
+
+Get Application Name NS Level Charm
+    [Arguments]   ${endpoint}   ${username}   ${password}   ${privatekey}   ${model_name}   ${charm_name}
+
+    Should Not Be Empty   ${model_name}
+    ${host}=   Remove String Using Regexp   ${endpoint}   :([0-9]+)$
+    ${stdout}=   Execute Remote Command Check Rc Return Output   ${host}   ${username}   ${password}   ${privatekey}   juju status -m ${model_name} | grep "\\-ns" | grep -v "*" | grep -i ${charm_name} | cut -f1 -d " "
+    Log   ${stdout}
+    Should Not Be Empty   ${stdout}
+    [Return]   ${stdout}
+
+Get Application Name VNF Level Charm
+    [Arguments]   ${endpoint}   ${username}   ${password}   ${privatekey}   ${model_name}   ${vnf_profile_id}   ${ee_name}
+
+    Should Not Be Empty   ${model_name}
+    ${host}=   Remove String Using Regexp   ${endpoint}   :([0-9]+)$
+    ${stdout}=   Execute Remote Command Check Rc Return Output   ${host}   ${username}   ${password}   ${privatekey}   juju status -m ${model_name} | grep "\\-vnf" | grep -v "*" | grep -i ${vnf_profile_id} | cut -f1 -d " "
+    Log   ${stdout}
+    Should Not Be Empty   ${stdout}
+    Should Contain   ${stdout}   ${ee_name}
+    [Return]   ${stdout}
\ No newline at end of file