From: Jamo Luhrsen <jluhrsen@redhat.com>
Date: Mon, 25 Jun 2018 20:15:02 +0000 (-0700)
Subject: Cleanup for Check Service Status
X-Git-Tag: pre-potassium~720
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F19%2F73419%2F2;p=integration%2Ftest.git

Cleanup for Check Service Status

We got https://git.opendaylight.org/gerrit/73392 in fast
to fix failing tests, but wanted to add the cleanup I
noticed when I looked at the already merged patch

Change-Id: Ie03cf983ce1638974d6c6821b2ebd1b0d56ac616
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>
---

diff --git a/csit/libraries/Genius.robot b/csit/libraries/Genius.robot
index 7873967ece..4d8f02319b 100644
--- a/csit/libraries/Genius.robot
+++ b/csit/libraries/Genius.robot
@@ -96,8 +96,8 @@ check establishment
 Check Service Status
     [Arguments]    ${odl_ip}    ${system_ready_state}    ${service_state}    @{service_list}
     [Documentation]    Issues the karaf shell command showSvcStatus to verify the ready and service states are the same as the arguments passed
-    ${service_status_output} =    Run Keyword If    ${NUM_ODL_SYSTEM}>1    Issue_Command_On_Karaf_Console    showSvcStatus -n ${odl_ip}    ${odl_ip}    8101
-    ...    ELSE    Issue_Command_On_Karaf_Console    showSvcStatus    ${odl_ip}    8101
+    ${service_status_output} =    Run Keyword If    ${NUM_ODL_SYSTEM} > 1    Issue_Command_On_Karaf_Console    showSvcStatus -n ${odl_ip}    ${odl_ip}    ${KARAF_SHELL_PORT}
+    ...    ELSE    Issue_Command_On_Karaf_Console    showSvcStatus    ${odl_ip}    ${KARAF_SHELL_PORT}
     Should Contain    ${service_status_output}    ${system_ready_state}
     : FOR    ${service}    IN    @{service_list}
     \    Should Match Regexp    ${service_status_output}    ${service} +: ${service_state}