Remove sal-dom-config dependency

It's not needed and is going away.

Change-Id: I2fb0ed7ddca920756a07ba61f900fdff47715e67
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

diff --git a/netconf/mdsal-netconf-connector/pom.xml b/netconf/mdsal-netconf-connector/pom.xml
index 34c07edc771f48bf6697f383cd4b1d4d6444e1d7..0b636334b0554b16b7b7a57a6eb23b6aae7e2452 100644 (file)
--- a/netconf/mdsal-netconf-connector/pom.xml
+++ b/netconf/mdsal-netconf-connector/pom.xml
@@ -57,10 +57,6 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-core-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-dom-config</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>mockito-configuration</artifactId>

diff --git a/netconf/netconf-topology-singleton/pom.xml b/netconf/netconf-topology-singleton/pom.xml
index 625e3c30a7409f85c1197ea6afda8c23d6a3e3c2..d9e39a5240ca93983bc42df2d35c6f118ffeebab 100644 (file)
--- a/netconf/netconf-topology-singleton/pom.xml
+++ b/netconf/netconf-topology-singleton/pom.xml
@@ -75,6 +75,11 @@
             <artifactId>mdsal-eos-dom-simple</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-singleton-dom-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/RemoteDeviceId.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/RemoteDeviceId.java
index bfb39330aec756ff4336a9c85a1a0474581494d4..793e6786d38703a69d3e433d9cbd2a2f5a1a2119 100644 (file)
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/RemoteDeviceId.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/RemoteDeviceId.java
@@ -9,7 +9,6 @@ package org.opendaylight.netconf.sal.connect.util;
 
 import com.google.common.base.Preconditions;
 import java.net.InetSocketAddress;
-import org.opendaylight.controller.config.api.ModuleIdentifier;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Host;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.HostBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
@@ -38,12 +37,6 @@ public final class RemoteDeviceId {
     private InetSocketAddress address;
     private Host host;
 
-    public RemoteDeviceId(final ModuleIdentifier identifier, InetSocketAddress address) {
-        this(Preconditions.checkNotNull(identifier).getInstanceName());
-        this.address = address;
-        this.host = buildHost();
-    }
-
     private RemoteDeviceId(final String name) {
         this.name = Preconditions.checkNotNull(name);
         this.key = new NodeKey(new NodeId(name));

diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/RemoteDeviceIdTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/RemoteDeviceIdTest.java
index 02d3eea5fd0fbe62bc0ca3dc5bd677f141a33dda..77d55b9683cce15127467a10d63bb79fdc69012c 100644 (file)
--- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/RemoteDeviceIdTest.java
+++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/RemoteDeviceIdTest.java
@@ -13,7 +13,6 @@ import static org.junit.Assert.assertNotEquals;
 
 import java.net.InetSocketAddress;
 import org.junit.Test;
-import org.opendaylight.controller.config.api.ModuleIdentifier;
 import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId;
 
 public class RemoteDeviceIdTest {
@@ -21,10 +20,9 @@ public class RemoteDeviceIdTest {
     @Test
     public void testEquals() {
         final InetSocketAddress address = new InetSocketAddress("127.0.0.1", 8000);
-        final ModuleIdentifier identifier = new ModuleIdentifier("test", "test");
 
         final RemoteDeviceId remoteDeviceId = new RemoteDeviceId("test", address);
-        final RemoteDeviceId remoteDeviceIdEqualName = new RemoteDeviceId(identifier, address);
+        final RemoteDeviceId remoteDeviceIdEqualName = new RemoteDeviceId("test", address);
         final RemoteDeviceId remoteDeviceIdDiffName = new RemoteDeviceId("test-diff", address);
 
         assertEquals(true, remoteDeviceId.equals(remoteDeviceId));