X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Ftopologymanager%2Fimplementation%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Ftopologymanager%2Finternal%2FTopologyManagerImplTest.java;h=97966255a03db0b91b60a899764cd1de3b8e432b;hb=refs%2Fchanges%2F56%2F1656%2F4;hp=13888646bcdd1f5c700c3b3ac0839a7f14d022f7;hpb=c35484bda3c82b4e907d0496b01608e478dd00a0;p=controller.git 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 13888646bc..97966255a0 100644 --- 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 @@ -457,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(); @@ -485,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, @@ -630,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 ncSet = topoManagerImpl.getNodeConnectorWithHost();