Rename sal-netconf-connector to netconf-client-mdsal

The old name does not reflect what the artifact does, rename it to
reflect the fact it is the integration of netconf-client with MD-SAL
services.

JIRA: NETCONF-1006
Change-Id: I2185038ac21c0b0aa388f588dbd873ba5ea00b13
Signed-off-by: Robert Varga <[email protected]>

diff --git a/apps/callhome-provider/pom.xml b/apps/callhome-provider/pom.xml
index 362b978b199e212b558fa730b71e5bd29ee7f619..35cee78b92e32fcc973db4895b9307db2690bbe3 100644 (file)
--- a/apps/callhome-provider/pom.xml
+++ b/apps/callhome-provider/pom.xml
@@ -96,7 +96,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>sal-netconf-connector</artifactId>
+            <artifactId>netconf-client-mdsal</artifactId>
         </dependency>
         <dependency>
             <groupId>com.guicedee.services</groupId>

diff --git a/apps/netconf-console/pom.xml b/apps/netconf-console/pom.xml
index 7a31c4939e440db8de049d0db302480bc6c9e626..fe8e96bc106334858c067eb6d004976675cafbfb 100644 (file)
--- a/apps/netconf-console/pom.xml
+++ b/apps/netconf-console/pom.xml
@@ -32,7 +32,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       </dependency>
       <dependency>
           <groupId>org.opendaylight.netconf</groupId>
-          <artifactId>sal-netconf-connector</artifactId>
+          <artifactId>netconf-client-mdsal</artifactId>
       </dependency>
       <dependency>
           <groupId>com.guicedee.services</groupId>

diff --git a/apps/netconf-topology-singleton/pom.xml b/apps/netconf-topology-singleton/pom.xml
index 4e5184b3a6175f85a744b0408f95da18fa1586d1..c29bac88f5f1c3b8d7a154f4305f821dae2808ec 100644 (file)
--- a/apps/netconf-topology-singleton/pom.xml
+++ b/apps/netconf-topology-singleton/pom.xml
@@ -30,7 +30,7 @@
 
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>sal-netconf-connector</artifactId>
+            <artifactId>netconf-client-mdsal</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>

diff --git a/apps/netconf-topology/pom.xml b/apps/netconf-topology/pom.xml
index 98a77e921e0b9d05faf488339b40d21579cda286..df81f3bebc4ea5fc3df7dbcd3c85db9013b39c8b 100644 (file)
--- a/apps/netconf-topology/pom.xml
+++ b/apps/netconf-topology/pom.xml
@@ -33,7 +33,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>sal-netconf-connector</artifactId>
+            <artifactId>netconf-client-mdsal</artifactId>
         </dependency>
 
         <dependency>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index e8708d14c943bf4dd67e0ddc604acab3b6c4798f..6ded3462c1eba5841e5b1b0bae739c080aaaacc2 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -103,7 +103,7 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>sal-netconf-connector</artifactId>
+                <artifactId>netconf-client-mdsal</artifactId>
                 <version>${project.version}</version>
             </dependency>
 

diff --git a/features/odl-netconf-connector/pom.xml b/features/odl-netconf-connector/pom.xml
index a2c6d26fee9bdebac6429c1d3782baa15fc14dea..a65e0c3f07f7e2192e8ab5b4a5bac1428f089174 100644 (file)
--- a/features/odl-netconf-connector/pom.xml
+++ b/features/odl-netconf-connector/pom.xml
@@ -59,7 +59,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>sal-netconf-connector</artifactId>
+            <artifactId>netconf-client-mdsal</artifactId>
         </dependency>
     </dependencies>
 </project>

diff --git a/netconf/callhome-protocol/pom.xml b/netconf/callhome-protocol/pom.xml
index 7eaf5246ebd94229580bf3385e8217867356b7cd..296d70dc56f9594dbd9a53711bddea838be25711 100644 (file)
--- a/netconf/callhome-protocol/pom.xml
+++ b/netconf/callhome-protocol/pom.xml
@@ -54,11 +54,11 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>netconf-netty-util</artifactId>
+      <artifactId>netconf-client-mdsal</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>sal-netconf-connector</artifactId>
+      <artifactId>netconf-netty-util</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/tools/netconf-testtool/pom.xml b/netconf/tools/netconf-testtool/pom.xml
index 20eb7c002504de980850cd70beb6cf9fd3177741..c632a9c6fe35a571f5058f127e33a05b5f8e4fda 100644 (file)
--- a/netconf/tools/netconf-testtool/pom.xml
+++ b/netconf/tools/netconf-testtool/pom.xml
@@ -63,15 +63,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>sal-netconf-connector</artifactId>
-        </dependency>
-       <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>mockito-configuration</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
+            <artifactId>netconf-client-mdsal</artifactId>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -122,6 +114,11 @@
             <groupId>org.apache.karaf.features</groupId>
             <artifactId>org.apache.karaf.features.core</artifactId>
         </dependency>
+
+       <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>mockito-configuration</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.xmlunit</groupId>
             <artifactId>xmlunit-core</artifactId>

diff --git a/plugins/sal-netconf-connector/pom.xml b/plugins/netconf-client-mdsal/pom.xml
similarity index 99%
rename from plugins/sal-netconf-connector/pom.xml
rename to plugins/netconf-client-mdsal/pom.xml
index cf047ca4eeaaa2f7868ae4e5d1c3f6b905105112..9e9fd36bb3e4e2600e838e45c6b7ae49cf36aeeb 100644 (file)
--- a/plugins/sal-netconf-connector/pom.xml
+++ b/plugins/netconf-client-mdsal/pom.xml
@@ -15,7 +15,7 @@
     <relativePath>../../parent</relativePath>
   </parent>
 
-  <artifactId>sal-netconf-connector</artifactId>
+  <artifactId>netconf-client-mdsal</artifactId>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/ActionTransformer.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/ActionTransformer.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/ActionTransformer.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/ActionTransformer.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/DeviceActionFactory.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/DeviceActionFactory.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/DeviceActionFactory.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/DeviceActionFactory.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/NetconfDeviceSchemas.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/NetconfDeviceSchemas.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/NetconfDeviceSchemas.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/NetconfDeviceSchemas.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/NetconfDeviceSchemasResolver.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/NetconfDeviceSchemasResolver.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/NetconfDeviceSchemasResolver.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/NetconfDeviceSchemasResolver.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/NetconfRpcService.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/NetconfRpcService.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/NetconfRpcService.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/NetconfRpcService.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/NotificationTransformer.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/NotificationTransformer.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/NotificationTransformer.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/NotificationTransformer.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/RemoteDevice.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/RemoteDevice.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/RemoteDevice.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/RemoteDevice.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/RemoteDeviceCommunicator.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/RemoteDeviceCommunicator.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/RemoteDeviceCommunicator.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/RemoteDeviceCommunicator.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/RemoteDeviceHandler.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/RemoteDeviceHandler.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/RemoteDeviceHandler.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/RemoteDeviceHandler.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/RemoteDeviceId.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/RemoteDeviceId.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/RemoteDeviceId.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/RemoteDeviceId.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/RemoteDeviceServices.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/RemoteDeviceServices.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/RemoteDeviceServices.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/RemoteDeviceServices.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/RpcTransformer.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/RpcTransformer.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/RpcTransformer.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/RpcTransformer.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/SchemaResourceManager.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/SchemaResourceManager.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/SchemaResourceManager.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/SchemaResourceManager.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/SchemalessRpcService.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/SchemalessRpcService.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/SchemalessRpcService.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/SchemalessRpcService.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/package-info.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/package-info.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/package-info.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/api/package-info.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/impl/DefaultSchemaResourceManager.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/impl/DefaultSchemaResourceManager.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/impl/DefaultSchemaResourceManager.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/impl/DefaultSchemaResourceManager.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/DeviceActionFactoryImpl.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/DeviceActionFactoryImpl.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/DeviceActionFactoryImpl.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/DeviceActionFactoryImpl.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/DeviceMountPointContext.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/DeviceMountPointContext.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/DeviceMountPointContext.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/DeviceMountPointContext.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/DeviceSources.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/DeviceSources.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/DeviceSources.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/DeviceSources.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/DeviceSourcesResolver.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/DeviceSourcesResolver.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/DeviceSourcesResolver.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/DeviceSourcesResolver.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemas.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemas.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemas.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemas.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDevice.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDevice.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDevice.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDevice.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDeviceBuilder.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDeviceBuilder.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDeviceBuilder.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDeviceBuilder.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDeviceSchema.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDeviceSchema.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDeviceSchema.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDeviceSchema.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfMountPointContextFactory.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfMountPointContextFactory.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfMountPointContextFactory.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfMountPointContextFactory.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemas.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemas.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemas.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemas.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemasResolverImpl.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemasResolverImpl.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemasResolverImpl.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemasResolverImpl.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NotificationHandler.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NotificationHandler.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NotificationHandler.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NotificationHandler.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/SchemalessNetconfDevice.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/SchemalessNetconfDevice.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/SchemalessNetconfDevice.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/SchemalessNetconfDevice.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/auth/DatastoreBackedPublicKeyAuth.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/auth/DatastoreBackedPublicKeyAuth.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/auth/DatastoreBackedPublicKeyAuth.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/auth/DatastoreBackedPublicKeyAuth.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCapabilities.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCapabilities.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCapabilities.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCapabilities.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicator.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicator.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicator.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicator.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferences.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferences.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferences.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferences.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/UncancellableFuture.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/UncancellableFuture.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/UncancellableFuture.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/UncancellableFuture.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/UserPreferences.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/UserPreferences.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/UserPreferences.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/UserPreferences.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/package-info.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/package-info.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/package-info.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/package-info.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/AbstractNetconfDataTreeService.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/AbstractNetconfDataTreeService.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/AbstractNetconfDataTreeService.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/AbstractNetconfDataTreeService.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacade.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacade.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacade.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacade.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceDataBroker.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceDataBroker.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceDataBroker.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceDataBroker.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceMount.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceMount.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceMount.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceMount.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceNotificationService.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceNotificationService.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceNotificationService.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceNotificationService.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceRpc.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceRpc.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceRpc.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceRpc.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalFacade.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalFacade.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalFacade.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalFacade.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfKeystoreAdapter.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfKeystoreAdapter.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfKeystoreAdapter.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfKeystoreAdapter.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/SchemalessNetconfDeviceRpc.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/SchemalessNetconfDeviceRpc.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/SchemalessNetconfDeviceRpc.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/SchemalessNetconfDeviceRpc.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractReadOnlyTx.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractReadOnlyTx.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractReadOnlyTx.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractReadOnlyTx.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractTxChain.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractTxChain.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractTxChain.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractTxChain.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractWriteTx.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractWriteTx.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractWriteTx.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractWriteTx.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareReadOnlyTx.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareReadOnlyTx.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareReadOnlyTx.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareReadOnlyTx.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareReadWriteTx.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareReadWriteTx.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareReadWriteTx.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareReadWriteTx.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareTxChain.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareTxChain.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareTxChain.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareTxChain.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadOnlyTx.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadOnlyTx.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadOnlyTx.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadOnlyTx.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadWriteTx.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadWriteTx.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadWriteTx.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadWriteTx.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxChain.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxChain.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxChain.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxChain.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxListener.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxListener.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxListener.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxListener.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateRunningTx.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateRunningTx.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateRunningTx.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateRunningTx.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateTx.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateTx.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateTx.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateTx.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteRunningTx.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteRunningTx.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteRunningTx.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteRunningTx.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/YangLibrarySchemaYangSourceProvider.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/YangLibrarySchemaYangSourceProvider.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/YangLibrarySchemaYangSourceProvider.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/YangLibrarySchemaYangSourceProvider.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/BaseNetconfSchemas.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/BaseNetconfSchemas.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/BaseNetconfSchemas.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/BaseNetconfSchemas.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/BaseRpcSchemalessTransformer.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/BaseRpcSchemalessTransformer.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/BaseRpcSchemalessTransformer.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/BaseRpcSchemalessTransformer.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/BaseSchema.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/BaseSchema.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/BaseSchema.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/BaseSchema.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/DefaultBaseNetconfSchemas.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/DefaultBaseNetconfSchemas.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/DefaultBaseNetconfSchemas.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/DefaultBaseNetconfSchemas.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/SchemalessMessageTransformer.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/SchemalessMessageTransformer.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/SchemalessMessageTransformer.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/SchemalessMessageTransformer.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/FieldsFilter.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/FieldsFilter.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/FieldsFilter.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/FieldsFilter.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOps.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOps.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOps.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOps.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfRpcFutureCallback.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfRpcFutureCallback.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfRpcFutureCallback.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfRpcFutureCallback.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfRpcStructureTransformer.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfRpcStructureTransformer.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfRpcStructureTransformer.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfRpcStructureTransformer.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/RpcStructureTransformer.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/RpcStructureTransformer.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/RpcStructureTransformer.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/RpcStructureTransformer.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/SchemalessRpcStructureTransformer.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/SchemalessRpcStructureTransformer.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/SchemalessRpcStructureTransformer.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/SchemalessRpcStructureTransformer.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/MessageCounter.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/util/MessageCounter.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/MessageCounter.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/util/MessageCounter.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/NetconfSalKeystoreService.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/util/NetconfSalKeystoreService.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/NetconfSalKeystoreService.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/util/NetconfSalKeystoreService.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/SslHandlerFactoryImpl.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/util/SslHandlerFactoryImpl.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/SslHandlerFactoryImpl.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/util/SslHandlerFactoryImpl.java

diff --git a/plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/package-info.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/util/package-info.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/package-info.java
rename to plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/sal/connect/util/package-info.java

diff --git a/plugins/sal-netconf-connector/src/main/yang/netconf-keystore.yang b/plugins/netconf-client-mdsal/src/main/yang/netconf-keystore.yang
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/yang/netconf-keystore.yang
rename to plugins/netconf-client-mdsal/src/main/yang/netconf-keystore.yang

diff --git a/plugins/sal-netconf-connector/src/main/yang/odl-netconf-device.yang b/plugins/netconf-client-mdsal/src/main/yang/odl-netconf-device.yang
similarity index 100%
rename from plugins/sal-netconf-connector/src/main/yang/odl-netconf-device.yang
rename to plugins/netconf-client-mdsal/src/main/yang/odl-netconf-device.yang

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/api/RemoteDeviceIdTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/api/RemoteDeviceIdTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/api/RemoteDeviceIdTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/api/RemoteDeviceIdTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/AbstractBaseSchemasTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/AbstractBaseSchemasTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/AbstractBaseSchemasTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/AbstractBaseSchemasTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/AbstractTestModelTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/AbstractTestModelTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/AbstractTestModelTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/AbstractTestModelTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemasTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemasTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemasTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemasTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NC881Test.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NC881Test.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NC881Test.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NC881Test.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDeviceTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDeviceTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDeviceTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDeviceTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfNestedNotificationTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfNestedNotificationTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfNestedNotificationTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfNestedNotificationTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemasTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemasTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemasTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemasTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfToNotificationTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfToNotificationTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfToNotificationTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfToNotificationTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfToRpcRequestTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfToRpcRequestTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfToRpcRequestTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfToRpcRequestTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/SchemalessNetconfDeviceTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/SchemalessNetconfDeviceTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/SchemalessNetconfDeviceTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/SchemalessNetconfDeviceTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferencesTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferencesTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferencesTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferencesTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacadeResponseWaitingTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacadeResponseWaitingTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacadeResponseWaitingTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacadeResponseWaitingTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacadeTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacadeTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacadeTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacadeTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/MountInstanceTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/MountInstanceTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/MountInstanceTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/MountInstanceTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDataTreeServiceImplTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDataTreeServiceImplTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDataTreeServiceImplTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDataTreeServiceImplTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceDataBrokerTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceDataBrokerTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceDataBrokerTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceDataBrokerTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceNotificationServiceTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceNotificationServiceTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceNotificationServiceTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceNotificationServiceTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceRpcTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceRpcTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceRpcTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceRpcTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalFacadeTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalFacadeTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalFacadeTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalFacadeTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfKeystoreAdapterTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfKeystoreAdapterTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfKeystoreAdapterTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfKeystoreAdapterTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/SchemalessNetconfDeviceRpcTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/SchemalessNetconfDeviceRpcTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/SchemalessNetconfDeviceRpcTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/SchemalessNetconfDeviceRpcTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareReadOnlyTxTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareReadOnlyTxTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareReadOnlyTxTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareReadOnlyTxTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareReadWriteTxTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareReadWriteTxTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareReadWriteTxTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/FieldsAwareReadWriteTxTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/NetconfDeviceWriteOnlyTxTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/NetconfDeviceWriteOnlyTxTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/NetconfDeviceWriteOnlyTxTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/NetconfDeviceWriteOnlyTxTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadOnlyTxTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadOnlyTxTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadOnlyTxTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadOnlyTxTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadWriteTxTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadWriteTxTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadWriteTxTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadWriteTxTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxChainTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxChainTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxChainTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxChainTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxTestUtils.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxTestUtils.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxTestUtils.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxTestUtils.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateRunningTxTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateRunningTxTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateRunningTxTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateRunningTxTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateTxTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateTxTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateTxTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateTxTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteRunningTxTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteRunningTxTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteRunningTxTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteRunningTxTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProviderTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProviderTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProviderTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProviderTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/YangLibrarySchemaYangSourceProviderTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/YangLibrarySchemaYangSourceProviderTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/YangLibrarySchemaYangSourceProviderTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/YangLibrarySchemaYangSourceProviderTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/BaseRpcSchemalessTransformerTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/BaseRpcSchemalessTransformerTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/BaseRpcSchemalessTransformerTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/BaseRpcSchemalessTransformerTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/SchemalessMessageTransformerTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/SchemalessMessageTransformerTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/SchemalessMessageTransformerTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/SchemalessMessageTransformerTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/FieldsSchemalessRpcStructureTransformerTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/FieldsSchemalessRpcStructureTransformerTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/FieldsSchemalessRpcStructureTransformerTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/FieldsSchemalessRpcStructureTransformerTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOpsTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOpsTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOpsTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOpsTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfSalKeystoreServiceTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfSalKeystoreServiceTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfSalKeystoreServiceTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfSalKeystoreServiceTest.java

diff --git a/plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/SchemalessRpcStructureTransformerTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/SchemalessRpcStructureTransformerTest.java
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/SchemalessRpcStructureTransformerTest.java
rename to plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/SchemalessRpcStructureTransformerTest.java

diff --git a/plugins/sal-netconf-connector/src/test/resources/nc881/netconf-state-filtered.xml b/plugins/netconf-client-mdsal/src/test/resources/nc881/netconf-state-filtered.xml
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/nc881/netconf-state-filtered.xml
rename to plugins/netconf-client-mdsal/src/test/resources/nc881/netconf-state-filtered.xml

diff --git a/plugins/sal-netconf-connector/src/test/resources/nc881/netconf-state.xml b/plugins/netconf-client-mdsal/src/test/resources/nc881/netconf-state.xml
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/nc881/netconf-state.xml
rename to plugins/netconf-client-mdsal/src/test/resources/nc881/netconf-state.xml

diff --git a/plugins/sal-netconf-connector/src/test/resources/nested-notification-payload.xml b/plugins/netconf-client-mdsal/src/test/resources/nested-notification-payload.xml
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/nested-notification-payload.xml
rename to plugins/netconf-client-mdsal/src/test/resources/nested-notification-payload.xml

diff --git a/plugins/sal-netconf-connector/src/test/resources/netconf-keystore.xml b/plugins/netconf-client-mdsal/src/test/resources/netconf-keystore.xml
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/netconf-keystore.xml
rename to plugins/netconf-client-mdsal/src/test/resources/netconf-keystore.xml

diff --git a/plugins/sal-netconf-connector/src/test/resources/netconf-state.schemas.payload.xml b/plugins/netconf-client-mdsal/src/test/resources/netconf-state.schemas.payload.xml
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/netconf-state.schemas.payload.xml
rename to plugins/netconf-client-mdsal/src/test/resources/netconf-state.schemas.payload.xml

diff --git a/plugins/sal-netconf-connector/src/test/resources/notification-payload.xml b/plugins/netconf-client-mdsal/src/test/resources/notification-payload.xml
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/notification-payload.xml
rename to plugins/netconf-client-mdsal/src/test/resources/notification-payload.xml

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemaless/data/container.xml b/plugins/netconf-client-mdsal/src/test/resources/schemaless/data/container.xml
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemaless/data/container.xml
rename to plugins/netconf-client-mdsal/src/test/resources/schemaless/data/container.xml

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemaless/data/keyed-list-bad-key.xml b/plugins/netconf-client-mdsal/src/test/resources/schemaless/data/keyed-list-bad-key.xml
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemaless/data/keyed-list-bad-key.xml
rename to plugins/netconf-client-mdsal/src/test/resources/schemaless/data/keyed-list-bad-key.xml

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemaless/data/keyed-list-compound-key.xml b/plugins/netconf-client-mdsal/src/test/resources/schemaless/data/keyed-list-compound-key.xml
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemaless/data/keyed-list-compound-key.xml
rename to plugins/netconf-client-mdsal/src/test/resources/schemaless/data/keyed-list-compound-key.xml

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemaless/data/keyed-list.xml b/plugins/netconf-client-mdsal/src/test/resources/schemaless/data/keyed-list.xml
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemaless/data/keyed-list.xml
rename to plugins/netconf-client-mdsal/src/test/resources/schemaless/data/keyed-list.xml

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemaless/edit-config/container.xml b/plugins/netconf-client-mdsal/src/test/resources/schemaless/edit-config/container.xml
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemaless/edit-config/container.xml
rename to plugins/netconf-client-mdsal/src/test/resources/schemaless/edit-config/container.xml

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemaless/edit-config/keyed-list-bad-key.xml b/plugins/netconf-client-mdsal/src/test/resources/schemaless/edit-config/keyed-list-bad-key.xml
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemaless/edit-config/keyed-list-bad-key.xml
rename to plugins/netconf-client-mdsal/src/test/resources/schemaless/edit-config/keyed-list-bad-key.xml

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemaless/edit-config/keyed-list-compound-key.xml b/plugins/netconf-client-mdsal/src/test/resources/schemaless/edit-config/keyed-list-compound-key.xml
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemaless/edit-config/keyed-list-compound-key.xml
rename to plugins/netconf-client-mdsal/src/test/resources/schemaless/edit-config/keyed-list-compound-key.xml

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemaless/edit-config/keyed-list.xml b/plugins/netconf-client-mdsal/src/test/resources/schemaless/edit-config/keyed-list.xml
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemaless/edit-config/keyed-list.xml
rename to plugins/netconf-client-mdsal/src/test/resources/schemaless/edit-config/keyed-list.xml

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemaless/filter/container.xml b/plugins/netconf-client-mdsal/src/test/resources/schemaless/filter/container.xml
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemaless/filter/container.xml
rename to plugins/netconf-client-mdsal/src/test/resources/schemaless/filter/container.xml

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemaless/filter/keyed-list-bad-key.xml b/plugins/netconf-client-mdsal/src/test/resources/schemaless/filter/keyed-list-bad-key.xml
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemaless/filter/keyed-list-bad-key.xml
rename to plugins/netconf-client-mdsal/src/test/resources/schemaless/filter/keyed-list-bad-key.xml

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemaless/filter/keyed-list-compound-key.xml b/plugins/netconf-client-mdsal/src/test/resources/schemaless/filter/keyed-list-compound-key.xml
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemaless/filter/keyed-list-compound-key.xml
rename to plugins/netconf-client-mdsal/src/test/resources/schemaless/filter/keyed-list-compound-key.xml

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemaless/filter/keyed-list.xml b/plugins/netconf-client-mdsal/src/test/resources/schemaless/filter/keyed-list.xml
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemaless/filter/keyed-list.xml
rename to plugins/netconf-client-mdsal/src/test/resources/schemaless/filter/keyed-list.xml

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemaless/filter/one-root-filter.xml b/plugins/netconf-client-mdsal/src/test/resources/schemaless/filter/one-root-filter.xml
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemaless/filter/one-root-filter.xml
rename to plugins/netconf-client-mdsal/src/test/resources/schemaless/filter/one-root-filter.xml

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemaless/filter/two-roots-filter.xml b/plugins/netconf-client-mdsal/src/test/resources/schemaless/filter/two-roots-filter.xml
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemaless/filter/two-roots-filter.xml
rename to plugins/netconf-client-mdsal/src/test/resources/schemaless/filter/two-roots-filter.xml

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemaless/get-config/container.xml b/plugins/netconf-client-mdsal/src/test/resources/schemaless/get-config/container.xml
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemaless/get-config/container.xml
rename to plugins/netconf-client-mdsal/src/test/resources/schemaless/get-config/container.xml

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemaless/get-config/keyed-list-bad-key.xml b/plugins/netconf-client-mdsal/src/test/resources/schemaless/get-config/keyed-list-bad-key.xml
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemaless/get-config/keyed-list-bad-key.xml
rename to plugins/netconf-client-mdsal/src/test/resources/schemaless/get-config/keyed-list-bad-key.xml

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemaless/get-config/keyed-list-compound-key.xml b/plugins/netconf-client-mdsal/src/test/resources/schemaless/get-config/keyed-list-compound-key.xml
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemaless/get-config/keyed-list-compound-key.xml
rename to plugins/netconf-client-mdsal/src/test/resources/schemaless/get-config/keyed-list-compound-key.xml

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemaless/get-config/keyed-list.xml b/plugins/netconf-client-mdsal/src/test/resources/schemaless/get-config/keyed-list.xml
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemaless/get-config/keyed-list.xml
rename to plugins/netconf-client-mdsal/src/test/resources/schemaless/get-config/keyed-list.xml

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemas/augmented-action.yang b/plugins/netconf-client-mdsal/src/test/resources/schemas/augmented-action.yang
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemas/augmented-action.yang
rename to plugins/netconf-client-mdsal/src/test/resources/schemas/augmented-action.yang

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemas/config-test-rpc.yang b/plugins/netconf-client-mdsal/src/test/resources/schemas/config-test-rpc.yang
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemas/config-test-rpc.yang
rename to plugins/netconf-client-mdsal/src/test/resources/schemas/config-test-rpc.yang

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemas/conflicting-actions.yang b/plugins/netconf-client-mdsal/src/test/resources/schemas/conflicting-actions.yang
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemas/conflicting-actions.yang
rename to plugins/netconf-client-mdsal/src/test/resources/schemas/conflicting-actions.yang

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemas/example-server-farm-2.yang b/plugins/netconf-client-mdsal/src/test/resources/schemas/example-server-farm-2.yang
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemas/example-server-farm-2.yang
rename to plugins/netconf-client-mdsal/src/test/resources/schemas/example-server-farm-2.yang

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemas/example-server-farm.yang b/plugins/netconf-client-mdsal/src/test/resources/schemas/example-server-farm.yang
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemas/example-server-farm.yang
rename to plugins/netconf-client-mdsal/src/test/resources/schemas/example-server-farm.yang

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemas/nested-notification.yang b/plugins/netconf-client-mdsal/src/test/resources/schemas/nested-notification.yang
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemas/nested-notification.yang
rename to plugins/netconf-client-mdsal/src/test/resources/schemas/nested-notification.yang

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemas/[email protected] b/plugins/netconf-client-mdsal/src/test/resources/schemas/[email protected]
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemas/[email protected]
rename to plugins/netconf-client-mdsal/src/test/resources/schemas/[email protected]

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemas/rpc-notification-subscription.yang b/plugins/netconf-client-mdsal/src/test/resources/schemas/rpc-notification-subscription.yang
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemas/rpc-notification-subscription.yang
rename to plugins/netconf-client-mdsal/src/test/resources/schemas/rpc-notification-subscription.yang

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemas/rpcs-actions-outputs.yang b/plugins/netconf-client-mdsal/src/test/resources/schemas/rpcs-actions-outputs.yang
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemas/rpcs-actions-outputs.yang
rename to plugins/netconf-client-mdsal/src/test/resources/schemas/rpcs-actions-outputs.yang

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemas/test-module.yang b/plugins/netconf-client-mdsal/src/test/resources/schemas/test-module.yang
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemas/test-module.yang
rename to plugins/netconf-client-mdsal/src/test/resources/schemas/test-module.yang

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemas/user-notification.yang b/plugins/netconf-client-mdsal/src/test/resources/schemas/user-notification.yang
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemas/user-notification.yang
rename to plugins/netconf-client-mdsal/src/test/resources/schemas/user-notification.yang

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemas/user-notification2.yang b/plugins/netconf-client-mdsal/src/test/resources/schemas/user-notification2.yang
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemas/user-notification2.yang
rename to plugins/netconf-client-mdsal/src/test/resources/schemas/user-notification2.yang

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemas/user-notification3.yang b/plugins/netconf-client-mdsal/src/test/resources/schemas/user-notification3.yang
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemas/user-notification3.yang
rename to plugins/netconf-client-mdsal/src/test/resources/schemas/user-notification3.yang

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemas/user-notification4.yang b/plugins/netconf-client-mdsal/src/test/resources/schemas/user-notification4.yang
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemas/user-notification4.yang
rename to plugins/netconf-client-mdsal/src/test/resources/schemas/user-notification4.yang

diff --git a/plugins/sal-netconf-connector/src/test/resources/schemas/yang-ext.yang b/plugins/netconf-client-mdsal/src/test/resources/schemas/yang-ext.yang
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/schemas/yang-ext.yang
rename to plugins/netconf-client-mdsal/src/test/resources/schemas/yang-ext.yang

diff --git a/plugins/sal-netconf-connector/src/test/resources/yang-library-fail-completely.xml b/plugins/netconf-client-mdsal/src/test/resources/yang-library-fail-completely.xml
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/yang-library-fail-completely.xml
rename to plugins/netconf-client-mdsal/src/test/resources/yang-library-fail-completely.xml

diff --git a/plugins/sal-netconf-connector/src/test/resources/yang-library-fail.xml b/plugins/netconf-client-mdsal/src/test/resources/yang-library-fail.xml
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/yang-library-fail.xml
rename to plugins/netconf-client-mdsal/src/test/resources/yang-library-fail.xml

diff --git a/plugins/sal-netconf-connector/src/test/resources/yang-library.json b/plugins/netconf-client-mdsal/src/test/resources/yang-library.json
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/yang-library.json
rename to plugins/netconf-client-mdsal/src/test/resources/yang-library.json

diff --git a/plugins/sal-netconf-connector/src/test/resources/yang-library.xml b/plugins/netconf-client-mdsal/src/test/resources/yang-library.xml
similarity index 100%
rename from plugins/sal-netconf-connector/src/test/resources/yang-library.xml
rename to plugins/netconf-client-mdsal/src/test/resources/yang-library.xml

diff --git a/plugins/pom.xml b/plugins/pom.xml
index 468ef0004b559bdb8afb88bee0b2c2fd69e75cd7..33bbb9d91815cc740af98a71543cdea605ebd671 100644 (file)
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -30,9 +30,9 @@
 
     <modules>
         <module>netconf-auth-aaa</module>
+        <module>netconf-client-mdsal</module>
         <module>netconf-common-mdsal</module>
         <module>netconf-dom-api</module>
         <module>netconf-server-mdsal</module>
-        <module>sal-netconf-connector</module>
     </modules>
 </project>