Allow Topology DB to keep track of production switches

[controller.git] / opendaylight / topologymanager / implementation / src / test / java / org / opendaylight / controller / topologymanager / internal / TopologyManagerImplTest.java

diff --git a/opendaylight/topologymanager/implementation/src/test/java/org/opendaylight/controller/topologymanager/internal/TopologyManagerImplTest.java b/opendaylight/topologymanager/implementation/src/test/java/org/opendaylight/controller/topologymanager/internal/TopologyManagerImplTest.java
index cb63cd105a618d301cdccb888ae6bf23217fbd69..97966255a03db0b91b60a899764cd1de3b8e432b 100644 (file)
--- a/opendaylight/topologymanager/implementation/src/test/java/org/opendaylight/controller/topologymanager/internal/TopologyManagerImplTest.java
+++ b/opendaylight/topologymanager/implementation/src/test/java/org/opendaylight/controller/topologymanager/internal/TopologyManagerImplTest.java
@@ -283,16 +283,6 @@ public class TopologyManagerImplTest {
             return new byte[6];
         }
 
-        @Override
-        public boolean isHostRefreshEnabled() {
-            return true;
-        }
-
-        @Override
-        public int getHostRetryCount() {
-            return 1;
-        }
-
         @Override
         public Property createProperty(String propName, String propValue) {
             return null;
@@ -467,13 +457,13 @@ public class TopologyManagerImplTest {
     @Test
     public void testAddDeleteUserLink() {
         TopologyUserLinkConfig link1 = new TopologyUserLinkConfig("default1",
-                "OF|1@OF|2", "OF|1@OF|2");
+                "OF|1@OF|2", "OF|1@OF|3");
         TopologyUserLinkConfig link2 = new TopologyUserLinkConfig("default1",
-                "OF|10@OF|20", "OF|10@OF|20");
+                "OF|10@OF|20", "OF|10@OF|30");
         TopologyUserLinkConfig link3 = new TopologyUserLinkConfig("default2",
-                "OF|1@OF|2", "OF|1@OF|2");
+                "OF|1@OF|2", "OF|1@OF|3");
         TopologyUserLinkConfig link4 = new TopologyUserLinkConfig("default20",
-                "OF|10@OF|20", "OF|10@OF|20");
+                "OF|10@OF|20", "OF|10@OF|30");
 
         TopologyManagerImpl topoManagerImpl = new TopologyManagerImpl();
         TestSwitchManager swMgr = new TestSwitchManager();
@@ -495,9 +485,9 @@ public class TopologyManagerImplTest {
         Assert.assertTrue(topoManagerImpl.getUserLinks().isEmpty());
 
         TopologyUserLinkConfig badlink1 =
-            new TopologyUserLinkConfig("bad1", "OF|1@OF|2", "OF|1@OF|3");
+            new TopologyUserLinkConfig("bad1", "OF|1@OF|4", "OF|1@OF|5");
         TopologyUserLinkConfig badlink2 =
-            new TopologyUserLinkConfig("bad2", "OF|10@OF|21", "OF|10@OF|20");
+            new TopologyUserLinkConfig("bad2", "OF|10@OF|7", "OF|7@OF|13");
         Assert.assertEquals(StatusCode.NOTFOUND,
                             topoManagerImpl.addUserLink(badlink1).getCode());
         Assert.assertEquals(StatusCode.NOTFOUND,
@@ -640,10 +630,11 @@ public class TopologyManagerImplTest {
 
         for (int i = 0; i < 5; i++) {
             Host host = topoManagerImpl.getHostAttachedToNodeConnector(nc[i]);
-            if (i == 4)
+            if (i == 4) {
                 Assert.assertTrue(host == null);
-            else
+            } else {
                 Assert.assertTrue(host.equals(h[i]));
+            }
         }
 
         Set<NodeConnector> ncSet = topoManagerImpl.getNodeConnectorWithHost();