From: Robert Varga Date: Fri, 28 Apr 2023 15:15:34 +0000 (+0200) Subject: Separate out netconf-test-util X-Git-Tag: v6.0.0~187 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=e5da6bd273d30e613d7d96375aa97378f55759d5;p=netconf.git Separate out netconf-test-util We have testing substrate, with tests and resources, packaged as test-jar in netconf-util. Separate these out into an explicit jar, which tests depend on. JIRA: NETCONF-1002 Change-Id: I07ab16b55ae4c83231074123ff9d48501e1d0c3b Signed-off-by: Robert Varga --- diff --git a/artifacts/pom.xml b/artifacts/pom.xml index baeeb3465f..01d78663b2 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -70,6 +70,12 @@ netconf-server-mdsal ${project.version} + + ${project.groupId} + netconf-test-util + ${project.version} + test + ${project.groupId} mdsal-netconf-monitoring @@ -286,12 +292,6 @@ ${project.version} test-jar - - ${project.groupId} - netconf-util - ${project.version} - test-jar - diff --git a/netconf/netconf-netty-util/pom.xml b/netconf/netconf-netty-util/pom.xml index 1eb87996d8..a12b1e30d9 100644 --- a/netconf/netconf-netty-util/pom.xml +++ b/netconf/netconf-netty-util/pom.xml @@ -91,9 +91,7 @@ ${project.groupId} - netconf-util - test-jar - test + netconf-test-util diff --git a/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/Netconf539Test.java b/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/Netconf539Test.java index 159bd9aace..791d3c8a6a 100644 --- a/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/Netconf539Test.java +++ b/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/Netconf539Test.java @@ -32,7 +32,7 @@ import org.opendaylight.netconf.nettyutil.handler.FramingMechanismHandlerFactory import org.opendaylight.netconf.nettyutil.handler.NetconfChunkAggregator; import org.opendaylight.netconf.nettyutil.handler.NetconfEOMAggregator; import org.opendaylight.netconf.nettyutil.handler.NetconfXMLToHelloMessageDecoder; -import org.opendaylight.netconf.util.test.XmlFileLoader; +import org.opendaylight.netconf.test.util.XmlFileLoader; import org.w3c.dom.Document; @RunWith(MockitoJUnitRunner.StrictStubs.class) @@ -81,4 +81,4 @@ public class Netconf539Test { assertTrue("ChunkedFramingMechanismEncoder was not installed in the Netconf pipeline", channel.pipeline().get(NETCONF_MESSAGE_FRAME_ENCODER) instanceof ChunkedFramingMechanismEncoder); } -} \ No newline at end of file +} diff --git a/plugins/netconf-server-mdsal/pom.xml b/plugins/netconf-server-mdsal/pom.xml index ccc9688565..a1e686aad7 100644 --- a/plugins/netconf-server-mdsal/pom.xml +++ b/plugins/netconf-server-mdsal/pom.xml @@ -128,9 +128,7 @@ org.opendaylight.netconf - netconf-util - test-jar - test + netconf-test-util org.xmlunit diff --git a/plugins/netconf-server-mdsal/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 index 2dd04a8434..1d3ffbb0f6 100644 --- a/plugins/netconf-server-mdsal/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 @@ -46,8 +46,8 @@ import org.opendaylight.netconf.mdsal.connector.ops.get.Get; import org.opendaylight.netconf.mdsal.connector.ops.get.GetConfig; import org.opendaylight.netconf.server.api.operations.NetconfOperation; import org.opendaylight.netconf.server.api.operations.NetconfOperationChainedExecution; -import org.opendaylight.netconf.util.test.NetconfXmlUnitRecursiveQualifier; -import org.opendaylight.netconf.util.test.XmlFileLoader; +import org.opendaylight.netconf.test.util.NetconfXmlUnitRecursiveQualifier; +import org.opendaylight.netconf.test.util.XmlFileLoader; import org.opendaylight.yangtools.util.concurrent.SpecialExecutors; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; diff --git a/plugins/netconf-server-mdsal/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 index 96a81aaea4..c23833535c 100644 --- a/plugins/netconf-server-mdsal/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 @@ -20,7 +20,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.xml.XmlUtil; -import org.opendaylight.netconf.util.test.XmlFileLoader; +import org.opendaylight.netconf.test.util.XmlFileLoader; import org.opendaylight.yangtools.yang.common.ErrorSeverity; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; diff --git a/plugins/netconf-server-mdsal/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 index 537fbbcef0..b46041a24f 100644 --- a/plugins/netconf-server-mdsal/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 @@ -20,7 +20,7 @@ import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.mdsal.connector.CurrentSchemaContext; import org.opendaylight.netconf.mdsal.connector.TransactionProvider; import org.opendaylight.netconf.mdsal.connector.ops.get.GetConfig; -import org.opendaylight.netconf.util.test.XmlFileLoader; +import org.opendaylight.netconf.test.util.XmlFileLoader; import org.opendaylight.yangtools.yang.common.ErrorSeverity; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; diff --git a/plugins/netconf-server-mdsal/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 index 58e17786fc..960457292a 100644 --- a/plugins/netconf-server-mdsal/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 @@ -45,7 +45,7 @@ import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.mdsal.connector.CurrentSchemaContext; import org.opendaylight.netconf.server.api.operations.HandlingPriority; import org.opendaylight.netconf.server.api.operations.NetconfOperationChainedExecution; -import org.opendaylight.netconf.util.test.XmlFileLoader; +import org.opendaylight.netconf.test.util.XmlFileLoader; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.concepts.NoOpListenerRegistration; import org.opendaylight.yangtools.yang.common.ErrorSeverity; diff --git a/plugins/sal-netconf-connector/pom.xml b/plugins/sal-netconf-connector/pom.xml index 45b18f671a..6da88a672d 100644 --- a/plugins/sal-netconf-connector/pom.xml +++ b/plugins/sal-netconf-connector/pom.xml @@ -122,9 +122,7 @@ ${project.groupId} - netconf-util - test-jar - test + netconf-test-util com.google.code.gson diff --git a/protocol/netconf-client/pom.xml b/protocol/netconf-client/pom.xml index fa9f406a40..acaef68fc0 100644 --- a/protocol/netconf-client/pom.xml +++ b/protocol/netconf-client/pom.xml @@ -82,9 +82,7 @@ org.opendaylight.netconf - netconf-util - test-jar - test + netconf-test-util diff --git a/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorTest.java b/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorTest.java index 0a82453923..129793ee94 100644 --- a/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorTest.java +++ b/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorTest.java @@ -47,7 +47,7 @@ import org.opendaylight.netconf.nettyutil.handler.NetconfXMLToHelloMessageDecode import org.opendaylight.netconf.nettyutil.handler.NetconfXMLToMessageDecoder; import org.opendaylight.netconf.nettyutil.handler.exi.EXIParameters; import org.opendaylight.netconf.nettyutil.handler.exi.NetconfStartExiMessage; -import org.opendaylight.netconf.util.test.XmlFileLoader; +import org.opendaylight.netconf.test.util.XmlFileLoader; import org.w3c.dom.Document; public class NetconfClientSessionNegotiatorTest { diff --git a/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfMessageUtilTest.java b/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfMessageUtilTest.java index 4b708b50a5..c1336ea6e0 100644 --- a/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfMessageUtilTest.java +++ b/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfMessageUtilTest.java @@ -13,7 +13,7 @@ import static org.junit.Assert.assertTrue; import java.util.Collection; import org.junit.Test; import org.opendaylight.netconf.api.NetconfMessage; -import org.opendaylight.netconf.util.test.XmlFileLoader; +import org.opendaylight.netconf.test.util.XmlFileLoader; public class NetconfMessageUtilTest { @Test diff --git a/protocol/netconf-server/pom.xml b/protocol/netconf-server/pom.xml index 067a97761f..92bff34023 100644 --- a/protocol/netconf-server/pom.xml +++ b/protocol/netconf-server/pom.xml @@ -119,9 +119,7 @@ org.opendaylight.netconf - netconf-util - test-jar - test + netconf-test-util org.opendaylight.netconf diff --git a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/ConcurrentClientsTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/ConcurrentClientsTest.java index b96588bb85..212668fcc9 100644 --- a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/ConcurrentClientsTest.java +++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/ConcurrentClientsTest.java @@ -73,7 +73,7 @@ import org.opendaylight.netconf.server.api.operations.NetconfOperationService; import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; import org.opendaylight.netconf.server.impl.DefaultSessionIdProvider; import org.opendaylight.netconf.server.osgi.AggregatedNetconfOperationServiceFactory; -import org.opendaylight.netconf.util.test.XmlFileLoader; +import org.opendaylight.netconf.test.util.XmlFileLoader; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.CapabilitiesBuilder; import org.opendaylight.yangtools.concepts.Registration; import org.slf4j.Logger; diff --git a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/ExiEncodeDecodeTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/ExiEncodeDecodeTest.java index c28c98188e..12ef9ea7f7 100644 --- a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/ExiEncodeDecodeTest.java +++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/ExiEncodeDecodeTest.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertNotNull; import org.junit.Test; import org.opendaylight.netconf.api.NetconfMessage; -import org.opendaylight.netconf.util.test.XmlFileLoader; +import org.opendaylight.netconf.test.util.XmlFileLoader; public class ExiEncodeDecodeTest { @Test diff --git a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/MessageParserTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/MessageParserTest.java index 6aaf190904..665bbe68c4 100644 --- a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/MessageParserTest.java +++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/MessageParserTest.java @@ -29,7 +29,7 @@ import org.opendaylight.netconf.nettyutil.handler.NetconfChunkAggregator; import org.opendaylight.netconf.nettyutil.handler.NetconfEOMAggregator; import org.opendaylight.netconf.nettyutil.handler.NetconfMessageToXMLEncoder; import org.opendaylight.netconf.nettyutil.handler.NetconfXMLToMessageDecoder; -import org.opendaylight.netconf.util.test.XmlFileLoader; +import org.opendaylight.netconf.test.util.XmlFileLoader; public class MessageParserTest { private NetconfMessage msg; diff --git a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/api/operations/AbstractNetconfOperationTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/api/operations/AbstractNetconfOperationTest.java index efd96bf287..a1006f2689 100644 --- a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/api/operations/AbstractNetconfOperationTest.java +++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/api/operations/AbstractNetconfOperationTest.java @@ -18,7 +18,7 @@ import org.junit.Test; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlUtil; -import org.opendaylight.netconf.util.test.XmlFileLoader; +import org.opendaylight.netconf.test.util.XmlFileLoader; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.xml.sax.SAXException; diff --git a/protocol/netconf-test-util/pom.xml b/protocol/netconf-test-util/pom.xml new file mode 100644 index 0000000000..355fefae96 --- /dev/null +++ b/protocol/netconf-test-util/pom.xml @@ -0,0 +1,38 @@ + + + + 4.0.0 + + + org.opendaylight.netconf + netconf-parent + 6.0.0-SNAPSHOT + ../../parent + + + netconf-test-util + ${project.artifactId} + + + + org.opendaylight.netconf + netconf-api + + + junit + junit + compile + + + org.xmlunit + xmlunit-legacy + compile + + + diff --git a/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/test/NetconfXmlUnitRecursiveQualifier.java b/protocol/netconf-test-util/src/main/java/org/opendaylight/netconf/test/util/NetconfXmlUnitRecursiveQualifier.java similarity index 74% rename from protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/test/NetconfXmlUnitRecursiveQualifier.java rename to protocol/netconf-test-util/src/main/java/org/opendaylight/netconf/test/util/NetconfXmlUnitRecursiveQualifier.java index 4e55591271..a4dc3217c1 100644 --- a/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/test/NetconfXmlUnitRecursiveQualifier.java +++ b/protocol/netconf-test-util/src/main/java/org/opendaylight/netconf/test/util/NetconfXmlUnitRecursiveQualifier.java @@ -5,9 +5,11 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ +package org.opendaylight.netconf.test.util; -package org.opendaylight.netconf.util.test; +import static java.util.Objects.requireNonNull; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.custommonkey.xmlunit.ElementNameAndTextQualifier; import org.custommonkey.xmlunit.ElementQualifier; import org.w3c.dom.Element; @@ -19,29 +21,27 @@ import org.w3c.dom.NodeList; * defaults to comparing element name and text content. */ public class NetconfXmlUnitRecursiveQualifier implements ElementQualifier { - private final ElementQualifier qualifier; public NetconfXmlUnitRecursiveQualifier() { - this.qualifier = new ElementNameAndTextQualifier(); + this(new ElementNameAndTextQualifier()); } public NetconfXmlUnitRecursiveQualifier(final ElementQualifier qualifier) { - this.qualifier = qualifier; + this.qualifier = requireNonNull(qualifier); } @Override - public boolean qualifyForComparison(Element currentControl, - Element currentTest) { + public boolean qualifyForComparison(final Element currentControl, + final Element currentTest) { return compareNodes(currentControl, currentTest); } @SuppressWarnings("checkstyle:IllegalCatch") - private boolean compareNodes(Node currentControl, Node currentTest) { + @SuppressFBWarnings(value = "REC_CATCH_EXCEPTION") + private boolean compareNodes(final Node currentControl, final Node currentTest) { try { - - if (!qualifier.qualifyForComparison((Element) currentControl, - (Element) currentTest)) { + if (!qualifier.qualifyForComparison((Element) currentControl, (Element) currentTest)) { return false; } @@ -52,18 +52,18 @@ public class NetconfXmlUnitRecursiveQualifier implements ElementQualifier { controlNodes = currentControl.getChildNodes(); testNodes = currentTest.getChildNodes(); } else { - return !(currentControl.hasChildNodes() || currentTest.hasChildNodes()); + return !currentControl.hasChildNodes() && !currentTest.hasChildNodes(); } - return (countNodesWithoutConsecutiveTextNodes(controlNodes) - == countNodesWithoutConsecutiveTextNodes(testNodes)) && checkChildren(controlNodes, testNodes); + return countNodesWithoutConsecutiveTextNodes(controlNodes) + == countNodesWithoutConsecutiveTextNodes(testNodes) && checkChildren(controlNodes, testNodes); } catch (Exception e) { return false; } } - private boolean checkChildren(NodeList controlNodes, NodeList testNodes) { + private boolean checkChildren(final NodeList controlNodes, final NodeList testNodes) { for (int i = 0; i < controlNodes.getLength(); i++) { boolean matchFound = false; for (int j = 0; j < testNodes.getLength(); j++) { @@ -93,7 +93,7 @@ public class NetconfXmlUnitRecursiveQualifier implements ElementQualifier { return true; } - private static String concatenateText(Node textNode) { + private static String concatenateText(final Node textNode) { StringBuilder builder = new StringBuilder(); Node next = textNode; @@ -107,11 +107,10 @@ public class NetconfXmlUnitRecursiveQualifier implements ElementQualifier { return builder.toString(); } - private static int countNodesWithoutConsecutiveTextNodes(NodeList nodeList) { + private static int countNodesWithoutConsecutiveTextNodes(final NodeList nodeList) { int count = 0; boolean lastNodeWasText = false; - final int length = nodeList.getLength(); - for (int i = 0; i < length; i++) { + for (int i = 0, length = nodeList.getLength(); i < length; i++) { Node node = nodeList.item(i); if (!lastNodeWasText || node.getNodeType() != Node.TEXT_NODE) { count++; diff --git a/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/test/XmlFileLoader.java b/protocol/netconf-test-util/src/main/java/org/opendaylight/netconf/test/util/XmlFileLoader.java similarity index 98% rename from protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/test/XmlFileLoader.java rename to protocol/netconf-test-util/src/main/java/org/opendaylight/netconf/test/util/XmlFileLoader.java index bbe27f126d..8870a8f1bb 100644 --- a/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/test/XmlFileLoader.java +++ b/protocol/netconf-test-util/src/main/java/org/opendaylight/netconf/test/util/XmlFileLoader.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.netconf.util.test; +package org.opendaylight.netconf.test.util; import static java.util.Objects.requireNonNull; diff --git a/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/test/XmlUnitUtil.java b/protocol/netconf-test-util/src/main/java/org/opendaylight/netconf/test/util/XmlUnitUtil.java similarity index 96% rename from protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/test/XmlUnitUtil.java rename to protocol/netconf-test-util/src/main/java/org/opendaylight/netconf/test/util/XmlUnitUtil.java index f774213a03..657e8a40a8 100644 --- a/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/test/XmlUnitUtil.java +++ b/protocol/netconf-test-util/src/main/java/org/opendaylight/netconf/test/util/XmlUnitUtil.java @@ -5,8 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - -package org.opendaylight.netconf.util.test; +package org.opendaylight.netconf.test.util; import static org.custommonkey.xmlunit.XMLAssert.assertNodeTestPasses; import static org.junit.Assert.assertEquals; @@ -24,11 +23,11 @@ import org.w3c.dom.Text; public final class XmlUnitUtil { private XmlUnitUtil() { - + // Hidden on purpose } - public static void assertContainsElementWithText(final Document doc, - final String textToFind) throws NodeTestException { + public static void assertContainsElementWithText(final Document doc, final String textToFind) + throws NodeTestException { NodeTest nt = new NodeTest(doc); NodeTester tester = new AbstractNodeTester() { diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/client_hello.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/client_hello.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/client_hello.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/client_hello.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/close-session.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/close-session.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/close-session.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/close-session.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/closeSession.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/closeSession.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/closeSession.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/closeSession.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/commit.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/commit.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/commit.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/commit.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/communicationError/testClientSendsRpcReply_expectedResponse.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/communicationError/testClientSendsRpcReply_expectedResponse.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/communicationError/testClientSendsRpcReply_expectedResponse.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/communicationError/testClientSendsRpcReply_expectedResponse.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/communicationError/testClientSendsRpcReply_request.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/communicationError/testClientSendsRpcReply_request.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/communicationError/testClientSendsRpcReply_request.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/communicationError/testClientSendsRpcReply_request.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/communicationError/testRpcWithoutMessageId_expectedResponse.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/communicationError/testRpcWithoutMessageId_expectedResponse.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/communicationError/testRpcWithoutMessageId_expectedResponse.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/communicationError/testRpcWithoutMessageId_expectedResponse.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/communicationError/testRpcWithoutMessageId_request.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/communicationError/testRpcWithoutMessageId_request.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/communicationError/testRpcWithoutMessageId_request.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/communicationError/testRpcWithoutMessageId_request.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/copy-config.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/copy-config.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/copy-config.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/copy-config.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/databaseInteraction/client_get_request_ConfigRegistry.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/databaseInteraction/client_get_request_ConfigRegistry.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/databaseInteraction/client_get_request_ConfigRegistry.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/databaseInteraction/client_get_request_ConfigRegistry.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/databaseInteraction/confg_subsystem_expected_reply.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/databaseInteraction/confg_subsystem_expected_reply.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/databaseInteraction/confg_subsystem_expected_reply.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/databaseInteraction/confg_subsystem_expected_reply.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/discardChanges.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/discardChanges.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/discardChanges.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/discardChanges.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/edit-config-delete-container-node-candidate.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/edit-config-delete-container-node-candidate.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/edit-config-delete-container-node-candidate.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/edit-config-delete-container-node-candidate.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/edit-config-delete-leaf-node-candidate.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/edit-config-delete-leaf-node-candidate.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/edit-config-delete-leaf-node-candidate.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/edit-config-delete-leaf-node-candidate.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/edit-config-test-module-running.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/edit-config-test-module-running.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/edit-config-test-module-running.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/edit-config-test-module-running.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/edit-config-test-module.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/edit-config-test-module.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/edit-config-test-module.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/edit-config-test-module.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/editConfig.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/editConfig.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_addServiceName.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_addServiceName.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/editConfig_addServiceName.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_addServiceName.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_addServiceNameOnTest.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_addServiceNameOnTest.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/editConfig_addServiceNameOnTest.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_addServiceNameOnTest.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_expectedResult.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_expectedResult.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/editConfig_expectedResult.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_expectedResult.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_identities.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_identities.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/editConfig_identities.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_identities.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_identities_inner_replace.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_identities_inner_replace.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/editConfig_identities_inner_replace.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_identities_inner_replace.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_merge_multiple-deps1.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_merge_multiple-deps1.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/editConfig_merge_multiple-deps1.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_merge_multiple-deps1.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_merge_multiple-deps2.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_merge_multiple-deps2.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/editConfig_merge_multiple-deps2.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_merge_multiple-deps2.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_merge_threadfactory.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_merge_threadfactory.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/editConfig_merge_threadfactory.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_merge_threadfactory.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_merge_yang-test.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_merge_yang-test.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/editConfig_merge_yang-test.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_merge_yang-test.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_none.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_none.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/editConfig_none.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_none.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_remove.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_remove.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/editConfig_remove.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_remove.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_removeServiceNameOnTest.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_removeServiceNameOnTest.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/editConfig_removeServiceNameOnTest.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_removeServiceNameOnTest.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_removeUnknownInstance.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_removeUnknownInstance.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/editConfig_removeUnknownInstance.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_removeUnknownInstance.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_replace_default.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_replace_default.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/editConfig_replace_default.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_replace_default.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_replace_default_ex.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_replace_default_ex.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/editConfig_replace_default_ex.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_replace_default_ex.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_replace_module.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_replace_module.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/editConfig_replace_module.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_replace_module.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_replace_module_ex.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_replace_module_ex.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/editConfig_replace_module_ex.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_replace_module_ex.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/editConfig_setUnions.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_setUnions.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/editConfig_setUnions.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/editConfig_setUnions.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/edit_config.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/edit_config.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/edit_config.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/edit_config.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/get-config-fields-request.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/get-config-fields-request.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/get-config-fields-request.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/get-config-fields-request.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/get-config-with-multiple-subtrees.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/get-config-with-multiple-subtrees.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/get-config-with-multiple-subtrees.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/get-config-with-multiple-subtrees.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/get-fields-request.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/get-fields-request.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/get-fields-request.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/get-fields-request.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/get-with-multiple-root-subtrees.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/get-with-multiple-root-subtrees.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/get-with-multiple-root-subtrees.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/get-with-multiple-root-subtrees.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/get-with-multiple-subtrees.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/get-with-multiple-subtrees.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/get-with-multiple-subtrees.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/get-with-multiple-subtrees.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/get.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/get.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/get.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/get.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/getConfig.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/getConfig.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/getConfig.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/getConfig.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/getConfig_candidate-filter.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/getConfig_candidate-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/getConfig_candidate-filter.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/getConfig_candidate-filter.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/getConfig_candidate.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/getConfig_candidate.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/getConfig_candidate.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/getConfig_candidate.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/get_schema-no-version.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/get_schema-no-version.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/get_schema-no-version.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/get_schema-no-version.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/get_schema.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/get_schema.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/get_schema.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/get_schema.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/handshake/client_hello_with_session_id.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/handshake/client_hello_with_session_id.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/handshake/client_hello_with_session_id.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/handshake/client_hello_with_session_id.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/handshake/client_hello_with_wrong_namespace.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/handshake/client_hello_with_wrong_namespace.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/handshake/client_hello_with_wrong_namespace.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/handshake/client_hello_with_wrong_namespace.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/lock-running.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/lock-running.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/lock-running.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/lock-running.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/lock.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/lock.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/lock.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/lock.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/mount/editConfig_merge_threadfactory.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/mount/editConfig_merge_threadfactory.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/mount/editConfig_merge_threadfactory.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/mount/editConfig_merge_threadfactory.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/mount/mount12002.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/mount/mount12002.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/mount/mount12002.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/mount/mount12002.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/mount/mount12003.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/mount/mount12003.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/mount/mount12003.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/mount/mount12003.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/mount/unmount12002.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/mount/unmount12002.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/mount/unmount12002.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/mount/unmount12002.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_differentNamespaceTO.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/namespaces/editConfig_differentNamespaceTO.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_differentNamespaceTO.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/namespaces/editConfig_differentNamespaceTO.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_sameAttrDifferentNamespaces.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/namespaces/editConfig_sameAttrDifferentNamespaces.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_sameAttrDifferentNamespaces.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/namespaces/editConfig_sameAttrDifferentNamespaces.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_sameAttrDifferentNamespacesList.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/namespaces/editConfig_sameAttrDifferentNamespacesList.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_sameAttrDifferentNamespacesList.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/namespaces/editConfig_sameAttrDifferentNamespacesList.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_typeNameConfigAttributeMatching.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/namespaces/editConfig_typeNameConfigAttributeMatching.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/namespaces/editConfig_typeNameConfigAttributeMatching.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/namespaces/editConfig_typeNameConfigAttributeMatching.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/rpc-reply_get.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/rpc-reply_get.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/rpc-reply_get.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/rpc-reply_get.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/rpc-reply_ok.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/rpc-reply_ok.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/rpc-reply_ok.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/rpc-reply_ok.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/rpcInner.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/rpcInner.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/rpcInner.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/rpcInner.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/rpcInnerInner.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/rpcInnerInner.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/rpcInnerInner.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/rpcInnerInner.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/rpcInnerInner_complex_output.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/rpcInnerInner_complex_output.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/rpcInnerInner_complex_output.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/rpcInnerInner_complex_output.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/startExi.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/startExi.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/startExi.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/startExi.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/stopExi.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/stopExi.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/stopExi.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/stopExi.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/threadpool-edit-config.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/threadpool-edit-config.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/threadpool-edit-config.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/threadpool-edit-config.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/unlock-running.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/unlock-running.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/unlock-running.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/unlock-running.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/unlock.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/unlock.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/unlock.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/unlock.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised1.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/unrecognised/editConfig_unrecognised1.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised1.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/unrecognised/editConfig_unrecognised1.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised2.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/unrecognised/editConfig_unrecognised2.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised2.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/unrecognised/editConfig_unrecognised2.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised3.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/unrecognised/editConfig_unrecognised3.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised3.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/unrecognised/editConfig_unrecognised3.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised4.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/unrecognised/editConfig_unrecognised4.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised4.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/unrecognised/editConfig_unrecognised4.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised5.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/unrecognised/editConfig_unrecognised5.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised5.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/unrecognised/editConfig_unrecognised5.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised6.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/unrecognised/editConfig_unrecognised6.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised6.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/unrecognised/editConfig_unrecognised6.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised7.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/unrecognised/editConfig_unrecognised7.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised7.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/unrecognised/editConfig_unrecognised7.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised8.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/unrecognised/editConfig_unrecognised8.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/unrecognised/editConfig_unrecognised8.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/unrecognised/editConfig_unrecognised8.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/validate-running.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/validate-running.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/validate-running.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/validate-running.xml diff --git a/protocol/netconf-util/src/test/resources/netconfMessages/validate.xml b/protocol/netconf-test-util/src/main/resources/netconfMessages/validate.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/netconfMessages/validate.xml rename to protocol/netconf-test-util/src/main/resources/netconfMessages/validate.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/notification/0/filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/notification/0/filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/notification/0/filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/notification/0/filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/notification/0/post-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/notification/0/post-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/notification/0/post-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/notification/0/post-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/notification/0/pre-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/notification/0/pre-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/notification/0/pre-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/notification/0/pre-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/notification/1/filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/notification/1/filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/notification/1/filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/notification/1/filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/notification/1/post-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/notification/1/post-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/notification/1/post-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/notification/1/post-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/notification/1/pre-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/notification/1/pre-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/notification/1/pre-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/notification/1/pre-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/notification/2/filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/notification/2/filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/notification/2/filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/notification/2/filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/notification/2/post-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/notification/2/post-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/notification/2/post-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/notification/2/post-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/notification/2/pre-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/notification/2/pre-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/notification/2/pre-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/notification/2/pre-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/notification/3/filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/notification/3/filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/notification/3/filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/notification/3/filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/notification/3/post-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/notification/3/post-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/notification/3/post-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/notification/3/post-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/notification/3/pre-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/notification/3/pre-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/notification/3/pre-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/notification/3/pre-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/notification/4/filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/notification/4/filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/notification/4/filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/notification/4/filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/notification/4/post-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/notification/4/post-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/notification/4/post-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/notification/4/post-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/notification/4/pre-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/notification/4/pre-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/notification/4/pre-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/notification/4/pre-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/0/post-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/0/post-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/0/post-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/0/post-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/0/pre-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/0/pre-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/0/pre-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/0/pre-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/0/request.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/0/request.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/0/request.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/0/request.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/1/post-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/1/post-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/1/post-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/1/post-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/1/pre-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/1/pre-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/1/pre-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/1/pre-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/1/request.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/1/request.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/1/request.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/1/request.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/10/post-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/10/post-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/10/post-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/10/post-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/10/pre-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/10/pre-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/10/pre-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/10/pre-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/10/request.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/10/request.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/10/request.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/10/request.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/2/post-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/2/post-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/2/post-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/2/post-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/2/pre-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/2/pre-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/2/pre-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/2/pre-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/2/request.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/2/request.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/2/request.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/2/request.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/3/post-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/3/post-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/3/post-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/3/post-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/3/pre-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/3/pre-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/3/pre-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/3/pre-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/3/request.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/3/request.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/3/request.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/3/request.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/4/post-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/4/post-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/4/post-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/4/post-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/4/pre-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/4/pre-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/4/pre-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/4/pre-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/4/request.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/4/request.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/4/request.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/4/request.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/5/post-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/5/post-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/5/post-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/5/post-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/5/pre-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/5/pre-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/5/pre-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/5/pre-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/5/request.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/5/request.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/5/request.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/5/request.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/6/post-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/6/post-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/6/post-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/6/post-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/6/pre-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/6/pre-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/6/pre-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/6/pre-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/6/request.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/6/request.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/6/request.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/6/request.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/7/post-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/7/post-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/7/post-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/7/post-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/7/pre-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/7/pre-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/7/pre-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/7/pre-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/7/request.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/7/request.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/7/request.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/7/request.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/8/post-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/8/post-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/8/post-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/8/post-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/8/pre-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/8/pre-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/8/pre-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/8/pre-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/8/request.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/8/request.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/8/request.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/8/request.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/9/post-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/9/post-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/9/post-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/9/post-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/9/pre-filter.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/9/pre-filter.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/9/pre-filter.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/9/pre-filter.xml diff --git a/protocol/netconf-util/src/test/resources/subtree/rpc/9/request.xml b/protocol/netconf-test-util/src/main/resources/subtree/rpc/9/request.xml similarity index 100% rename from protocol/netconf-util/src/test/resources/subtree/rpc/9/request.xml rename to protocol/netconf-test-util/src/main/resources/subtree/rpc/9/request.xml diff --git a/protocol/netconf-util/pom.xml b/protocol/netconf-util/pom.xml index d6cfd27fbf..848bb2fc1e 100644 --- a/protocol/netconf-util/pom.xml +++ b/protocol/netconf-util/pom.xml @@ -79,15 +79,6 @@ netconf-api - - org.opendaylight.yangtools - mockito-configuration - - - org.opendaylight.mdsal - mdsal-binding-generator - test - org.opendaylight.mdsal mdsal-binding-runtime-spi @@ -107,34 +98,4 @@ xmlunit-legacy - - - - - org.apache.felix - maven-bundle-plugin - - - maven-jar-plugin - - - - test-jar - - - - - - maven-source-plugin - - - - test-jar-no-fork - - - - - - - diff --git a/protocol/pom.xml b/protocol/pom.xml index 50be4210a9..429ba07a43 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -32,6 +32,7 @@ netconf-api netconf-client netconf-server + netconf-test-util netconf-util restconf-api