From bcd01ae797d855c6aa6eaa2df41c871634e03ae3 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 28 Apr 2023 12:57:20 +0200 Subject: [PATCH] Rename mdsal-netconf-connector to netconf-server-mdsal This is plugin which realizes the NETCONF server on top of MD-SAL APIs. Move it plugins/ directory and adjust its name. JIRA: NETCONF-945 Change-Id: I0aac6f4986ce5929dfd564a0eb10aa3497ab456a Signed-off-by: Robert Varga --- artifacts/pom.xml | 2 +- features/netconf/odl-netconf-mdsal/pom.xml | 8 ++++---- netconf/pom.xml | 1 - netconf/tools/netconf-testtool/pom.xml | 2 +- .../netconf-server-mdsal}/pom.xml | 2 +- .../netconf/mdsal/connector/CurrentSchemaContext.java | 0 .../mdsal/connector/DOMDataTransactionValidator.java | 0 .../mdsal/connector/MdsalNetconfOperationService.java | 0 .../connector/MdsalNetconfOperationServiceFactory.java | 0 .../netconf/mdsal/connector/TransactionProvider.java | 0 .../mdsal/connector/ops/AbstractConfigOperation.java | 0 .../netconf/mdsal/connector/ops/AbstractEdit.java | 0 .../opendaylight/netconf/mdsal/connector/ops/Commit.java | 0 .../ops/ComponentNormalizedNodeStreamWriter.java | 0 .../netconf/mdsal/connector/ops/CopyConfig.java | 0 .../netconf/mdsal/connector/ops/DataTreeChange.java | 0 .../netconf/mdsal/connector/ops/Datastore.java | 0 .../netconf/mdsal/connector/ops/DiscardChanges.java | 0 .../netconf/mdsal/connector/ops/EditConfig.java | 0 .../opendaylight/netconf/mdsal/connector/ops/Lock.java | 0 .../netconf/mdsal/connector/ops/RuntimeRpc.java | 0 .../ops/SplittingNormalizedNodeMetadataStreamWriter.java | 0 .../opendaylight/netconf/mdsal/connector/ops/Unlock.java | 0 .../netconf/mdsal/connector/ops/Validate.java | 0 .../netconf/mdsal/connector/ops/get/AbstractGet.java | 0 .../mdsal/connector/ops/get/FilterContentValidator.java | 0 .../opendaylight/netconf/mdsal/connector/ops/get/Get.java | 0 .../netconf/mdsal/connector/ops/get/GetConfig.java | 0 .../connector/ops/get/UniversalNamespaceContextImpl.java | 0 .../mdsal/connector/ops/AbstractNetconfOperationTest.java | 0 .../netconf/mdsal/connector/ops/CopyConfigTest.java | 0 .../mdsal/connector/ops/NetconfMDSalMappingTest.java | 0 .../netconf/mdsal/connector/ops/RuntimeRpcTest.java | 0 .../netconf/mdsal/connector/ops/SchemaServiceStub.java | 0 .../netconf/mdsal/connector/ops/ValidateTest.java | 0 .../netconf/mdsal/connector/ops/get/Bug8084.java | 0 .../connector/ops/get/FilterContentValidatorTest.java | 0 .../netconf/mdsal/connector/ops/get/Netconf506Test.java | 0 .../netconf/mdsal/connector/ops/get/Netconf538Test.java | 0 .../src/test/resources/filter/bug8084.xml | 0 .../src/test/resources/filter/expected.txt | 0 .../src/test/resources/filter/f1.xml | 0 .../src/test/resources/filter/f10.xml | 0 .../src/test/resources/filter/f11.xml | 0 .../src/test/resources/filter/f12.xml | 0 .../src/test/resources/filter/f13.xml | 0 .../src/test/resources/filter/f2.xml | 0 .../src/test/resources/filter/f3.xml | 0 .../src/test/resources/filter/f4.xml | 0 .../src/test/resources/filter/f5.xml | 0 .../src/test/resources/filter/f6.xml | 0 .../src/test/resources/filter/f7.xml | 0 .../src/test/resources/filter/f8.xml | 0 .../src/test/resources/filter/f9.xml | 0 .../src/test/resources/filter/netconf506.xml | 0 .../src/test/resources/filter/netconf538.xml | 0 .../src/test/resources/messages/mapping/bad_getConfig.xml | 0 .../messages/mapping/bad_namespace_getConfig.xml | 0 .../src/test/resources/messages/mapping/commit.xml | 0 .../messages/mapping/copyConfigs/config_file_invalid.xml | 0 .../messages/mapping/copyConfigs/config_file_valid.xml | 0 .../messages/mapping/copyConfigs/copyConfig_choices1.xml | 0 .../messages/mapping/copyConfigs/copyConfig_choices2.xml | 0 .../messages/mapping/copyConfigs/copyConfig_choices3.xml | 0 .../messages/mapping/copyConfigs/copyConfig_choices4.xml | 0 .../mapping/copyConfigs/copyConfig_choices_control.xml | 0 .../messages/mapping/copyConfigs/copyConfig_delete.xml | 0 .../mapping/copyConfigs/copyConfig_delete_control.xml | 0 .../mapping/copyConfigs/copyConfig_delete_setup.xml | 0 .../copyConfigs/copyConfig_delete_setup_control.xml | 0 .../mapping/copyConfigs/copyConfig_empty_container.xml | 0 .../copyConfigs/copyConfig_empty_container_control.xml | 0 .../copyConfigs/copyConfig_empty_presence_container.xml | 0 .../copyConfig_empty_presence_container_control.xml | 0 .../messages/mapping/copyConfigs/copyConfig_from_file.xml | 0 .../mapping/copyConfigs/copyConfig_from_file_control.xml | 0 .../mapping/copyConfigs/copyConfig_invalid_url.xml | 0 .../mapping/copyConfigs/copyConfig_list_setup.xml | 0 .../mapping/copyConfigs/copyConfig_list_setup_control.xml | 0 .../mapping/copyConfigs/copyConfig_list_update.xml | 0 .../copyConfigs/copyConfig_list_update_control.xml | 0 .../messages/mapping/copyConfigs/copyConfig_no_config.xml | 0 .../messages/mapping/copyConfigs/copyConfig_no_source.xml | 0 .../messages/mapping/copyConfigs/copyConfig_no_target.xml | 0 .../mapping/copyConfigs/copyConfig_ordered_list_setup.xml | 0 .../copyConfigs/copyConfig_ordered_list_setup_control.xml | 0 .../copyConfigs/copyConfig_ordered_list_update.xml | 0 .../copyConfig_ordered_list_update_control.xml | 0 .../messages/mapping/copyConfigs/copyConfig_running.xml | 0 .../messages/mapping/copyConfigs/copyConfig_to_file.xml | 0 .../mapping/copyConfigs/copyConfig_to_file_control.xml | 0 .../copyConfigs/copyConfig_to_file_from_running.xml | 0 .../copyConfig_to_file_from_running_control.xml | 0 .../copyConfig_to_unsupported_url_protocol.xml | 0 .../mapping/copyConfigs/copyConfig_top_augmentation.xml | 0 .../copyConfigs/copyConfig_top_augmentation_control.xml | 0 .../mapping/copyConfigs/copyConfig_top_modules.xml | 0 .../copyConfigs/copyConfig_top_modules_control.xml | 0 .../copyConfigs/copyConfig_toplevel_list_setup.xml | 0 .../copyConfig_toplevel_list_setup_control.xml | 0 .../copyConfigs/copyConfig_toplevel_list_update.xml | 0 .../copyConfig_toplevel_list_update_control.xml | 0 .../copyConfigs/copyConfig_url_remote_to_remote.xml | 0 .../test/resources/messages/mapping/discardChanges.xml | 0 .../messages/mapping/editConfig_create_n1_control.xml | 0 .../messages/mapping/editConfigs/config_file.xml | 0 .../mapping/editConfigs/edit-config-merge-map-entry.xml | 0 .../mapping/editConfigs/edit-config-replace-map-entry.xml | 0 .../mapping/editConfigs/editConfig-filtering-setup.xml | 0 .../mapping/editConfigs/editConfig-filtering-setup2.xml | 0 .../editConfig_augmented_container_replace.xml | 0 .../editConfig_augmented_ordered_list_create.xml | 0 .../editConfig_augmented_ordered_list_replace.xml | 0 .../messages/mapping/editConfigs/editConfig_create.xml | 0 .../mapping/editConfigs/editConfig_delete-root.xml | 0 .../mapping/editConfigs/editConfig_delete-top.xml | 0 .../editConfigs/editConfig_empty_modules_create.xml | 0 .../messages/mapping/editConfigs/editConfig_from_file.xml | 0 .../mapping/editConfigs/editConfig_from_file_control.xml | 0 .../editConfigs/editConfig_leaf_from_augment_replace.xml | 0 .../editConfig_merge_missing_default-operation_1.xml | 0 .../editConfig_merge_missing_default-operation_2.xml | 0 ...editConfig_merge_missing_default-operation_control.xml | 0 .../mapping/editConfigs/editConfig_merge_multiple_1.xml | 0 .../mapping/editConfigs/editConfig_merge_multiple_2.xml | 0 .../mapping/editConfigs/editConfig_merge_multiple_3.xml | 0 .../editConfigs/editConfig_merge_multiple_4_replace.xml | 0 ...editConfig_merge_multiple_after_more_complex_merge.xml | 0 ...itConfig_merge_multiple_after_more_complex_merge_2.xml | 0 .../editConfig_merge_multiple_after_replace.xml | 0 .../editConfigs/editConfig_merge_multiple_control_1.xml | 0 .../editConfigs/editConfig_merge_multiple_control_2.xml | 0 .../editConfigs/editConfig_merge_multiple_keys_1.xml | 0 .../editConfig_merge_multiple_keys_1_control.xml | 0 .../editConfig_merge_multiple_operations_1.xml | 0 .../editConfig_merge_multiple_operations_1_control.xml | 0 .../editConfig_merge_multiple_operations_2.xml | 0 .../editConfig_merge_multiple_operations_2_control.xml | 0 .../editConfig_merge_multiple_operations_3_control.xml | 0 ...Config_merge_multiple_operations_3_leaf_operations.xml | 0 ...Config_merge_multiple_operations_4_create_existing.xml | 0 ...Config_merge_multiple_operations_4_default-replace.xml | 0 ...ig_merge_multiple_operations_4_delete-non-existing.xml | 0 ...e_multiple_operations_4_delete_children_operations.xml | 0 ...le_operations_4_delete_children_operations_control.xml | 0 ...ig_merge_multiple_operations_4_remove-non-existing.xml | 0 .../editConfig_merge_multiple_operations_4_setup.xml | 0 ...itConfig_merge_multiple_operations_5_choice_delete.xml | 0 ...g_merge_multiple_operations_5_choice_setup-control.xml | 0 ...ditConfig_merge_multiple_operations_5_choice_setup.xml | 0 ..._merge_multiple_operations_5_choice_setup2-control.xml | 0 ...itConfig_merge_multiple_operations_5_choice_setup2.xml | 0 .../editConfig_merge_multiple_operations_setup.xml | 0 .../messages/mapping/editConfigs/editConfig_merge_n1.xml | 0 .../mapping/editConfigs/editConfig_merge_n1_control.xml | 0 .../mapping/editConfigs/editConfig_merge_single_1.xml | 0 .../messages/mapping/editConfigs/editConfig_no_config.xml | 0 .../editConfigs/editConfig_ordered_list_create.xml | 0 .../editConfigs/editConfig_ordered_list_replace.xml | 0 .../mapping/editConfigs/editConfig_remove-root.xml | 0 .../mapping/editConfigs/editConfig_replace_default.xml | 0 .../editConfigs/editConfig_replace_default_control.xml | 0 .../messages/mapping/editConfigs/editConfig_running.xml | 0 .../messages/mapping/filters/get-config-empty-filter.xml | 0 .../messages/mapping/filters/get-empty-filter.xml | 0 .../messages/mapping/filters/get-filter-alluser.xml | 0 .../filters/get-filter-augmented-case-inner-case.xml | 0 .../filters/get-filter-augmented-case-inner-choice.xml | 0 .../mapping/filters/get-filter-augmented-case.xml | 0 .../mapping/filters/get-filter-augmented-string.xml | 0 .../messages/mapping/filters/get-filter-company-info.xml | 0 .../mapping/filters/get-filter-modules-and-admin.xml | 0 .../mapping/filters/get-filter-only-names-types.xml | 0 .../filters/get-filter-specific-module-type-and-user.xml | 0 .../messages/mapping/filters/get-filter-superuser.xml | 0 .../messages/mapping/filters/get-filter-users.xml | 0 .../filters/response-augmented-case-inner-choice.xml | 0 .../messages/mapping/filters/response-augmented-case.xml | 0 .../mapping/filters/response-augmented-string.xml | 0 .../resources/messages/mapping/get-config-map-entry.xml | 0 .../resources/messages/mapping/get-empty-response.xml | 0 .../src/test/resources/messages/mapping/get.xml | 0 .../src/test/resources/messages/mapping/getConfig.xml | 0 .../resources/messages/mapping/getConfig_candidate.xml | 0 .../src/test/resources/messages/mapping/lock.xml | 0 .../test/resources/messages/mapping/lock_candidate.xml | 0 .../src/test/resources/messages/mapping/lock_notarget.xml | 0 .../src/test/resources/messages/mapping/rpc-reply_ok.xml | 0 .../resources/messages/mapping/rpcs/rpc-bad-namespace.xml | 0 .../messages/mapping/rpcs/rpc-container-control.xml | 0 .../resources/messages/mapping/rpcs/rpc-container.xml | 0 .../messages/mapping/rpcs/rpc-nonvoid-control.xml | 0 .../test/resources/messages/mapping/rpcs/rpc-nonvoid.xml | 0 .../messages/mapping/rpcs/rpc-void-input-output.xml | 0 .../resources/messages/mapping/rpcs/rpc-void-output.xml | 0 .../messages/mapping/rpcs/runtimerpc-ok-reply.xml | 0 .../src/test/resources/messages/mapping/unlock.xml | 0 .../test/resources/messages/mapping/unlock_candidate.xml | 0 .../test/resources/messages/mapping/unlock_notarget.xml | 0 .../test/resources/messages/mapping/validate/validate.xml | 0 .../messages/mapping/validate/validate_no_source.xml | 0 .../messages/mapping/validate/validate_running.xml | 0 .../resources/yang/filter-validator-test-augment.yang | 0 .../test/resources/yang/filter-validator-test-mod-0.yang | 0 .../test/resources/yang/mdsal-netconf-mapping-test.yang | 0 .../src/test/resources/yang/mdsal-netconf-rpc-test.yang | 0 .../src/test/resources/yang/simple-list.yang | 0 plugins/pom.xml | 1 + 208 files changed, 8 insertions(+), 8 deletions(-) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/pom.xml (98%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/main/java/org/opendaylight/netconf/mdsal/connector/CurrentSchemaContext.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/main/java/org/opendaylight/netconf/mdsal/connector/DOMDataTransactionValidator.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationService.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationServiceFactory.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/main/java/org/opendaylight/netconf/mdsal/connector/TransactionProvider.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractConfigOperation.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractEdit.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/ComponentNormalizedNodeStreamWriter.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfig.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DataTreeChange.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Datastore.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DiscardChanges.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/EditConfig.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Lock.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpc.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/SplittingNormalizedNodeMetadataStreamWriter.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Unlock.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Validate.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/AbstractGet.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/FilterContentValidator.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/Get.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/GetConfig.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/UniversalNamespaceContextImpl.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractNetconfOperationTest.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfigTest.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/NetconfMDSalMappingTest.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpcTest.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/SchemaServiceStub.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/ValidateTest.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/Bug8084.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/FilterContentValidatorTest.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/Netconf506Test.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/Netconf538Test.java (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/filter/bug8084.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/filter/expected.txt (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/filter/f1.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/filter/f10.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/filter/f11.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/filter/f12.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/filter/f13.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/filter/f2.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/filter/f3.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/filter/f4.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/filter/f5.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/filter/f6.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/filter/f7.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/filter/f8.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/filter/f9.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/filter/netconf506.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/filter/netconf538.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/bad_getConfig.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/bad_namespace_getConfig.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/commit.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/config_file_invalid.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/config_file_valid.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_choices1.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_choices2.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_choices3.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_choices4.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_choices_control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_delete.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_delete_control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_delete_setup.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_delete_setup_control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_empty_container.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_empty_container_control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_empty_presence_container.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_empty_presence_container_control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_from_file.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_from_file_control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_invalid_url.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_list_setup.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_list_setup_control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_list_update.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_list_update_control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_no_config.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_no_source.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_no_target.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_ordered_list_setup.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_ordered_list_setup_control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_ordered_list_update.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_ordered_list_update_control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_running.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_to_file.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_to_file_control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_to_file_from_running.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_to_file_from_running_control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_to_unsupported_url_protocol.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_top_augmentation.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_top_augmentation_control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_top_modules.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_top_modules_control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_toplevel_list_setup.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_toplevel_list_setup_control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_toplevel_list_update.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_toplevel_list_update_control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/copyConfigs/copyConfig_url_remote_to_remote.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/discardChanges.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfig_create_n1_control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/config_file.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/edit-config-merge-map-entry.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/edit-config-replace-map-entry.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig-filtering-setup.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig-filtering-setup2.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_augmented_container_replace.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_augmented_ordered_list_create.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_augmented_ordered_list_replace.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_create.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_delete-root.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_delete-top.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_empty_modules_create.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_from_file.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_from_file_control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_leaf_from_augment_replace.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_missing_default-operation_1.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_missing_default-operation_2.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_missing_default-operation_control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_1.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_2.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_3.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_4_replace.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_after_more_complex_merge.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_after_more_complex_merge_2.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_after_replace.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_control_1.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_control_2.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_keys_1.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_keys_1_control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_1.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_1_control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_2.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_2_control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_3_control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_3_leaf_operations.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_create_existing.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_default-replace.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_delete-non-existing.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_delete_children_operations.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_delete_children_operations_control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_remove-non-existing.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_setup.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_5_choice_delete.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_5_choice_setup-control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_5_choice_setup.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_5_choice_setup2-control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_5_choice_setup2.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_setup.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_n1.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_n1_control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_merge_single_1.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_no_config.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_ordered_list_create.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_ordered_list_replace.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_remove-root.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_replace_default.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_replace_default_control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/editConfigs/editConfig_running.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/filters/get-config-empty-filter.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/filters/get-empty-filter.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/filters/get-filter-alluser.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/filters/get-filter-augmented-case-inner-case.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/filters/get-filter-augmented-case-inner-choice.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/filters/get-filter-augmented-case.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/filters/get-filter-augmented-string.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/filters/get-filter-company-info.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/filters/get-filter-modules-and-admin.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/filters/get-filter-only-names-types.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/filters/get-filter-specific-module-type-and-user.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/filters/get-filter-superuser.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/filters/get-filter-users.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/filters/response-augmented-case-inner-choice.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/filters/response-augmented-case.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/filters/response-augmented-string.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/get-config-map-entry.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/get-empty-response.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/get.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/getConfig.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/getConfig_candidate.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/lock.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/lock_candidate.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/lock_notarget.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/rpc-reply_ok.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/rpcs/rpc-bad-namespace.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/rpcs/rpc-container-control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/rpcs/rpc-container.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/rpcs/rpc-nonvoid-control.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/rpcs/rpc-nonvoid.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/rpcs/rpc-void-input-output.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/rpcs/rpc-void-output.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/rpcs/runtimerpc-ok-reply.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/unlock.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/unlock_candidate.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/unlock_notarget.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/validate/validate.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/validate/validate_no_source.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/messages/mapping/validate/validate_running.xml (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/yang/filter-validator-test-augment.yang (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/yang/filter-validator-test-mod-0.yang (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/yang/mdsal-netconf-mapping-test.yang (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/yang/mdsal-netconf-rpc-test.yang (100%) rename {netconf/mdsal-netconf-connector => plugins/netconf-server-mdsal}/src/test/resources/yang/simple-list.yang (100%) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 56dcf9877e..baeeb3465f 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -67,7 +67,7 @@ ${project.groupId} - mdsal-netconf-connector + netconf-server-mdsal ${project.version} diff --git a/features/netconf/odl-netconf-mdsal/pom.xml b/features/netconf/odl-netconf-mdsal/pom.xml index 0f1bad486a..e72937654e 100644 --- a/features/netconf/odl-netconf-mdsal/pom.xml +++ b/features/netconf/odl-netconf-mdsal/pom.xml @@ -47,19 +47,19 @@ ${project.groupId} - mdsal-netconf-ssh + netconf-server-mdsal ${project.groupId} - mdsal-netconf-tcp + mdsal-netconf-ssh ${project.groupId} - netconf-events-mdsal + mdsal-netconf-tcp ${project.groupId} - mdsal-netconf-connector + netconf-events-mdsal ${project.groupId} diff --git a/netconf/pom.xml b/netconf/pom.xml index 87675e343b..6ca46912fc 100644 --- a/netconf/pom.xml +++ b/netconf/pom.xml @@ -32,7 +32,6 @@ netconf-config mdsal-netconf-ssh mdsal-netconf-tcp - mdsal-netconf-connector mdsal-netconf-monitoring mdsal-netconf-yang-library mdsal-netconf-impl diff --git a/netconf/tools/netconf-testtool/pom.xml b/netconf/tools/netconf-testtool/pom.xml index 87cd238ffe..831e931b18 100644 --- a/netconf/tools/netconf-testtool/pom.xml +++ b/netconf/tools/netconf-testtool/pom.xml @@ -116,7 +116,7 @@ org.opendaylight.netconf - mdsal-netconf-connector + netconf-server-mdsal ${project.groupId} diff --git a/netconf/mdsal-netconf-connector/pom.xml b/plugins/netconf-server-mdsal/pom.xml similarity index 98% rename from netconf/mdsal-netconf-connector/pom.xml rename to plugins/netconf-server-mdsal/pom.xml index be0ead75f2..ccc9688565 100644 --- a/netconf/mdsal-netconf-connector/pom.xml +++ b/plugins/netconf-server-mdsal/pom.xml @@ -16,7 +16,7 @@ ../../parent - mdsal-netconf-connector + netconf-server-mdsal ${project.artifactId} bundle diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/CurrentSchemaContext.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/CurrentSchemaContext.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/CurrentSchemaContext.java rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/CurrentSchemaContext.java diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/DOMDataTransactionValidator.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/DOMDataTransactionValidator.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/DOMDataTransactionValidator.java rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/DOMDataTransactionValidator.java diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationService.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationService.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationService.java rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationService.java diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationServiceFactory.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationServiceFactory.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationServiceFactory.java rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationServiceFactory.java diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/TransactionProvider.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/TransactionProvider.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/TransactionProvider.java rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/TransactionProvider.java diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractConfigOperation.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractConfigOperation.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractConfigOperation.java rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractConfigOperation.java diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractEdit.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractEdit.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractEdit.java rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractEdit.java diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/ComponentNormalizedNodeStreamWriter.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/ComponentNormalizedNodeStreamWriter.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/ComponentNormalizedNodeStreamWriter.java rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/ComponentNormalizedNodeStreamWriter.java diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfig.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfig.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfig.java rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfig.java diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DataTreeChange.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DataTreeChange.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DataTreeChange.java rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DataTreeChange.java diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Datastore.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Datastore.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Datastore.java rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Datastore.java diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DiscardChanges.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DiscardChanges.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DiscardChanges.java rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DiscardChanges.java diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/EditConfig.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/EditConfig.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/EditConfig.java rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/EditConfig.java diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Lock.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Lock.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Lock.java rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Lock.java diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpc.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpc.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpc.java rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpc.java diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/SplittingNormalizedNodeMetadataStreamWriter.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/SplittingNormalizedNodeMetadataStreamWriter.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/SplittingNormalizedNodeMetadataStreamWriter.java rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/SplittingNormalizedNodeMetadataStreamWriter.java diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Unlock.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Unlock.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Unlock.java rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Unlock.java diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Validate.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Validate.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Validate.java rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Validate.java diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/AbstractGet.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/AbstractGet.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/AbstractGet.java rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/AbstractGet.java diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/FilterContentValidator.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/FilterContentValidator.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/FilterContentValidator.java rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/FilterContentValidator.java diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/Get.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/Get.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/Get.java rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/Get.java diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/GetConfig.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/GetConfig.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/GetConfig.java rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/GetConfig.java diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/UniversalNamespaceContextImpl.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/UniversalNamespaceContextImpl.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/UniversalNamespaceContextImpl.java rename to plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/UniversalNamespaceContextImpl.java diff --git a/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractNetconfOperationTest.java b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractNetconfOperationTest.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractNetconfOperationTest.java rename to plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractNetconfOperationTest.java diff --git a/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfigTest.java b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfigTest.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfigTest.java rename to plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfigTest.java diff --git a/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/NetconfMDSalMappingTest.java b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/NetconfMDSalMappingTest.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/NetconfMDSalMappingTest.java rename to plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/NetconfMDSalMappingTest.java diff --git a/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpcTest.java b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpcTest.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpcTest.java rename to plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpcTest.java diff --git a/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/SchemaServiceStub.java b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/SchemaServiceStub.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/SchemaServiceStub.java rename to plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/SchemaServiceStub.java diff --git a/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/ValidateTest.java b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/ValidateTest.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/ValidateTest.java rename to plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/ValidateTest.java diff --git a/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/Bug8084.java b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/Bug8084.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/Bug8084.java rename to plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/Bug8084.java diff --git a/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/FilterContentValidatorTest.java b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/FilterContentValidatorTest.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/FilterContentValidatorTest.java rename to plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/FilterContentValidatorTest.java diff --git a/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/Netconf506Test.java b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/Netconf506Test.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/Netconf506Test.java rename to plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/Netconf506Test.java diff --git a/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/Netconf538Test.java b/plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/Netconf538Test.java similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/Netconf538Test.java rename to plugins/netconf-server-mdsal/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/Netconf538Test.java diff --git a/netconf/mdsal-netconf-connector/src/test/resources/filter/bug8084.xml b/plugins/netconf-server-mdsal/src/test/resources/filter/bug8084.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/filter/bug8084.xml rename to plugins/netconf-server-mdsal/src/test/resources/filter/bug8084.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/filter/expected.txt b/plugins/netconf-server-mdsal/src/test/resources/filter/expected.txt similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/filter/expected.txt rename to plugins/netconf-server-mdsal/src/test/resources/filter/expected.txt diff --git a/netconf/mdsal-netconf-connector/src/test/resources/filter/f1.xml b/plugins/netconf-server-mdsal/src/test/resources/filter/f1.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/filter/f1.xml rename to plugins/netconf-server-mdsal/src/test/resources/filter/f1.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/filter/f10.xml b/plugins/netconf-server-mdsal/src/test/resources/filter/f10.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/filter/f10.xml rename to plugins/netconf-server-mdsal/src/test/resources/filter/f10.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/filter/f11.xml b/plugins/netconf-server-mdsal/src/test/resources/filter/f11.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/filter/f11.xml rename to plugins/netconf-server-mdsal/src/test/resources/filter/f11.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/filter/f12.xml b/plugins/netconf-server-mdsal/src/test/resources/filter/f12.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/filter/f12.xml rename to plugins/netconf-server-mdsal/src/test/resources/filter/f12.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/filter/f13.xml b/plugins/netconf-server-mdsal/src/test/resources/filter/f13.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/filter/f13.xml rename to plugins/netconf-server-mdsal/src/test/resources/filter/f13.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/filter/f2.xml b/plugins/netconf-server-mdsal/src/test/resources/filter/f2.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/filter/f2.xml rename to plugins/netconf-server-mdsal/src/test/resources/filter/f2.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/filter/f3.xml b/plugins/netconf-server-mdsal/src/test/resources/filter/f3.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/filter/f3.xml rename to plugins/netconf-server-mdsal/src/test/resources/filter/f3.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/filter/f4.xml b/plugins/netconf-server-mdsal/src/test/resources/filter/f4.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/filter/f4.xml rename to plugins/netconf-server-mdsal/src/test/resources/filter/f4.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/filter/f5.xml b/plugins/netconf-server-mdsal/src/test/resources/filter/f5.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/filter/f5.xml rename to plugins/netconf-server-mdsal/src/test/resources/filter/f5.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/filter/f6.xml b/plugins/netconf-server-mdsal/src/test/resources/filter/f6.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/filter/f6.xml rename to plugins/netconf-server-mdsal/src/test/resources/filter/f6.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/filter/f7.xml b/plugins/netconf-server-mdsal/src/test/resources/filter/f7.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/filter/f7.xml rename to plugins/netconf-server-mdsal/src/test/resources/filter/f7.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/filter/f8.xml b/plugins/netconf-server-mdsal/src/test/resources/filter/f8.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/filter/f8.xml rename to plugins/netconf-server-mdsal/src/test/resources/filter/f8.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/filter/f9.xml b/plugins/netconf-server-mdsal/src/test/resources/filter/f9.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/filter/f9.xml rename to plugins/netconf-server-mdsal/src/test/resources/filter/f9.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/filter/netconf506.xml b/plugins/netconf-server-mdsal/src/test/resources/filter/netconf506.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/filter/netconf506.xml rename to plugins/netconf-server-mdsal/src/test/resources/filter/netconf506.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/filter/netconf538.xml b/plugins/netconf-server-mdsal/src/test/resources/filter/netconf538.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/filter/netconf538.xml rename to plugins/netconf-server-mdsal/src/test/resources/filter/netconf538.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/bad_getConfig.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/bad_getConfig.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/bad_getConfig.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/bad_getConfig.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/bad_namespace_getConfig.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/bad_namespace_getConfig.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/bad_namespace_getConfig.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/bad_namespace_getConfig.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/commit.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/commit.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/commit.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/commit.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/config_file_invalid.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/config_file_invalid.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/config_file_invalid.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/config_file_invalid.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/config_file_valid.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/config_file_valid.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/config_file_valid.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/config_file_valid.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_choices1.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_choices1.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_choices1.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_choices1.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_choices2.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_choices2.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_choices2.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_choices2.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_choices3.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_choices3.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_choices3.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_choices3.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_choices4.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_choices4.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_choices4.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_choices4.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_choices_control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_choices_control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_choices_control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_choices_control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_delete.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_delete.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_delete.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_delete.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_delete_control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_delete_control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_delete_control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_delete_control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_delete_setup.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_delete_setup.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_delete_setup.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_delete_setup.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_delete_setup_control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_delete_setup_control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_delete_setup_control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_delete_setup_control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_empty_container.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_empty_container.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_empty_container.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_empty_container.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_empty_container_control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_empty_container_control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_empty_container_control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_empty_container_control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_empty_presence_container.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_empty_presence_container.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_empty_presence_container.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_empty_presence_container.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_empty_presence_container_control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_empty_presence_container_control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_empty_presence_container_control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_empty_presence_container_control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_from_file.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_from_file.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_from_file.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_from_file.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_from_file_control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_from_file_control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_from_file_control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_from_file_control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_invalid_url.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_invalid_url.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_invalid_url.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_invalid_url.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_list_setup.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_list_setup.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_list_setup.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_list_setup.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_list_setup_control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_list_setup_control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_list_setup_control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_list_setup_control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_list_update.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_list_update.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_list_update.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_list_update.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_list_update_control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_list_update_control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_list_update_control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_list_update_control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_no_config.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_no_config.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_no_config.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_no_config.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_no_source.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_no_source.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_no_source.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_no_source.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_no_target.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_no_target.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_no_target.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_no_target.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_ordered_list_setup.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_ordered_list_setup.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_ordered_list_setup.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_ordered_list_setup.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_ordered_list_setup_control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_ordered_list_setup_control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_ordered_list_setup_control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_ordered_list_setup_control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_ordered_list_update.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_ordered_list_update.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_ordered_list_update.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_ordered_list_update.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_ordered_list_update_control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_ordered_list_update_control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_ordered_list_update_control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_ordered_list_update_control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_running.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_running.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_running.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_running.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_to_file.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_to_file.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_to_file.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_to_file.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_to_file_control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_to_file_control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_to_file_control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_to_file_control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_to_file_from_running.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_to_file_from_running.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_to_file_from_running.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_to_file_from_running.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_to_file_from_running_control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_to_file_from_running_control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_to_file_from_running_control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_to_file_from_running_control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_to_unsupported_url_protocol.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_to_unsupported_url_protocol.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_to_unsupported_url_protocol.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_to_unsupported_url_protocol.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_top_augmentation.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_top_augmentation.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_top_augmentation.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_top_augmentation.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_top_augmentation_control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_top_augmentation_control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_top_augmentation_control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_top_augmentation_control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_top_modules.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_top_modules.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_top_modules.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_top_modules.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_top_modules_control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_top_modules_control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_top_modules_control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_top_modules_control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_toplevel_list_setup.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_toplevel_list_setup.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_toplevel_list_setup.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_toplevel_list_setup.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_toplevel_list_setup_control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_toplevel_list_setup_control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_toplevel_list_setup_control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_toplevel_list_setup_control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_toplevel_list_update.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_toplevel_list_update.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_toplevel_list_update.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_toplevel_list_update.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_toplevel_list_update_control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_toplevel_list_update_control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_toplevel_list_update_control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_toplevel_list_update_control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_url_remote_to_remote.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_url_remote_to_remote.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/copyConfigs/copyConfig_url_remote_to_remote.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/copyConfigs/copyConfig_url_remote_to_remote.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/discardChanges.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/discardChanges.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/discardChanges.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/discardChanges.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfig_create_n1_control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfig_create_n1_control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfig_create_n1_control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfig_create_n1_control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/config_file.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/config_file.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/config_file.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/config_file.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/edit-config-merge-map-entry.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/edit-config-merge-map-entry.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/edit-config-merge-map-entry.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/edit-config-merge-map-entry.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/edit-config-replace-map-entry.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/edit-config-replace-map-entry.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/edit-config-replace-map-entry.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/edit-config-replace-map-entry.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig-filtering-setup.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig-filtering-setup.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig-filtering-setup.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig-filtering-setup.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig-filtering-setup2.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig-filtering-setup2.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig-filtering-setup2.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig-filtering-setup2.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_augmented_container_replace.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_augmented_container_replace.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_augmented_container_replace.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_augmented_container_replace.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_augmented_ordered_list_create.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_augmented_ordered_list_create.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_augmented_ordered_list_create.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_augmented_ordered_list_create.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_augmented_ordered_list_replace.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_augmented_ordered_list_replace.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_augmented_ordered_list_replace.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_augmented_ordered_list_replace.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_create.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_create.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_create.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_create.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_delete-root.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_delete-root.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_delete-root.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_delete-root.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_delete-top.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_delete-top.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_delete-top.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_delete-top.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_empty_modules_create.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_empty_modules_create.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_empty_modules_create.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_empty_modules_create.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_from_file.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_from_file.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_from_file.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_from_file.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_from_file_control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_from_file_control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_from_file_control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_from_file_control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_leaf_from_augment_replace.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_leaf_from_augment_replace.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_leaf_from_augment_replace.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_leaf_from_augment_replace.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_missing_default-operation_1.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_missing_default-operation_1.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_missing_default-operation_1.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_missing_default-operation_1.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_missing_default-operation_2.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_missing_default-operation_2.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_missing_default-operation_2.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_missing_default-operation_2.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_missing_default-operation_control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_missing_default-operation_control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_missing_default-operation_control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_missing_default-operation_control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_1.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_1.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_1.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_1.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_2.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_2.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_2.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_2.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_3.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_3.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_3.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_3.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_4_replace.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_4_replace.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_4_replace.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_4_replace.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_after_more_complex_merge.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_after_more_complex_merge.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_after_more_complex_merge.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_after_more_complex_merge.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_after_more_complex_merge_2.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_after_more_complex_merge_2.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_after_more_complex_merge_2.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_after_more_complex_merge_2.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_after_replace.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_after_replace.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_after_replace.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_after_replace.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_control_1.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_control_1.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_control_1.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_control_1.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_control_2.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_control_2.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_control_2.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_control_2.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_keys_1.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_keys_1.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_keys_1.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_keys_1.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_keys_1_control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_keys_1_control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_keys_1_control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_keys_1_control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_1.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_1.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_1.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_1.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_1_control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_1_control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_1_control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_1_control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_2.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_2.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_2.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_2.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_2_control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_2_control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_2_control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_2_control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_3_control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_3_control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_3_control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_3_control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_3_leaf_operations.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_3_leaf_operations.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_3_leaf_operations.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_3_leaf_operations.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_create_existing.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_create_existing.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_create_existing.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_create_existing.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_default-replace.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_default-replace.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_default-replace.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_default-replace.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_delete-non-existing.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_delete-non-existing.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_delete-non-existing.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_delete-non-existing.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_delete_children_operations.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_delete_children_operations.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_delete_children_operations.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_delete_children_operations.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_delete_children_operations_control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_delete_children_operations_control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_delete_children_operations_control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_delete_children_operations_control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_remove-non-existing.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_remove-non-existing.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_remove-non-existing.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_remove-non-existing.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_setup.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_setup.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_setup.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_4_setup.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_5_choice_delete.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_5_choice_delete.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_5_choice_delete.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_5_choice_delete.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_5_choice_setup-control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_5_choice_setup-control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_5_choice_setup-control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_5_choice_setup-control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_5_choice_setup.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_5_choice_setup.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_5_choice_setup.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_5_choice_setup.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_5_choice_setup2-control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_5_choice_setup2-control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_5_choice_setup2-control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_5_choice_setup2-control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_5_choice_setup2.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_5_choice_setup2.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_5_choice_setup2.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_5_choice_setup2.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_setup.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_setup.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_setup.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_multiple_operations_setup.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_n1.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_n1.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_n1.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_n1.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_n1_control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_n1_control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_n1_control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_n1_control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_single_1.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_single_1.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_merge_single_1.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_merge_single_1.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_no_config.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_no_config.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_no_config.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_no_config.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_ordered_list_create.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_ordered_list_create.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_ordered_list_create.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_ordered_list_create.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_ordered_list_replace.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_ordered_list_replace.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_ordered_list_replace.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_ordered_list_replace.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_remove-root.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_remove-root.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_remove-root.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_remove-root.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_replace_default.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_replace_default.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_replace_default.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_replace_default.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_replace_default_control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_replace_default_control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_replace_default_control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_replace_default_control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_running.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_running.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/editConfigs/editConfig_running.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/editConfigs/editConfig_running.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/get-config-empty-filter.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/get-config-empty-filter.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/get-config-empty-filter.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/get-config-empty-filter.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/get-empty-filter.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/get-empty-filter.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/get-empty-filter.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/get-empty-filter.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/get-filter-alluser.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/get-filter-alluser.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/get-filter-alluser.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/get-filter-alluser.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/get-filter-augmented-case-inner-case.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/get-filter-augmented-case-inner-case.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/get-filter-augmented-case-inner-case.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/get-filter-augmented-case-inner-case.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/get-filter-augmented-case-inner-choice.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/get-filter-augmented-case-inner-choice.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/get-filter-augmented-case-inner-choice.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/get-filter-augmented-case-inner-choice.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/get-filter-augmented-case.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/get-filter-augmented-case.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/get-filter-augmented-case.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/get-filter-augmented-case.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/get-filter-augmented-string.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/get-filter-augmented-string.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/get-filter-augmented-string.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/get-filter-augmented-string.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/get-filter-company-info.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/get-filter-company-info.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/get-filter-company-info.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/get-filter-company-info.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/get-filter-modules-and-admin.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/get-filter-modules-and-admin.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/get-filter-modules-and-admin.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/get-filter-modules-and-admin.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/get-filter-only-names-types.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/get-filter-only-names-types.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/get-filter-only-names-types.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/get-filter-only-names-types.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/get-filter-specific-module-type-and-user.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/get-filter-specific-module-type-and-user.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/get-filter-specific-module-type-and-user.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/get-filter-specific-module-type-and-user.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/get-filter-superuser.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/get-filter-superuser.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/get-filter-superuser.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/get-filter-superuser.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/get-filter-users.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/get-filter-users.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/get-filter-users.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/get-filter-users.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/response-augmented-case-inner-choice.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/response-augmented-case-inner-choice.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/response-augmented-case-inner-choice.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/response-augmented-case-inner-choice.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/response-augmented-case.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/response-augmented-case.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/response-augmented-case.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/response-augmented-case.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/response-augmented-string.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/response-augmented-string.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/filters/response-augmented-string.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/filters/response-augmented-string.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/get-config-map-entry.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/get-config-map-entry.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/get-config-map-entry.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/get-config-map-entry.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/get-empty-response.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/get-empty-response.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/get-empty-response.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/get-empty-response.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/get.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/get.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/get.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/get.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/getConfig.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/getConfig.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/getConfig.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/getConfig.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/getConfig_candidate.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/getConfig_candidate.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/getConfig_candidate.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/getConfig_candidate.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/lock.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/lock.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/lock.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/lock.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/lock_candidate.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/lock_candidate.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/lock_candidate.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/lock_candidate.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/lock_notarget.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/lock_notarget.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/lock_notarget.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/lock_notarget.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/rpc-reply_ok.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/rpc-reply_ok.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/rpc-reply_ok.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/rpc-reply_ok.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/rpcs/rpc-bad-namespace.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/rpcs/rpc-bad-namespace.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/rpcs/rpc-bad-namespace.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/rpcs/rpc-bad-namespace.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/rpcs/rpc-container-control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/rpcs/rpc-container-control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/rpcs/rpc-container-control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/rpcs/rpc-container-control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/rpcs/rpc-container.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/rpcs/rpc-container.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/rpcs/rpc-container.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/rpcs/rpc-container.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/rpcs/rpc-nonvoid-control.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/rpcs/rpc-nonvoid-control.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/rpcs/rpc-nonvoid-control.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/rpcs/rpc-nonvoid-control.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/rpcs/rpc-nonvoid.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/rpcs/rpc-nonvoid.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/rpcs/rpc-nonvoid.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/rpcs/rpc-nonvoid.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/rpcs/rpc-void-input-output.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/rpcs/rpc-void-input-output.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/rpcs/rpc-void-input-output.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/rpcs/rpc-void-input-output.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/rpcs/rpc-void-output.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/rpcs/rpc-void-output.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/rpcs/rpc-void-output.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/rpcs/rpc-void-output.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/rpcs/runtimerpc-ok-reply.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/rpcs/runtimerpc-ok-reply.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/rpcs/runtimerpc-ok-reply.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/rpcs/runtimerpc-ok-reply.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/unlock.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/unlock.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/unlock.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/unlock.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/unlock_candidate.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/unlock_candidate.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/unlock_candidate.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/unlock_candidate.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/unlock_notarget.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/unlock_notarget.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/unlock_notarget.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/unlock_notarget.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/validate/validate.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/validate/validate.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/validate/validate.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/validate/validate.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/validate/validate_no_source.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/validate/validate_no_source.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/validate/validate_no_source.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/validate/validate_no_source.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/validate/validate_running.xml b/plugins/netconf-server-mdsal/src/test/resources/messages/mapping/validate/validate_running.xml similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/messages/mapping/validate/validate_running.xml rename to plugins/netconf-server-mdsal/src/test/resources/messages/mapping/validate/validate_running.xml diff --git a/netconf/mdsal-netconf-connector/src/test/resources/yang/filter-validator-test-augment.yang b/plugins/netconf-server-mdsal/src/test/resources/yang/filter-validator-test-augment.yang similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/yang/filter-validator-test-augment.yang rename to plugins/netconf-server-mdsal/src/test/resources/yang/filter-validator-test-augment.yang diff --git a/netconf/mdsal-netconf-connector/src/test/resources/yang/filter-validator-test-mod-0.yang b/plugins/netconf-server-mdsal/src/test/resources/yang/filter-validator-test-mod-0.yang similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/yang/filter-validator-test-mod-0.yang rename to plugins/netconf-server-mdsal/src/test/resources/yang/filter-validator-test-mod-0.yang diff --git a/netconf/mdsal-netconf-connector/src/test/resources/yang/mdsal-netconf-mapping-test.yang b/plugins/netconf-server-mdsal/src/test/resources/yang/mdsal-netconf-mapping-test.yang similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/yang/mdsal-netconf-mapping-test.yang rename to plugins/netconf-server-mdsal/src/test/resources/yang/mdsal-netconf-mapping-test.yang diff --git a/netconf/mdsal-netconf-connector/src/test/resources/yang/mdsal-netconf-rpc-test.yang b/plugins/netconf-server-mdsal/src/test/resources/yang/mdsal-netconf-rpc-test.yang similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/yang/mdsal-netconf-rpc-test.yang rename to plugins/netconf-server-mdsal/src/test/resources/yang/mdsal-netconf-rpc-test.yang diff --git a/netconf/mdsal-netconf-connector/src/test/resources/yang/simple-list.yang b/plugins/netconf-server-mdsal/src/test/resources/yang/simple-list.yang similarity index 100% rename from netconf/mdsal-netconf-connector/src/test/resources/yang/simple-list.yang rename to plugins/netconf-server-mdsal/src/test/resources/yang/simple-list.yang diff --git a/plugins/pom.xml b/plugins/pom.xml index 8973ec861a..cd40690a9a 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -30,6 +30,7 @@ netconf-dom-api + netconf-server-mdsal sal-netconf-connector -- 2.36.6