Remove sal.core from NodeUtils

Change-Id: I87f5c3813818ec80bf59599b436a76969225cf0c
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/utils/mdsal-node/pom.xml b/utils/mdsal-node/pom.xml
index 2351f3ad83b1eeee13d0df70a8bdc7d9aa396e4e..3dc759f14bf27bbfbf03c9c75380b5bdd571f911 100644 (file)
--- a/utils/mdsal-node/pom.xml
+++ b/utils/mdsal-node/pom.xml
@@ -36,10 +36,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>
       <artifactId>model-inventory</artifactId>

diff --git a/utils/mdsal-node/src/main/java/org/opendaylight/ovsdb/utils/mdsal/node/NodeUtils.java b/utils/mdsal-node/src/main/java/org/opendaylight/ovsdb/utils/mdsal/node/NodeUtils.java
index 34062646093e1c3dd53a849be22ec5c7cc23e375..b23066f8f8dd938bad158b01d847932d490b4ec0 100644 (file)
--- a/utils/mdsal-node/src/main/java/org/opendaylight/ovsdb/utils/mdsal/node/NodeUtils.java
+++ b/utils/mdsal-node/src/main/java/org/opendaylight/ovsdb/utils/mdsal/node/NodeUtils.java
@@ -9,9 +9,6 @@
  */
 package org.opendaylight.ovsdb.utils.mdsal.node;
 
-import java.util.ArrayList;
-import java.util.List;
-import org.opendaylight.controller.sal.core.ConstructionException;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeBuilder;
@@ -26,7 +23,7 @@ public class NodeUtils {
         String id = identifier;
 
         String[] pair = identifier.split("\\|");
-        if (pair[0].equals("OVS")) {
+        if ((pair.length > 1) && (pair[0].equals("OVS"))) {
             id = pair[1];
         }
         return id;
@@ -42,39 +39,4 @@ public class NodeUtils {
 
         return node;
     }
-
-    public static Node getMdsalNode (org.opendaylight.controller.sal.core.Node salNode) {
-        String identifier = salNode.getNodeIDString();
-
-        NodeId nodeId = new NodeId("OVS" + "|" + identifier);
-        NodeKey nodeKey = new NodeKey(nodeId);
-        Node node = new NodeBuilder()
-                .setId(nodeId)
-                .setKey(nodeKey)
-                .build();
-
-        return node;
-    }
-
-    public static org.opendaylight.controller.sal.core.Node getSalNode (Node mdsalNode) {
-        String identifier = NodeUtils.getId(mdsalNode.getId().getValue());
-        org.opendaylight.controller.sal.core.Node node = null;
-
-        try {
-            node = new org.opendaylight.controller.sal.core.Node("OVS", identifier);
-        } catch (ConstructionException e) {
-            LOG.error("Failed to allocate sal Node", e);
-        }
-
-        return node;
-    }
-
-    public static List<org.opendaylight.controller.sal.core.Node> getSalNodes (List<Node> mdsalNodes) {
-        List<org.opendaylight.controller.sal.core.Node> nodes = new ArrayList<>();
-
-        for (Node mdsalNode : mdsalNodes) {
-            nodes.add(NodeUtils.getSalNode(mdsalNode));
-        }
-        return nodes;
-    }
 }

diff --git a/utils/mdsal-node/src/test/java/org/opendaylight/ovsdb/utils/mdsal/node/NodeUtilsTest.java b/utils/mdsal-node/src/test/java/org/opendaylight/ovsdb/utils/mdsal/node/NodeUtilsTest.java
index 30b1fdf28417e571ef7ecb79bacb13bcbb4f9dba..291b2349bb96dc9441a17f2eb3b2febcb8f0d226 100644 (file)
--- a/utils/mdsal-node/src/test/java/org/opendaylight/ovsdb/utils/mdsal/node/NodeUtilsTest.java
+++ b/utils/mdsal-node/src/test/java/org/opendaylight/ovsdb/utils/mdsal/node/NodeUtilsTest.java
@@ -9,15 +9,39 @@
  */
 package org.opendaylight.ovsdb.utils.mdsal.node;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import org.junit.Test;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 
 public class NodeUtilsTest {
+    private static final String OVS = "OVS";
+    private static final String IDENTIFIER = "192.168.120.31:45001";
+    private static final String OVS_IDENTIFIER = OVS + "|" + IDENTIFIER;
+    private static final String BAD_IDENTIFIER = "BAD" + "|" + IDENTIFIER;
+
+    @Test
+    public void testGetId () {
+        String identifier = NodeUtils.getId(OVS_IDENTIFIER);
+        assertEquals("getId(" + OVS_IDENTIFIER + ") should return " + IDENTIFIER,
+                identifier, IDENTIFIER);
+
+        identifier = NodeUtils.getId(OVS);
+        assertEquals("getId(" + OVS + ") should return " + OVS,
+                identifier, OVS);
+
+        identifier = NodeUtils.getId(BAD_IDENTIFIER);
+        assertEquals("getId(" + BAD_IDENTIFIER + ") should return " + BAD_IDENTIFIER,
+                identifier, BAD_IDENTIFIER);
+    }
 
     @Test
-    public void testCreateNode () {
-       // TODO
-        assertTrue(true);
+    public void testGetOpenFlowNode () {
+        Node node = NodeUtils.getOpenFlowNode(OVS_IDENTIFIER);
+        assertNotNull("node should not be null", node);
+        assertEquals("id should be " + OVS_IDENTIFIER,
+                node.getId().getValue(), OVS_IDENTIFIER);
     }
 }