X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Fnetconf%2FMDSAL%2Fnorthbound.robot;h=80e26b6e9ab0432ca5f8da667d9d157658cd9cb8;hb=618bb37f160c06fe80ccb28bb1e567830a61289d;hp=df92fb9d33d2cc8ea39c8f67d7ef7b75e0594362;hpb=0ebf44ad8edd6d4fae6e556ffbdab35948383ae0;p=integration%2Ftest.git
diff --git a/csit/suites/netconf/MDSAL/northbound.robot b/csit/suites/netconf/MDSAL/northbound.robot
index df92fb9d33..80e26b6e9a 100644
--- a/csit/suites/netconf/MDSAL/northbound.robot
+++ b/csit/suites/netconf/MDSAL/northbound.robot
@@ -21,10 +21,15 @@ Documentation Metconf MDSAL Northbound test suite.
... for simplicity.
...
... TODO: Change the 4 testcases to use unique message IDs.
+...
+... TODO: There are many sections with too many "Should_[Not_]Contain" keyword
+... invocations (see Check_Multiple_Modules_Merge_Replace for a particularly bad
+... example). Create a resource that will be able to extract the data from the
+... requests and search for them in the response, then convert to usage of this
+... resource (think "Thou shall not repeat yourself").
Suite Setup Setup_Everything
Suite Teardown Teardown_Everything
-Test Setup SetupUtils.Setup_Test_With_Logging_And_Fast_Failing
-Test Teardown FailFast.Start_Failing_Fast_If_This_Failed
+Test Setup SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
Library RequestsLibrary
Library SSHLibrary
Resource ${CURDIR}/../../../libraries/FailFast.robot
@@ -41,9 +46,8 @@ ${ssh_netconf_pid} -1
*** Test Cases ***
Connect_To_ODL_Netconf
[Documentation] Connect to ODL Netconf and fail if that is not possible.
+ Create_ODL_Netconf_Connection
Open_ODL_Netconf_Connection
- ${hello_message}= Get_Data hello
- Transmit_Message ${hello_message}
Get_Config_Running
[Documentation] Make sure the configuration has only the default elements in it.
@@ -62,9 +66,19 @@ Additional_Attributes_In_Message
BuiltIn.Should_Contain ${reply} additional="otherthing"
BuiltIn.Should_Contain ${reply} xmlns:prefix="http://www.example.com/my-schema-example.html"
-Edit_Config_Modules_Merge
+Send_Stuff_In_Undefined_Namespace
+ [Documentation] Try to send something within an undefined namespace and check the reply complains about the nonexistent namespace and element.
+ ${reply}= Load_And_Send_Message merge-nonexistent-namespace
+ BuiltIn.Set_Test_Variable ${bugno} 5125
+ BuiltIn.Should_Not_Contain ${reply} java.lang.NullPointerException
+ BuiltIn.Set_Test_Variable ${bugno} ${EMPTY}
+ BuiltIn.Should_Contain ${reply} urn:this:is:in:a:nonexistent:namespace
+ BuiltIn.Should_Contain ${reply} does-not-exist
+ [Teardown] BuiltIn.Run_Keyword_If '${bugno}' != '${EMPTY}' Utils.Report_Failure_Due_To_Bug 5125
+
+Edit_Config_First_Batch_Merge
[Documentation] Request a "merge" operation adding an element in candidate configuration and check the reply.
- Perform_Test config-modules-merge-1
+ Perform_Test merge-1
Get_Config_Running_To_Confirm_No_Edit_Before_Commit
[Documentation] Make sure the running configuration is still unchanged as the change was not commited yet.
@@ -74,28 +88,36 @@ Commit_Edit
[Documentation] Commit the change and check the reply.
Perform_Test commit-edit
-name0_In_Config_Running_To_Confirm_Edit_After_Commit
+First_Batch_In_Config_Running_To_Confirm_Edit_After_Commit
[Documentation] Check that the change is now in the configuration.
${reply}= Load_And_Send_Message get-config-edit-after-commit
- BuiltIn.Should_Contain ${reply} name0
+ Check_First_Batch_Data_Present ${reply}
+
+Terminate_Connection_Gracefully
+ [Documentation] Close the session and disconnect.
+ Close_ODL_Netconf_Connection_Gracefully
-name0_In_Config_Modules_Via_Restconf
- [Documentation] Check that the change is also visible through Restconf.
- ${data}= Utils.Get_Data_From_URI config config:modules headers=${ACCEPT_XML}
- BuiltIn.Should_Contain ${data} name0
+Reconnect_To_ODL_Netconf_After_Graceful_Session_End
+ [Documentation] Reconnect to ODL Netconf and fail if that is not possible.
+ Open_ODL_Netconf_Connection
+
+First_Batch_In_Config_Running_After_Reconnect
+ [Documentation] Check that the change is now in the configuration.
+ ${reply}= Load_And_Send_Message get-config-edit-after-commit
+ Check_First_Batch_Data_Present ${reply}
-Edit_Config_Modules_Create_Shall_Fail_Now
+Edit_Config_Create_Shall_Fail_Now
[Documentation] Request a "create" operation of an element that already exists and check that it fails with the correct error (RFC 6241, section 7.2, operation "create").
- Perform_Test config-modules-create
+ Perform_Test create
-Delete_Modules
+Delete_First_Batch
[Documentation] Delete the created element from the candidate configuration and check the reply.
- Perform_Test config-modules-delete
+ Perform_Test delete
Get_Config_Running_To_Confirm_No_Delete_Before_Commit
[Documentation] Make sure the element is still present in the running configuration as the delete command was not committed yet.
${reply}= Load_And_Send_Message get-config-no-delete-before-commit
- BuiltIn.Should_Contain ${reply} name0
+ Check_First_Batch_Data_Present ${reply}
Commit_Delete
[Documentation] Commit the deletion of the element and check the reply.
@@ -105,64 +127,67 @@ Get_Config_Running_To_Confirm_Delete_After_Commit
[Documentation] Check that the element is gone.
Check_Test_Objects_Not_Present_In_Config get-config-delete-after-commit
-Restconf_Get_Modules_Shall_Return_404
- [Documentation] Check that "Not Found" is returned when Restconf is asked for the deleted element.
- ${response}= RequestsLibrary.Get config config:modules ${ACCEPT_XML}
- BuiltIn.Should_Be_Equal_As_Strings ${response.status_code} 404
-
Commit_No_Transaction
- [Documentation] Attempt to perform "commit" when there are no changes in the candidate configuration and check that it fails with the correct error.
- Test_Commit_With_No_Transactions
+ [Documentation] Attempt to perform "commit" when there are no changes in the candidate configuration and check that it returns OK status.
+ Perform_Test commit-no-transaction
-Edit_Config_Another_Modules_Merge
- [Documentation] Create the element in the candidate configuration again and check the reply.
- Perform_Test config-modules-merge-2
+Edit_Config_Second_Batch_Merge
+ [Documentation] Create an element to be discarded and check the reply.
+ Perform_Test merge-2
-Get_Config_Candidate
- [Documentation] Check that the element is present in the candidate configuration.
+Get_And_Check_Config_Candidate_For_Discard
+ [Documentation] Check that the element to be discarded is present in the candidate configuration.
${reply}= Load_And_Send_Message get-config-candidate
- BuiltIn.Should_Contain ${reply} name1
- BuiltIn.Should_Not_Contain ${reply} name0
+ Check_First_Batch_Data_Not_Present ${reply}
+ Check_Second_Batch_Data_Present ${reply}
-Discard_Changes
+Discard_Changes_Using_Discard_Request
[Documentation] Ask the server to discard the candidate and check the reply.
Perform_Test commit-discard
-Get_Config_Candidate_To_Confirm_Discard
+Get_And_Check_Config_Candidate_To_Confirm_Discard
[Documentation] Check that the element was really discarded.
Check_Test_Objects_Not_Present_In_Config get-config-candidate-discard
-Edit_Config_Modules_Multiple_Modules_Merge_1
- [Documentation] Create the element with "name2" subelement again and check the reply.
+Edit_Config_Multiple_Batch_Merge_Create
+ [Documentation] Use a create request with the third batch to create the infrastructure.
+ Perform_Test merge-multiple-create
+
+Edit_Config_Multiple_Batch_Merge_Third
+ [Documentation] Use a create request with the third batch to create the infrastructure.
Perform_Test merge-multiple-1
-Edit_Config_Modules_Multiple_Modules_Merge_2
- [Documentation] Add a "name3" subelement to the element and check the reply.
+Edit_Config_Multiple_Batch_Merge_Fourth
+ [Documentation] Use a merge request with the third batch to create the infrastructure.
Perform_Test merge-multiple-2
-Edit_Config_Modules_Multiple_Modules_Merge_3
+Edit_Config_Multiple_Batch_Merge_Fifth
[Documentation] Add a "name4" subelement to the element and check the reply.
Perform_Test merge-multiple-3
-Commit_Multiple_Modules_Merge
+Commit_Multiple_Merge
[Documentation] Commit the changes and check the reply.
Perform_Test merge-multiple-commit
-name2_name3_name4_In_Running_Config
+Multiple_Batch_Data_In_Running_Config
[Documentation] Check that the 3 subelements are now present in the running configuration.
${reply}= Load_And_Send_Message merge-multiple-check
- BuiltIn.Should_Contain ${reply} name2
- BuiltIn.Should_Contain ${reply} name3
- BuiltIn.Should_Contain ${reply} name4
-
-name2_name3_name4_In_Config_Modules_Via_Restconf
- [Documentation] Check that the 3 subelements are visible via Restconf.
- ${data}= Utils.Get_Data_From_URI config config:modules headers=${ACCEPT_XML}
- BuiltIn.Should_Contain ${data} name2
- BuiltIn.Should_Contain ${data} name3
- BuiltIn.Should_Contain ${data} name4
-
-Edit_Multiple_Modules_Merge
+ Check_Multiple_Batch_Data_Present ${reply}
+
+Abort_Connection_To_Simulate_Session_Failure
+ [Documentation] Simulate session failure by disconnecting without terminating the session.
+ Abort_ODL_Netconf_Connection
+
+Reconnect_To_ODL_Netconf_After_Session_Failure
+ [Documentation] Reconnect to ODL Netconf and fail if that is not possible.
+ Open_ODL_Netconf_Connection
+
+Multiple_Batch_Data_In_Running_Config_After_Session_Failure
+ [Documentation] Check that the 3 subelements are now present in the running configuration.
+ ${reply}= Load_And_Send_Message merge-multiple-check
+ Check_Multiple_Batch_Data_Present ${reply}
+
+Edit_Multiple_Merge_Data
[Documentation] Add another subelement named "test" to the element and check the reply.
Perform_Test merge-multiple-edit
@@ -173,7 +198,10 @@ Commit_Multiple_Modules_Merge_Edit
Check_Multiple_Modules_Merge_Edit
[Documentation] Check that the "test" subelement exists and has correct value for "port" subelement.
${reply}= Load_And_Send_Message merge-multiple-edit-check
- BuiltIn.Should_Contain ${reply} 2022
+ BuiltIn.Should_Contain ${reply} test
+ BuiltIn.Should_Contain ${reply} Dixi
+ BuiltIn.Should_Contain ${reply} BMW
+ BuiltIn.Should_Contain ${reply} 1928
Update_Multiple_Modules_Merge
[Documentation] Update the value of the "port" subelement of the "test" subelement and check the reply.
@@ -186,7 +214,13 @@ Commit_Multiple_Modules_Merge_Update
Check_Multiple_Modules_Merge_Update
[Documentation] Check that the value of the "port" was really updated.
${reply}= Load_And_Send_Message merge-multiple-update-check
- BuiltIn.Should_Contain ${reply} 3000
+ BuiltIn.Should_Contain ${reply} test
+ BuiltIn.Should_Contain ${reply} Bentley Speed Six
+ BuiltIn.Should_Contain ${reply} Bentley
+ BuiltIn.Should_Contain ${reply} 1930
+ BuiltIn.Should_Not_Contain ${reply} Dixi
+ BuiltIn.Should_Not_Contain ${reply} BMW
+ BuiltIn.Should_Not_Contain ${reply} 1928
Replace_Multiple_Modules_Merge
[Documentation] Replace the content of the "test" with another completely different and check the reply.
@@ -199,34 +233,53 @@ Commit_Multiple_Modules_Merge_Replace
Check_Multiple_Modules_Merge_Replace
[Documentation] Check that the new content is there and the old content is gone.
${reply}= Load_And_Send_Message merge-multiple-replace-check
- BuiltIn.Should_Contain ${reply} test
- BuiltIn.Should_Contain ${reply}
10.194.132.42
- BuiltIn.Should_Contain ${reply} false
- BuiltIn.Should_Contain ${reply} 4000
- BuiltIn.Should_Contain ${reply} admin
- BuiltIn.Should_Contain ${reply} admin
- BuiltIn.Should_Not_Contain ${reply} global-event-executor
- BuiltIn.Should_Not_Contain ${reply} binding-osgi-broker
- BuiltIn.Should_Not_Contain ${reply} dom-broker
- BuiltIn.Should_Not_Contain ${reply} global-netconf-dispatcher
- BuiltIn.Should_Not_Contain ${reply} global-netconf-processing-executor
-
-Remove_Multiple_Modules
- [Documentation] Remove the testing "module" element and all its subelements and check the reply.
+ BuiltIn.Should_Contain ${reply} REPLACE
+ BuiltIn.Should_Contain ${reply} FIAT
+ BuiltIn.Should_Contain ${reply} Panda
+ BuiltIn.Should_Contain ${reply} 2003
+ BuiltIn.Should_Contain ${reply} REPLACE
+ BuiltIn.Should_Not_Contain ${reply} TOY001
+ BuiltIn.Should_Not_Contain ${reply} CUST001
+ BuiltIn.Should_Not_Contain ${reply} TOY001
+ BuiltIn.Should_Not_Contain ${reply} CUST001
+ BuiltIn.Should_Not_Contain ${reply} OLD001
+ BuiltIn.Should_Not_Contain ${reply} CUST002
+ BuiltIn.Should_Not_Contain ${reply} OLD001
+ BuiltIn.Should_Not_Contain ${reply} CUST002
+ BuiltIn.Should_Not_Contain ${reply} CAROLD
+ BuiltIn.Should_Contain ${reply} CUSTOLD
+ BuiltIn.Should_Not_Contain ${reply} CAROLD
+ BuiltIn.Should_Not_Contain ${reply} CUSTOLD
+ BuiltIn.Should_Not_Contain ${reply} CARYOUNG
+ BuiltIn.Should_Contain ${reply} CUSTYOUNG
+ BuiltIn.Should_Not_Contain ${reply} CARYOUNG
+ BuiltIn.Should_Contain ${reply} CUSTYOUNG
+ BuiltIn.Should_Not_Contain ${reply} CARMID
+ BuiltIn.Should_Contain ${reply} CUSTMID
+ BuiltIn.Should_Not_Contain ${reply} CARMID
+ BuiltIn.Should_Not_Contain ${reply} CUSTMID
+ BuiltIn.Should_Not_Contain ${reply} CAROLD2
+ BuiltIn.Should_Contain ${reply} CUSTOLD2
+ BuiltIn.Should_Not_Contain ${reply} CAROLD2
+ BuiltIn.Should_Not_Contain ${reply} CUSTOLD2
+ BuiltIn.Should_Not_Contain ${reply} CUSTBAD
+ BuiltIn.Should_Not_Contain ${reply} test
+
+Remove_Test_Data
+ [Documentation] Remove the testing elements and all their subelements and check the reply.
Perform_Test merge-multiple-remove
-Commit_Multiple_Modules_Removal
+Commit_Test_Data_Removal
[Documentation] Commit the removal and check the reply.
Perform_Test merge-multiple-remove-commit
-Delete_Not_Existing_Module
- [Documentation] Attempt to delete the "module" element again and check that it fails with the correct error.
+Delete_Not_Existing_Element
+ [Documentation] Attempt to delete the elements again and check that it fails with the correct error.
Perform_Test delete-not-existing
Commit_Delete_Not_Existing_Module
[Documentation] Attempt to commit and check the reply.
- Test_Commit_With_No_Transactions
- [Teardown] Utils.Report_Failure_Due_To_Bug 4455
+ Perform_Test commit-no-transaction
Remove_Not_Existing_Module
[Documentation] Attempt to remove the "module" element again and check that the operation is "silently ignored".
@@ -247,7 +300,7 @@ Get_Data
${data}= OperatingSystem.Get_File ${datadir}${/}${name}.${dataext}
[Return] ${data}
-Open_ODL_Netconf_Connection
+Create_ODL_Netconf_Connection
[Arguments] ${host}=${CONTROLLER} ${port}=${ODL_NETCONF_PORT} ${user}=${ODL_NETCONF_USER} ${password}=${ODL_NETCONF_PASSWORD}
[Documentation] Open a netconf connecion to the given machine.
# The "-s netconf" flag (see the "SSHLibrary.Write" line below) is not
@@ -257,13 +310,25 @@ Open_ODL_Netconf_Connection
# going to need to use this operation (Netconf Performance and Scaling
# comes to my mind now as one of the things tested is the performance
# of the direct netconf connection.
+ # TODO: Make this keyword return a dictionary object with all the
+ # data about the prepared connection neatly packaged. Make all
+ # the other keywords handling the connection accept such an
+ # object and pull the data out of it rather than relying on
+ # global variables. This will allow for tracking more Netconf
+ # connections, increasing utility.
${control}= SSHLibrary.Open_Connection ${host} prompt=${ODL_SYSTEM_PROMPT} timeout=10s
Utils.Flexible_Controller_Login
BuiltIn.Set_Suite_Variable ${ssh_control} ${control}
${netconf}= SSHLibrary.Open_Connection ${host} prompt=${ODL_SYSTEM_PROMPT} timeout=10s
Utils.Flexible_Controller_Login
BuiltIn.Set_Suite_Variable ${ssh_netconf} ${netconf}
- SSHLibrary.Write sshpass -p ${password} ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ${user}\@127.0.0.1 -p ${port} -s netconf
+ BuiltIn.Set_Suite_Variable ${ssh_port} ${port}
+ BuiltIn.Set_Suite_Variable ${ssh_user} ${user}
+ BuiltIn.Set_Suite_Variable ${ssh_password} ${password}
+
+Reopen_ODL_Netconf_Connection
+ [Documentation] Reopen a closed netconf connection.
+ SSHLibrary.Write sshpass -p ${ssh_password} ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ${ssh_user}\@127.0.0.1 -p ${ssh_port} -s netconf
${hello}= SSHLibrary.Read_Until ${ODL_NETCONF_PROMPT}
SSHLibrary.Switch_Connection ${ssh_control}
${pid}= SSHLibrary.Execute_Command ps -A | grep sshpass | cut -b 1-6
@@ -271,6 +336,13 @@ Open_ODL_Netconf_Connection
SSHLibrary.Switch_Connection ${ssh_netconf}
[Return] ${hello}
+Open_ODL_Netconf_Connection
+ [Documentation] Open a prepared netconf connecion.
+ ${hello}= Reopen_ODL_Netconf_Connection
+ ${hello_message}= Get_Data hello
+ Transmit_Message ${hello_message}
+ [Return] ${hello}
+
Transmit_Message
[Arguments] ${message}
[Documentation] Transmit message to Netconf connection and discard the echo of the message.
@@ -309,7 +381,7 @@ Load_Expected_Reply
${expected}= Prepare_For_Search ${expected_reply}
[Return] ${expected}
-Close_ODL_Netconf_Connection
+Abort_ODL_Netconf_Connection
[Documentation] Correctly close the Netconf connection and make sure it is really dead.
BuiltIn.Return_From_Keyword_If ${ssh_netconf_pid} == -1
${kill_command}= BuiltIn.Set_Variable kill ${ssh_netconf_pid}
@@ -320,6 +392,10 @@ Close_ODL_Netconf_Connection
SSHLibrary.Switch_Connection ${ssh_netconf}
SSHLibrary.Read_Until_Prompt
+Close_ODL_Netconf_Connection_Gracefully
+ Perform_Test close-session
+ Abort_ODL_Netconf_Connection
+
Setup_Everything
[Documentation] Setup resources and create session for Restconf checking.
SetupUtils.Setup_Utils_For_Setup_And_Teardown
@@ -327,18 +403,82 @@ Setup_Everything
Teardown_Everything
[Documentation] Close the Netconf connection and destroy all sessions in the requests library.
- Close_ODL_Netconf_Connection
+ Abort_ODL_Netconf_Connection
RequestsLibrary.Delete_All_Sessions
+Check_First_Batch_Data
+ [Arguments] ${reply} ${keyword}
+ BuiltIn.RunKeyword ${keyword} ${reply} TOY001
+ BuiltIn.RunKeyword ${keyword} ${reply} CUST001
+ BuiltIn.RunKeyword ${keyword} ${reply} TOY001
+ BuiltIn.RunKeyword ${keyword} ${reply} CUST001
+
+Check_First_Batch_Data_Present
+ [Arguments] ${reply}
+ Check_First_Batch_Data ${reply} BuiltIn.Should_Contain
+
+Check_First_Batch_Data_Not_Present
+ [Arguments] ${reply}
+ Check_First_Batch_Data ${reply} BuiltIn.Should_Not_Contain
+
+Check_Second_Batch_Data
+ [Arguments] ${reply} ${keyword}
+ BuiltIn.RunKeyword ${keyword} ${reply} OLD001
+ BuiltIn.RunKeyword ${keyword} ${reply} CUST002
+ BuiltIn.RunKeyword ${keyword} ${reply} OLD001
+ BuiltIn.RunKeyword ${keyword} ${reply} CUST002
+
+Check_Second_Batch_Data_Present
+ [Arguments] ${reply}
+ Check_Second_Batch_Data ${reply} BuiltIn.Should_Contain
+
+Check_Multiple_Batch_Data
+ [Arguments] ${reply} ${keyword}
+ BuiltIn.RunKeyword ${keyword} ${reply} CAROLD
+ BuiltIn.RunKeyword ${keyword} ${reply} CUSTOLD
+ BuiltIn.RunKeyword ${keyword} ${reply} CAROLD
+ BuiltIn.RunKeyword ${keyword} ${reply} CUSTOLD
+ BuiltIn.RunKeyword ${keyword} ${reply} CARYOUNG
+ BuiltIn.RunKeyword ${keyword} ${reply} CUSTYOUNG
+ BuiltIn.RunKeyword ${keyword} ${reply} CARYOUNG
+ BuiltIn.RunKeyword ${keyword} ${reply} CUSTYOUNG
+ BuiltIn.RunKeyword ${keyword} ${reply} CARMID
+ BuiltIn.RunKeyword ${keyword} ${reply} CUSTMID
+ BuiltIn.RunKeyword ${keyword} ${reply} CARMID
+ BuiltIn.RunKeyword ${keyword} ${reply} CUSTMID
+ BuiltIn.RunKeyword ${keyword} ${reply} CAROLD2
+ BuiltIn.RunKeyword ${keyword} ${reply} CUSTOLD2
+ BuiltIn.RunKeyword ${keyword} ${reply} CAROLD2
+ BuiltIn.RunKeyword ${keyword} ${reply} CUSTOLD2
+
+Check_Multiple_Batch_Data_Absent
+ [Arguments] ${reply}
+ Check_Multiple_Batch_Data ${reply} BuiltIn.Should_not_Contain
+
+Check_Multiple_Batch_Data_Present
+ [Arguments] ${reply}
+ Check_Multiple_Batch_Data ${reply} BuiltIn.Should_Contain
+
+Check_Auxiliary_Data
+ [Arguments] ${reply} ${keyword}
+ BuiltIn.RunKeyword ${keyword} ${reply} CUSTBAD
+ BuiltIn.RunKeyword ${keyword} ${reply} test
+
+Check_Test_Objects_Absent
+ [Arguments] ${reply}
+ Check_First_Batch_Data_Not_Present ${reply}
+ Check_Second_Batch_Data ${reply} BuiltIn.Should_not_Contain
+ Check_Multiple_Batch_Data_Absent ${reply}
+ Check_Auxiliary_Data ${reply} BuiltIn.Should_not_Contain
+ BuiltIn.Should_not_Contain ${reply} test
+
Check_Test_Objects_Not_Present_In_Config
[Arguments] ${name}
[Documentation] Use dataset with the specified name to get the configuration and check that none of our test objects are there.
${reply}= Load_And_Send_Message ${name}
- BuiltIn.Should_Not_Contain ${reply} name0
- BuiltIn.Should_Not_Contain ${reply} name1
- BuiltIn.Should_Not_Contain ${reply} name2
- BuiltIn.Should_Not_Contain ${reply} name3
- BuiltIn.Should_Not_Contain ${reply} name4
+ Check_Test_Objects_Absent ${reply}
+ BuiltIn.Should_not_Contain ${reply} REPLACE
+ [Return] ${reply}
Perform_Test
[Arguments] ${name}
@@ -346,16 +486,10 @@ Perform_Test
${actual}= Load_And_Send_Message ${name}
${expected}= Load_Expected_Reply ${name}
${newline}= BuiltIn.Evaluate "\\r\\n"
- BuiltIn.Should_Be_Equal ${actual} ${newline}${expected}${ODL_NETCONF_PROMPT}
+ BuiltIn.Should_Be_Equal ${newline}${expected}${ODL_NETCONF_PROMPT} ${actual}
[Return] ${actual}
Send_And_Check
[Arguments] ${name} ${expected}
${actual}= Load_And_Send_Message ${name}
- BuiltIn.Should_Be_Equal ${actual} ${expected}
-
-Test_Commit_With_No_Transactions
- [Documentation] Issue a "commit" RPC request and check that it fails with "No current transactions" error.
- ${reply}= Load_And_Send_Message commit-no-transaction
- ${expected}= Load_Expected_Reply commit-no-transaction
- BuiltIn.Should_Contain ${reply} ${expected}
+ BuiltIn.Should_Be_Equal ${expected} ${actual}