Rename "first_case_ok" to "netconf_is_ready"

[integration/test.git] / csit / suites / netconf / ready / netconfready.robot

diff --git a/csit/suites/netconf/ready/netconfready.robot b/csit/suites/netconf/ready/netconfready.robot
index 4803053627d3dc8ed3f1071eecd7af5b6f9ed097..125e9c275a6f1381c642c4fffa36001c72ba202b 100644 (file)
--- a/csit/suites/netconf/ready/netconfready.robot
+++ b/csit/suites/netconf/ready/netconfready.robot
@@ -30,7 +30,7 @@ Resource          ${CURDIR}/../../../libraries/Utils.robot
 Variables         ${CURDIR}/../../../variables/Variables.py
 
 *** Variables ***
-${first_case_ok}    False
+${netconf_is_ready}    False
 ${NETCONFREADY_WAIT}    60s
 ${DEBUG_LOGGING_FOR_EVERYTHING}    False
 
@@ -39,15 +39,20 @@ Check_Whether_Netconf_Connector_Works
     [Documentation]    Make one request to netconf-connector and see if it works.
     [Tags]    exclude
     Check_Netconf_Connector
-    BuiltIn.Set_Suite_Variable    ${first_case_ok}    True
+    BuiltIn.Set_Suite_Variable    ${netconf_is_ready}    True
     [Teardown]    Utils.Report_Failure_Due_To_Bug    4708
 
 Wait_For_Netconf_Connector
     [Documentation]    Attempt to wait for the netconf-connector for configurable time.
     [Tags]    critical
-    BuiltIn.Run_Keyword_Unless    ${first_case_ok}    BuiltIn.Wait_Until_Keyword_Succeeds    ${NETCONFREADY_WAIT}    1s    Check_Netconf_Connector
+    BuiltIn.Run_Keyword_Unless    ${netconf_is_ready}    BuiltIn.Wait_Until_Keyword_Succeeds    ${NETCONFREADY_WAIT}    1s    Check_Netconf_Connector
     [Teardown]    Utils.Report_Failure_Due_To_Bug    4583
 
+Check_Whether_Netconf_Connector_Can_Pretty_Print
+    [Documentation]    Make one request to netconf-connector and see if it works.
+    [Tags]    critical
+    Check_Netconf_Connector    ?prettyPrint=true
+
 *** Keywords ***
 Setup_Everything
     [Documentation]    Setup requests library and log into karaf.log that the netconf readiness wait starts.
@@ -65,7 +70,8 @@ Teardown_Everything
     RequestsLibrary.Delete_All_Sessions
 
 Check_Netconf_Connector
+    [Arguments]    ${pretty_print}=${EMPTY}
     [Documentation]    Make a request to netconf connector's list of mounted devices and check that the request was successful.
-    ${response}=    RequestsLibrary.Get    ses    restconf/config/network-topology:network-topology/topology/topology-netconf/node/controller-config/yang-ext:mount/config:modules/module/odl-sal-netconf-connector-cfg:sal-netconf-connector/controller-config/?prettyPrint=true
+    ${response}=    RequestsLibrary.Get    ses    restconf/config/network-topology:network-topology/topology/topology-netconf/node/controller-config/yang-ext:mount/config:modules/module/odl-sal-netconf-connector-cfg:sal-netconf-connector/controller-config${pretty_print}
     BuiltIn.Log    ${response.text}
     BuiltIn.Should_Be_Equal_As_Strings    ${response.status_code}    200