From 7ebd203ee6ce7afa6e1edb541000752f986d1e4a Mon Sep 17 00:00:00 2001 From: Jozef Behran Date: Wed, 27 Jan 2016 12:07:46 +0100 Subject: [PATCH] Refactoring MDSAL to use the cars/people model The original MDSAL suite was using the configuration as its test data which caused it to start failing when the format of this data changed. The problem is that the suite shall use the cars/people model which was specifically designed for tasks like this. Change-Id: I286fea431fca30dffbac6357c77fb87c948c4d9c Signed-off-by: Jozef Behran --- csit/suites/netconf/MDSAL/northbound.robot | 240 +++++++++++------- .../MDSAL/config-modules-create-request.msg | 17 -- .../MDSAL/config-modules-delete-request.msg | 14 - .../MDSAL/config-modules-merge-1-request.msg | 17 -- .../MDSAL/config-modules-merge-2-request.msg | 17 -- ...ules-create-reply.msg => create-reply.msg} | 0 .../netconf/MDSAL/create-request.msg | 16 ++ .../MDSAL/delete-not-existing-request.msg | 6 +- ...ules-delete-reply.msg => delete-reply.msg} | 0 .../netconf/MDSAL/delete-request.msg | 19 ++ ...es-merge-1-reply.msg => merge-1-reply.msg} | 0 .../netconf/MDSAL/merge-1-request.msg | 31 +++ ...es-merge-2-reply.msg => merge-2-reply.msg} | 0 .../netconf/MDSAL/merge-2-request.msg | 31 +++ .../MDSAL/merge-multiple-1-request.msg | 28 +- .../MDSAL/merge-multiple-2-request.msg | 28 +- .../MDSAL/merge-multiple-3-request.msg | 27 +- .../MDSAL/merge-multiple-create-reply.msg | 4 + .../MDSAL/merge-multiple-create-request.msg | 29 +++ .../MDSAL/merge-multiple-edit-request.msg | 39 +-- .../MDSAL/merge-multiple-remove-request.msg | 10 +- .../MDSAL/merge-multiple-replace-request.msg | 25 +- .../MDSAL/merge-multiple-update-request.msg | 39 +-- .../MDSAL/remove-not-existing-request.msg | 6 +- 24 files changed, 388 insertions(+), 255 deletions(-) delete mode 100644 csit/variables/netconf/MDSAL/config-modules-create-request.msg delete mode 100644 csit/variables/netconf/MDSAL/config-modules-delete-request.msg delete mode 100644 csit/variables/netconf/MDSAL/config-modules-merge-1-request.msg delete mode 100644 csit/variables/netconf/MDSAL/config-modules-merge-2-request.msg rename csit/variables/netconf/MDSAL/{config-modules-create-reply.msg => create-reply.msg} (100%) create mode 100644 csit/variables/netconf/MDSAL/create-request.msg rename csit/variables/netconf/MDSAL/{config-modules-delete-reply.msg => delete-reply.msg} (100%) create mode 100644 csit/variables/netconf/MDSAL/delete-request.msg rename csit/variables/netconf/MDSAL/{config-modules-merge-1-reply.msg => merge-1-reply.msg} (100%) create mode 100644 csit/variables/netconf/MDSAL/merge-1-request.msg rename csit/variables/netconf/MDSAL/{config-modules-merge-2-reply.msg => merge-2-reply.msg} (100%) create mode 100644 csit/variables/netconf/MDSAL/merge-2-request.msg create mode 100644 csit/variables/netconf/MDSAL/merge-multiple-create-reply.msg create mode 100644 csit/variables/netconf/MDSAL/merge-multiple-create-request.msg diff --git a/csit/suites/netconf/MDSAL/northbound.robot b/csit/suites/netconf/MDSAL/northbound.robot index 87fc0fc8a6..cc912f5539 100644 --- a/csit/suites/netconf/MDSAL/northbound.robot +++ b/csit/suites/netconf/MDSAL/northbound.robot @@ -21,6 +21,12 @@ 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_Without_Fast_Failing @@ -60,9 +66,9 @@ 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 +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. @@ -72,51 +78,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 - -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 + 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_After_Disconnect - [Documentation] Check that the change is still visible through Restconf after Netconf disconnect. - ${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 -name0_In_Config_Running_After_Reconnect +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 - BuiltIn.Should_Contain ${reply} name0 + Check_First_Batch_Data_Present ${reply} -name0_In_Config_Modules_Via_Restconf_After_Reconnect - [Documentation] Check that the change is still visible through Restconf after Netconf reconnect. - ${data}= Utils.Get_Data_From_URI config config:modules headers=${ACCEPT_XML} - BuiltIn.Should_Contain ${data} name0 - -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. @@ -126,24 +117,19 @@ 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 404 ${response.status_code} - Commit_No_Transaction [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_For_Discard +Edit_Config_Second_Batch_Merge [Documentation] Create an element to be discarded and check the reply. - Perform_Test config-modules-merge-2 + Perform_Test merge-2 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_Using_Discard_Request [Documentation] Ask the server to discard the candidate and check the reply. @@ -153,59 +139,46 @@ 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 +Edit_Config_Multiple_Batch_Merge_Fourth + [Documentation] Use a merge request with the third batch to create the infrastructure. [Documentation] Add a "name3" subelement to the element and check the reply. 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 + 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 -name2_name3_name4_In_Config_Modules_Via_Restconf_After_Session_Fail - [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 - Reconnect_To_ODL_Netconf_After_Session_Failure [Documentation] Reconnect to ODL Netconf and fail if that is not possible. Open_ODL_Netconf_Connection -name2_name3_name4_In_Running_Config_After_Session_Failure +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 - BuiltIn.Should_Contain ${reply} name2 - BuiltIn.Should_Contain ${reply} name3 - BuiltIn.Should_Contain ${reply} name4 + Check_Multiple_Batch_Data_Present ${reply} -Edit_Multiple_Modules_Merge +Edit_Multiple_Merge_Data [Documentation] Add another subelement named "test" to the element and check the reply. Perform_Test merge-multiple-edit @@ -216,7 +189,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. @@ -229,7 +205,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. @@ -242,28 +224,48 @@ 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 @@ -395,15 +397,79 @@ Teardown_Everything 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} diff --git a/csit/variables/netconf/MDSAL/config-modules-create-request.msg b/csit/variables/netconf/MDSAL/config-modules-create-request.msg deleted file mode 100644 index 07e57cf563..0000000000 --- a/csit/variables/netconf/MDSAL/config-modules-create-request.msg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - -create - - - -prefix:threadfactory-naming -name0 -remote-connector-processing-executor - - - - - diff --git a/csit/variables/netconf/MDSAL/config-modules-delete-request.msg b/csit/variables/netconf/MDSAL/config-modules-delete-request.msg deleted file mode 100644 index fd45b8436f..0000000000 --- a/csit/variables/netconf/MDSAL/config-modules-delete-request.msg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - set - - none - - - - - diff --git a/csit/variables/netconf/MDSAL/config-modules-merge-1-request.msg b/csit/variables/netconf/MDSAL/config-modules-merge-1-request.msg deleted file mode 100644 index 36c764b011..0000000000 --- a/csit/variables/netconf/MDSAL/config-modules-merge-1-request.msg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - -merge - - - -prefix:threadfactory-naming -name0 -remote-connector-processing-executor - - - - - diff --git a/csit/variables/netconf/MDSAL/config-modules-merge-2-request.msg b/csit/variables/netconf/MDSAL/config-modules-merge-2-request.msg deleted file mode 100644 index 82e937e85d..0000000000 --- a/csit/variables/netconf/MDSAL/config-modules-merge-2-request.msg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - -merge - - - -prefix:threadfactory-naming -name1 -remote-connector-processing-executor - - - - - diff --git a/csit/variables/netconf/MDSAL/config-modules-create-reply.msg b/csit/variables/netconf/MDSAL/create-reply.msg similarity index 100% rename from csit/variables/netconf/MDSAL/config-modules-create-reply.msg rename to csit/variables/netconf/MDSAL/create-reply.msg diff --git a/csit/variables/netconf/MDSAL/create-request.msg b/csit/variables/netconf/MDSAL/create-request.msg new file mode 100644 index 0000000000..2f1971046b --- /dev/null +++ b/csit/variables/netconf/MDSAL/create-request.msg @@ -0,0 +1,16 @@ + + + + + +create + + + + CUSTBAD + 99 + + + + + diff --git a/csit/variables/netconf/MDSAL/delete-not-existing-request.msg b/csit/variables/netconf/MDSAL/delete-not-existing-request.msg index dbf4982b6d..7cc9ed433c 100644 --- a/csit/variables/netconf/MDSAL/delete-not-existing-request.msg +++ b/csit/variables/netconf/MDSAL/delete-not-existing-request.msg @@ -7,9 +7,9 @@ set none - - - + + + diff --git a/csit/variables/netconf/MDSAL/config-modules-delete-reply.msg b/csit/variables/netconf/MDSAL/delete-reply.msg similarity index 100% rename from csit/variables/netconf/MDSAL/config-modules-delete-reply.msg rename to csit/variables/netconf/MDSAL/delete-reply.msg diff --git a/csit/variables/netconf/MDSAL/delete-request.msg b/csit/variables/netconf/MDSAL/delete-request.msg new file mode 100644 index 0000000000..924e8c161f --- /dev/null +++ b/csit/variables/netconf/MDSAL/delete-request.msg @@ -0,0 +1,19 @@ + + + + + + + set + + none + + + + + + + + + + diff --git a/csit/variables/netconf/MDSAL/config-modules-merge-1-reply.msg b/csit/variables/netconf/MDSAL/merge-1-reply.msg similarity index 100% rename from csit/variables/netconf/MDSAL/config-modules-merge-1-reply.msg rename to csit/variables/netconf/MDSAL/merge-1-reply.msg diff --git a/csit/variables/netconf/MDSAL/merge-1-request.msg b/csit/variables/netconf/MDSAL/merge-1-request.msg new file mode 100644 index 0000000000..89ba229946 --- /dev/null +++ b/csit/variables/netconf/MDSAL/merge-1-request.msg @@ -0,0 +1,31 @@ + + + + + +merge + + + + TOY001 + Toyota Corolla + Toyota + 2016 + sedan + + + + + CUST001 + 32 + + + + + TOY001 + CUST001 + + + + + diff --git a/csit/variables/netconf/MDSAL/config-modules-merge-2-reply.msg b/csit/variables/netconf/MDSAL/merge-2-reply.msg similarity index 100% rename from csit/variables/netconf/MDSAL/config-modules-merge-2-reply.msg rename to csit/variables/netconf/MDSAL/merge-2-reply.msg diff --git a/csit/variables/netconf/MDSAL/merge-2-request.msg b/csit/variables/netconf/MDSAL/merge-2-request.msg new file mode 100644 index 0000000000..18b81c0837 --- /dev/null +++ b/csit/variables/netconf/MDSAL/merge-2-request.msg @@ -0,0 +1,31 @@ + + + + + +merge + + + + OLD001 + Skoda MB + Skoda Mlada Boleslav + sedan + + + + + CUST002 + male + 28 + + + + + OLD001 + CUST002 + + + + + diff --git a/csit/variables/netconf/MDSAL/merge-multiple-1-request.msg b/csit/variables/netconf/MDSAL/merge-multiple-1-request.msg index f7be519782..61ee118771 100644 --- a/csit/variables/netconf/MDSAL/merge-multiple-1-request.msg +++ b/csit/variables/netconf/MDSAL/merge-multiple-1-request.msg @@ -5,13 +5,27 @@ merge - - -prefix:threadfactory-naming -name2 -remote-connector-processing-executor - - + + + CARYOUNG + Toyota Prius + Toyota + 2016 + sedan + + + + + CUSTYOUNG + 27 + + + + + CARYOUNG + CUSTYOUNG + + diff --git a/csit/variables/netconf/MDSAL/merge-multiple-2-request.msg b/csit/variables/netconf/MDSAL/merge-multiple-2-request.msg index f3736f4514..ab582b4a02 100644 --- a/csit/variables/netconf/MDSAL/merge-multiple-2-request.msg +++ b/csit/variables/netconf/MDSAL/merge-multiple-2-request.msg @@ -5,13 +5,27 @@ merge - - -prefix:threadfactory-naming -name3 -remote-connector-processing-executor - - + + + CARMID + Toyota Aurion + Toyota + 2006 + sedan + + + + + CUSTMID + 40 + + + + + CARMID + CUSTMID + + diff --git a/csit/variables/netconf/MDSAL/merge-multiple-3-request.msg b/csit/variables/netconf/MDSAL/merge-multiple-3-request.msg index 9abcd0fc36..ae0e4a3c7e 100644 --- a/csit/variables/netconf/MDSAL/merge-multiple-3-request.msg +++ b/csit/variables/netconf/MDSAL/merge-multiple-3-request.msg @@ -5,13 +5,26 @@ merge - - -prefix:threadfactory-naming -name4 -remote-connector-processing-executor - - + + + CAROLD2 + Camry + Toyota + 1982 + + + + + CUSTOLD2 + 65 + + + + + CAROLD2 + CUSTOLD2 + + diff --git a/csit/variables/netconf/MDSAL/merge-multiple-create-reply.msg b/csit/variables/netconf/MDSAL/merge-multiple-create-reply.msg new file mode 100644 index 0000000000..39a014b054 --- /dev/null +++ b/csit/variables/netconf/MDSAL/merge-multiple-create-reply.msg @@ -0,0 +1,4 @@ + + + + diff --git a/csit/variables/netconf/MDSAL/merge-multiple-create-request.msg b/csit/variables/netconf/MDSAL/merge-multiple-create-request.msg new file mode 100644 index 0000000000..116dcffa0e --- /dev/null +++ b/csit/variables/netconf/MDSAL/merge-multiple-create-request.msg @@ -0,0 +1,29 @@ + + + + + +create + + + + CUSTOLD + 99 + + + + + CAROLD + Ford + 1950 + + + + + CAROLD + CUSTOLD + + + + + diff --git a/csit/variables/netconf/MDSAL/merge-multiple-edit-request.msg b/csit/variables/netconf/MDSAL/merge-multiple-edit-request.msg index b876edec6c..703d3567f8 100644 --- a/csit/variables/netconf/MDSAL/merge-multiple-edit-request.msg +++ b/csit/variables/netconf/MDSAL/merge-multiple-edit-request.msg @@ -8,37 +8,14 @@ merge - - - prefix:sal-netconf-connector - test -
10.194.132.42
- 2022 - admin - admin - false - - prefix:netty-event-executor - global-event-executor - - - prefix:binding-broker-osgi-registry - binding-osgi-broker - - - prefix:dom-broker-osgi-registry - dom-broker - - - prefix:netconf-client-dispatcher - global-netconf-dispatcher - - - prefix:threadpool - global-netconf-processing-executor - - - + + + test + Dixi + BMW + 1928 + + diff --git a/csit/variables/netconf/MDSAL/merge-multiple-remove-request.msg b/csit/variables/netconf/MDSAL/merge-multiple-remove-request.msg index 5d50b4e8a6..924e8c161f 100644 --- a/csit/variables/netconf/MDSAL/merge-multiple-remove-request.msg +++ b/csit/variables/netconf/MDSAL/merge-multiple-remove-request.msg @@ -7,9 +7,13 @@ set none - - - + + + + + + + diff --git a/csit/variables/netconf/MDSAL/merge-multiple-replace-request.msg b/csit/variables/netconf/MDSAL/merge-multiple-replace-request.msg index 05aa685861..06ee676d9e 100644 --- a/csit/variables/netconf/MDSAL/merge-multiple-replace-request.msg +++ b/csit/variables/netconf/MDSAL/merge-multiple-replace-request.msg @@ -8,17 +8,20 @@ replace - - - prefix:sal-netconf-connector - test -
10.194.132.42
- 4000 - admin - admin - false - - + + + REPLACE + Panda + FIAT + 2003 + + + + + REPLACE + CUSTYOUNG + + diff --git a/csit/variables/netconf/MDSAL/merge-multiple-update-request.msg b/csit/variables/netconf/MDSAL/merge-multiple-update-request.msg index 1cd4b259b9..4517b238d3 100644 --- a/csit/variables/netconf/MDSAL/merge-multiple-update-request.msg +++ b/csit/variables/netconf/MDSAL/merge-multiple-update-request.msg @@ -8,37 +8,14 @@ merge - - - prefix:sal-netconf-connector - test -
10.194.132.42
- 3000 - admin - admin - false - - prefix:netty-event-executor - global-event-executor - - - prefix:binding-broker-osgi-registry - binding-osgi-broker - - - prefix:dom-broker-osgi-registry - dom-broker - - - prefix:netconf-client-dispatcher - global-netconf-dispatcher - - - prefix:threadpool - global-netconf-processing-executor - - - + + + test + Bentley Speed Six + Bentley + 1930 + + diff --git a/csit/variables/netconf/MDSAL/remove-not-existing-request.msg b/csit/variables/netconf/MDSAL/remove-not-existing-request.msg index 5d50b4e8a6..13786507c6 100644 --- a/csit/variables/netconf/MDSAL/remove-not-existing-request.msg +++ b/csit/variables/netconf/MDSAL/remove-not-existing-request.msg @@ -7,9 +7,9 @@ set none - - - + + + -- 2.36.6