Bump upstream versions

[netconf.git] / netconf / callhome-provider / src / test / java / org / opendaylight / netconf / callhome / mount / ContextKeyTest.java

diff --git a/netconf/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/mount/ContextKeyTest.java b/netconf/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/mount/ContextKeyTest.java
index ae4ccc86490d996cd723102af98b35dbc3d83be1..ca863ebd502318a2983db3fc363d8e93cb57c8a6 100644 (file)
--- a/netconf/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/mount/ContextKeyTest.java
+++ b/netconf/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/mount/ContextKeyTest.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.netconf.callhome.mount;
 
 import static org.junit.Assert.assertFalse;
@@ -24,9 +23,10 @@ import org.junit.Test;
 import org.opendaylight.netconf.client.NetconfClientSession;
 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.IpAddressBuilder;
+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.node.topology.rev150114.NetconfNode;
+import org.opendaylight.yangtools.yang.common.Uint16;
 
 public class ContextKeyTest {
     private IpAddress address1;
@@ -45,11 +45,11 @@ public class ContextKeyTest {
 
     @Before
     public void setup() {
-        address1 = IpAddressBuilder.getDefaultInstance("1.2.3.4");
-        address2 = IpAddressBuilder.getDefaultInstance("5.6.7.8");
+        address1 = new IpAddress(new Ipv4Address("1.2.3.4"));
+        address2 = new IpAddress(new Ipv4Address("5.6.7.8"));
 
-        port1 = new PortNumber(123);
-        port2 = new PortNumber(456);
+        port1 = new PortNumber(Uint16.valueOf(123));
+        port2 = new PortNumber(Uint16.valueOf(456));
 
         mockNode = mock(NetconfNode.class);
         mockSession = mock(NetconfClientSession.class);