X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=networkmodel%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fnetworkmodel%2FNetConfTopologyListenerTest.java;h=445bb8b65a11fa7c30b48f8f5a8a473c2cc68ea8;hb=b1b3bafd549bb501937cea5c976d5344608b6ed3;hp=7fc2b4c5f7ba232fccb7626ebfa919434850fe4f;hpb=b3d4257ba36696849b4391f39c4ae904407a72e1;p=transportpce.git diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListenerTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListenerTest.java index 7fc2b4c5f..445bb8b65 100644 --- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListenerTest.java +++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListenerTest.java @@ -17,14 +17,12 @@ import static org.mockito.Mockito.when; import static org.opendaylight.transportpce.common.StringConstants.OPENROADM_DEVICE_VERSION_2_2_1; import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; import java.util.List; import java.util.Map; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.DataObjectModification; import org.opendaylight.mdsal.binding.api.DataTreeModification; @@ -36,14 +34,15 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types. import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.ConnectionOper.ConnectionStatus; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.AvailableCapabilities; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.AvailableCapabilitiesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.available.capabilities.AvailableCapability; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.available.capabilities.AvailableCapabilityBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.credentials.credentials.LoginPasswordBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNode; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNodeBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240120.ConnectionOper.ConnectionStatus; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240120.connection.oper.AvailableCapabilities; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240120.connection.oper.AvailableCapabilitiesBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240120.connection.oper.available.capabilities.AvailableCapability; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240120.connection.oper.available.capabilities.AvailableCapabilityBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240120.credentials.credentials.LoginPwBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240120.credentials.credentials.login.pw.LoginPasswordBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev231121.NetconfNode; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev231121.NetconfNodeBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder; @@ -51,7 +50,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yangtools.yang.common.Uint16; import org.opendaylight.yangtools.yang.common.Uint32; -@RunWith(MockitoJUnitRunner.StrictStubs.class) +@ExtendWith(MockitoExtension.class) public class NetConfTopologyListenerTest { @Mock @@ -66,9 +65,9 @@ public class NetConfTopologyListenerTest { private Map registrations; @Test - public void testOnDataTreeChangedWhenDeleteNode() { + void testOnDataTreeChangedWhenDeleteNode() { @SuppressWarnings("unchecked") final DataObjectModification node = mock(DataObjectModification.class); - final Collection> changes = new HashSet<>(); + final List> changes = new ArrayList<>(); @SuppressWarnings("unchecked") final DataTreeModification ch = mock(DataTreeModification.class); final NodeRegistration nodeRegistration = mock(NodeRegistration.class); changes.add(ch); @@ -76,23 +75,23 @@ public class NetConfTopologyListenerTest { final Node netconfNode = getNetconfNode("netconfNode1", ConnectionStatus.Connecting, OPENROADM_DEVICE_VERSION_2_2_1); - when(node.getModificationType()).thenReturn(DataObjectModification.ModificationType.DELETE); - when(node.getDataBefore()).thenReturn(netconfNode); + when(node.modificationType()).thenReturn(DataObjectModification.ModificationType.DELETE); + when(node.dataBefore()).thenReturn(netconfNode); NetConfTopologyListener listener = new NetConfTopologyListener(networkModelService, dataBroker, deviceTransactionManager, portMapping, registrations); listener.onDataTreeChanged(changes); verify(ch, times(1)).getRootNode(); - verify(node, times(1)).getModificationType(); - verify(node, times(3)).getDataBefore(); + verify(node, times(1)).modificationType(); + verify(node, times(3)).dataBefore(); verify(networkModelService, times(1)).deleteOpenRoadmnode(anyString()); verify(nodeRegistration, times(0)).unregisterListeners(); } @Test - public void testOnDataTreeChangedWhenAddNode() { + void testOnDataTreeChangedWhenAddNode() { @SuppressWarnings("unchecked") final DataObjectModification node = mock(DataObjectModification.class); - final Collection> changes = new HashSet<>(); + final List> changes = new ArrayList<>(); @SuppressWarnings("unchecked") final DataTreeModification ch = mock(DataTreeModification.class); changes.add(ch); when(ch.getRootNode()).thenReturn(node); @@ -101,24 +100,24 @@ public class NetConfTopologyListenerTest { ConnectionStatus.Connecting, OPENROADM_DEVICE_VERSION_2_2_1); final Node netconfNodeAfter = getNetconfNode("netconfNode1", ConnectionStatus.Connected, OPENROADM_DEVICE_VERSION_2_2_1); - when(node.getModificationType()).thenReturn(DataObjectModification.ModificationType.WRITE); - when(node.getDataBefore()).thenReturn(netconfNodeBefore); - when(node.getDataAfter()).thenReturn(netconfNodeAfter); + when(node.modificationType()).thenReturn(DataObjectModification.ModificationType.WRITE); + when(node.dataBefore()).thenReturn(netconfNodeBefore); + when(node.dataAfter()).thenReturn(netconfNodeAfter); NetConfTopologyListener listener = new NetConfTopologyListener(networkModelService, dataBroker, deviceTransactionManager, portMapping); listener.onDataTreeChanged(changes); verify(ch, times(1)).getRootNode(); - verify(node, times(1)).getModificationType(); - verify(node, times(3)).getDataBefore(); - verify(node, times(1)).getDataAfter(); + verify(node, times(1)).modificationType(); + verify(node, times(3)).dataBefore(); + verify(node, times(1)).dataAfter(); verify(networkModelService, times(1)).createOpenRoadmNode(anyString(), anyString()); } @Test - public void testOnDataTreeChangedWhenDisconnectingNode() { + void testOnDataTreeChangedWhenDisconnectingNode() { @SuppressWarnings("unchecked") final DataObjectModification node = mock(DataObjectModification.class); - final Collection> changes = new HashSet<>(); + final List> changes = new ArrayList<>(); @SuppressWarnings("unchecked") final DataTreeModification ch = mock(DataTreeModification.class); changes.add(ch); when(ch.getRootNode()).thenReturn(node); @@ -127,41 +126,41 @@ public class NetConfTopologyListenerTest { ConnectionStatus.Connected, OPENROADM_DEVICE_VERSION_2_2_1); final Node netconfNodeAfter = getNetconfNode("netconfNode1", ConnectionStatus.Connecting, OPENROADM_DEVICE_VERSION_2_2_1); - when(node.getModificationType()).thenReturn(DataObjectModification.ModificationType.WRITE); - when(node.getDataBefore()).thenReturn(netconfNodeBefore); - when(node.getDataAfter()).thenReturn(netconfNodeAfter); + when(node.modificationType()).thenReturn(DataObjectModification.ModificationType.WRITE); + when(node.dataBefore()).thenReturn(netconfNodeBefore); + when(node.dataAfter()).thenReturn(netconfNodeAfter); NetConfTopologyListener listener = new NetConfTopologyListener(networkModelService, dataBroker, deviceTransactionManager, portMapping); listener.onDataTreeChanged(changes); verify(ch, times(1)).getRootNode(); - verify(node, times(1)).getModificationType(); - verify(node, times(3)).getDataBefore(); - verify(node, times(1)).getDataAfter(); + verify(node, times(1)).modificationType(); + verify(node, times(3)).dataBefore(); + verify(node, times(1)).dataAfter(); verify(networkModelService, never()).createOpenRoadmNode(anyString(), anyString()); verify(networkModelService, never()).deleteOpenRoadmnode(anyString()); } @Test - public void testOnDataTreeChangedWhenShouldNeverHappen() { + void testOnDataTreeChangedWhenShouldNeverHappen() { @SuppressWarnings("unchecked") final DataObjectModification node = mock(DataObjectModification.class); - final Collection> changes = new HashSet<>(); + final List> changes = new ArrayList<>(); @SuppressWarnings("unchecked") final DataTreeModification ch = mock(DataTreeModification.class); changes.add(ch); when(ch.getRootNode()).thenReturn(node); final Node netconfNodeBefore = getNetconfNode("netconfNode1", ConnectionStatus.Connected, OPENROADM_DEVICE_VERSION_2_2_1); - when(node.getModificationType()).thenReturn(DataObjectModification.ModificationType.SUBTREE_MODIFIED); - when(node.getDataBefore()).thenReturn(netconfNodeBefore); + when(node.modificationType()).thenReturn(DataObjectModification.ModificationType.SUBTREE_MODIFIED); + when(node.dataBefore()).thenReturn(netconfNodeBefore); NetConfTopologyListener listener = new NetConfTopologyListener(networkModelService, dataBroker, deviceTransactionManager, portMapping); listener.onDataTreeChanged(changes); verify(ch, times(1)).getRootNode(); - verify(node, times(2)).getModificationType(); - verify(node, times(3)).getDataBefore(); - verify(node, never()).getDataAfter(); + verify(node, times(2)).modificationType(); + verify(node, times(3)).dataBefore(); + verify(node, never()).dataAfter(); verify(networkModelService, never()).createOpenRoadmNode(anyString(), anyString()); verify(networkModelService, never()).deleteOpenRoadmnode(anyString()); } @@ -182,12 +181,13 @@ public class NetConfTopologyListenerTest { .setPort(new PortNumber(Uint16.valueOf(9999))) .setReconnectOnChangedSchema(true) .setDefaultRequestTimeoutMillis(Uint32.valueOf(1000)) - .setBetweenAttemptsTimeoutMillis(Uint16.valueOf(100)) .setKeepaliveDelay(Uint32.valueOf(1000)) .setTcpOnly(true) - .setCredentials(new LoginPasswordBuilder() - .setUsername("testuser") - .setPassword("testpassword") + .setCredentials(new LoginPwBuilder() + .setLoginPassword(new LoginPasswordBuilder() + .setUsername("testuser") + .setPassword("testpassword".getBytes()) + .build()) .build()) .build(); return new NodeBuilder()