Refactor leaf names in odl-netconf-device.yang

[netconf.git] / apps / netconf-topology / src / test / java / org / opendaylight / netconf / topology / spi / AbstractNetconfTopologyTest.java

diff --git a/apps/netconf-topology/src/test/java/org/opendaylight/netconf/topology/spi/AbstractNetconfTopologyTest.java b/apps/netconf-topology/src/test/java/org/opendaylight/netconf/topology/spi/AbstractNetconfTopologyTest.java
index 57d1a4dac8db284d762b61fc64be688971f016f3..55b5831db1f95445937a9f0ec53683e7756ef8f5 100644 (file)
--- a/apps/netconf-topology/src/test/java/org/opendaylight/netconf/topology/spi/AbstractNetconfTopologyTest.java
+++ b/apps/netconf-topology/src/test/java/org/opendaylight/netconf/topology/spi/AbstractNetconfTopologyTest.java
@@ -7,28 +7,29 @@
  */
 package org.opendaylight.netconf.topology.spi;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 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.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.rev231025.connection.parameters.Protocol.Name;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev231025.connection.parameters.ProtocolBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev231025.credentials.credentials.LoginPwUnencryptedBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev231025.credentials.credentials.login.pw.unencrypted.LoginPasswordUnencryptedBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNodeBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240120.connection.parameters.Protocol.Name;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240120.connection.parameters.ProtocolBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240120.credentials.credentials.LoginPwUnencryptedBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240120.credentials.credentials.login.pw.unencrypted.LoginPasswordUnencryptedBuilder;
+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;
 import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint32;
 
-public class AbstractNetconfTopologyTest {
+class AbstractNetconfTopologyTest {
     @Test
-    public void hideCredentialsTest() {
+    void hideCredentials() {
         final String userName = "admin";
         final String password = "pa$$word";
         final Node node = new NodeBuilder()
@@ -37,7 +38,7 @@ public class AbstractNetconfTopologyTest {
                     .setPort(new PortNumber(Uint16.valueOf(9999)))
                     .setReconnectOnChangedSchema(true)
                     .setDefaultRequestTimeoutMillis(Uint32.valueOf(1000))
-                    .setBetweenAttemptsTimeoutMillis(Uint16.valueOf(100))
+                    .setMinBackoffMillis(Uint16.valueOf(100))
                     .setKeepaliveDelay(Uint32.valueOf(1000))
                     .setTcpOnly(false)
                     .setProtocol(new ProtocolBuilder().setName(Name.TLS).build())
@@ -55,4 +56,20 @@ public class AbstractNetconfTopologyTest {
         assertFalse(transformedNetconfNode.contains(userName));
         assertFalse(transformedNetconfNode.contains(password));
     }
+
+    @Test
+    void hideNullCredentials() {
+        final Node node = new NodeBuilder()
+            .setNodeId(new NodeId("id"))
+            .addAugmentation(new NetconfNodeBuilder()
+                .setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
+                .setPort(new PortNumber(Uint16.valueOf(9999)))
+                .setSchemaless(false)
+                .setReconnectOnChangedSchema(false)
+                .setMaxConnectionAttempts(Uint32.ZERO)
+                .setLockDatastore(true)
+                .build())
+            .build();
+        assertNotNull(AbstractNetconfTopology.hideCredentials(node));
+    }
 }