Use uint types in southbound-impl

This is a mostly-straightforward migration to use proper unsigned
types. We also fix some use of lists where it is convenient.

Change-Id: I6d4199431ec6ba45a2958573e07e956b4697ad88
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundConstants.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundConstants.java
index 953323d090dcba12584cf4dfe98eb32c4aadcd65..f0d2b520f85c90d47bd639465ec85e8765f7fdc1 100755 (executable)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundConstants.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundConstants.java
@@ -55,7 +55,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.re
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.QosTypeLinuxHfsc;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.QosTypeLinuxHtb;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.QosTypeLinuxSfq;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.QosEntryKey;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 public interface SouthboundConstants {
 
@@ -66,7 +68,7 @@ public interface SouthboundConstants {
     String TP_URI_PREFIX = "terminationpoint";
     String QOS_URI_PREFIX = "qos";
     String QOS_NAMED_UUID_PREFIX = "QOS";
-    Integer PORT_QOS_LIST_KEY = 1;
+    QosEntryKey PORT_QOS_LIST_KEY = new QosEntryKey(Uint32.ONE);
     String QUEUE_URI_PREFIX = "queue";
     String QUEUE_NAMED_UUID_PREFIX = "QUEUE";
     String AUTOATTACH_URI_PREFIX = "autoattach";

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundMapper.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundMapper.java
index fe634f1eef09b9d04767839dc67cbda43b79b09f..490d815cbb78e7a1f200b83aa8abd94aabcfa471 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundMapper.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundMapper.java
@@ -69,6 +69,8 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointKey;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint32;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -340,11 +342,12 @@ public final class SouthboundMapper {
 
             if (controller.getMaxBackoffColumn() != null && controller.getMaxBackoffColumn().getData() != null
                     && !controller.getMaxBackoffColumn().getData().isEmpty()) {
-                builder.setMaxBackoff(controller.getMaxBackoffColumn().getData().iterator().next());
+                builder.setMaxBackoff(Uint32.valueOf(controller.getMaxBackoffColumn().getData().iterator().next()));
             }
             if (controller.getInactivityProbeColumn() != null && controller.getInactivityProbeColumn().getData() != null
                     && !controller.getInactivityProbeColumn().getData().isEmpty()) {
-                builder.setInactivityProbe(controller.getInactivityProbeColumn().getData().iterator().next());
+                builder.setInactivityProbe(
+                    Uint32.valueOf(controller.getInactivityProbeColumn().getData().iterator().next()));
             }
             controllerEntries.add(builder
                     .setTarget(new Uri(targetString))
@@ -376,9 +379,9 @@ public final class SouthboundMapper {
     public static ConnectionInfo createConnectionInfo(final OvsdbClient client) {
         ConnectionInfoBuilder connectionInfoBuilder = new ConnectionInfoBuilder();
         connectionInfoBuilder.setRemoteIp(createIpAddress(client.getConnectionInfo().getRemoteAddress()));
-        connectionInfoBuilder.setRemotePort(new PortNumber(client.getConnectionInfo().getRemotePort()));
+        connectionInfoBuilder.setRemotePort(new PortNumber(Uint16.valueOf(client.getConnectionInfo().getRemotePort())));
         connectionInfoBuilder.setLocalIp(createIpAddress(client.getConnectionInfo().getLocalAddress()));
-        connectionInfoBuilder.setLocalPort(new PortNumber(client.getConnectionInfo().getLocalPort()));
+        connectionInfoBuilder.setLocalPort(new PortNumber(Uint16.valueOf(client.getConnectionInfo().getLocalPort())));
         return connectionInfoBuilder.build();
     }
 
@@ -453,18 +456,18 @@ public final class SouthboundMapper {
                                             final Manager manager) {
 
         if (manager != null && manager.getTargetColumn() != null) {
-            long numberOfConnections = 0;
+            Uint32 numberOfConnections = Uint32.ZERO;
             final String targetString = manager.getTargetColumn().getData();
 
             final Map<String, String> statusAttributeMap =
                             manager.getStatusColumn() == null ? null : manager.getStatusColumn().getData();
             if (statusAttributeMap != null && statusAttributeMap.containsKey(N_CONNECTIONS_STR)) {
                 String numberOfConnectionValueStr = statusAttributeMap.get(N_CONNECTIONS_STR);
-                numberOfConnections = Integer.parseInt(numberOfConnectionValueStr);
+                numberOfConnections = Uint32.valueOf(numberOfConnectionValueStr);
             } else {
                 final boolean isConnected = manager.getIsConnectedColumn().getData();
                 if (isConnected) {
-                    numberOfConnections = 1;
+                    numberOfConnections = Uint32.ONE;
                 }
             }
             managerEntries.add(new ManagerEntryBuilder()

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbAutoAttachUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbAutoAttachUpdateCommand.java
index e36d482d219deb9b92c50304bbd1b8249983d8b8..5defc45827192ae78f8b9fe9e718bc3307d66944 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbAutoAttachUpdateCommand.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbAutoAttachUpdateCommand.java
@@ -7,8 +7,7 @@
  */
 package org.opendaylight.ovsdb.southbound.transactions.md;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
@@ -34,6 +33,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.re
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.node.attributes.autoattach.MappingsKey;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint32;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -135,19 +136,17 @@ public class OvsdbAutoAttachUpdateCommand extends AbstractTransactionCommand {
 
     private static void setMappings(AutoattachBuilder autoAttachBuilder,
             AutoAttach autoAttach) {
-        final Map<Long, Long> mappings = autoAttach.getMappingsColumn().getData();
-        final List<Mappings> mappingsList = new ArrayList<>();
-        for (final Entry<Long, Long> entry : mappings.entrySet()) {
+        final Map<MappingsKey, Mappings> mappings = new LinkedHashMap<>();
+        for (final Entry<Long, Long> entry : autoAttach.getMappingsColumn().getData().entrySet()) {
             final Long mappingsKey = entry.getKey();
-            final Integer mappingsValue = Integer.valueOf(entry.getValue().intValue());
             if (mappingsKey != null) {
-                mappingsList.add(new MappingsBuilder()
-                        .withKey(new MappingsKey(mappingsKey))
-                        .setMappingsKey(mappingsKey)
-                        .setMappingsValue(mappingsValue)
-                        .build());
+                final MappingsKey key = new MappingsKey(Uint32.valueOf(mappingsKey));
+                mappings.put(key, new MappingsBuilder()
+                    .withKey(key)
+                    .setMappingsValue(Uint16.valueOf(entry.getValue().intValue()))
+                    .build());
             }
-            autoAttachBuilder.setMappings(mappingsList);
+            autoAttachBuilder.setMappings(mappings);
         }
     }
 

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommand.java
index dcdef1bbcfa1b9ec9052c31f6592ed3b4d0f3628..38fd181b1f3ecd2eed5398daea307edd444a48b0 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommand.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommand.java
@@ -73,7 +73,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.re
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.PortOtherConfigsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.QosEntry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.QosEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.QosEntryKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.Trunks;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.TrunksBuilder;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
@@ -87,6 +86,8 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointBuilder;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint32;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -342,7 +343,7 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand {
             Iterator<Long> itr = vlanId.iterator();
             // There are no loops here, just get the first element.
             int id = itr.next().intValue();
-            ovsdbTerminationPointBuilder.setVlanTag(new VlanId(id));
+            ovsdbTerminationPointBuilder.setVlanTag(new VlanId(Uint16.valueOf(id)));
         }
     }
 
@@ -356,7 +357,7 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand {
             for (Long trunk: portTrunks) {
                 if (trunk != null) {
                     modelTrunks.add(new TrunksBuilder()
-                        .setTrunk(new VlanId(trunk.intValue())).build());
+                        .setTrunk(new VlanId(Uint16.valueOf(trunk.intValue()))).build());
                 }
             }
         }
@@ -412,8 +413,7 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand {
                         if (oldQosIid != null) {
                             InstanceIdentifier<QosEntry> oldPortQosIid = tpPath
                                 .augmentation(OvsdbTerminationPointAugmentation.class)
-                                .child(QosEntry.class,
-                                      new QosEntryKey(Long.valueOf(SouthboundConstants.PORT_QOS_LIST_KEY)));
+                                .child(QosEntry.class, SouthboundConstants.PORT_QOS_LIST_KEY);
                             transaction.delete(LogicalDatastoreType.OPERATIONAL, oldPortQosIid);
                         }
                     }
@@ -422,12 +422,11 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand {
 
             InstanceIdentifier<QosEntries> qosIid = getQosIid(nodeId, ovsdbNode, qosUuid);
             if (qosIid != null) {
-                List<QosEntry> qosList = new ArrayList<>();
-                OvsdbQosRef qosRef = new OvsdbQosRef(qosIid);
-                qosList.add(new QosEntryBuilder()
-                    .withKey(new QosEntryKey(Long.valueOf(SouthboundConstants.PORT_QOS_LIST_KEY)))
-                    .setQosRef(qosRef).build());
-                ovsdbTerminationPointBuilder.setQosEntry(qosList);
+                ovsdbTerminationPointBuilder.setQosEntry(
+                    Map.of(SouthboundConstants.PORT_QOS_LIST_KEY, new QosEntryBuilder()
+                        .withKey(SouthboundConstants.PORT_QOS_LIST_KEY)
+                        .setQosRef(new OvsdbQosRef(qosIid))
+                        .build()));
             }
         }
     }
@@ -475,7 +474,7 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand {
             }
             if (ifIndexSet != null && !ifIndexSet.isEmpty()) {
                 for (Long ifIndex : ifIndexSet) {
-                    ovsdbTerminationPointBuilder.setIfindex(ifIndex);
+                    ovsdbTerminationPointBuilder.setIfindex(Uint32.valueOf(ifIndex));
                 }
             }
         } catch (SchemaVersionMismatchException e) {
@@ -534,11 +533,9 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand {
             Iterator<Long> ofPortsIter = ofPorts.iterator();
             long ofPort = ofPortsIter.next();
             if (ofPort >= 0) {
-                ovsdbTerminationPointBuilder
-                    .setOfport(ofPort);
+                ovsdbTerminationPointBuilder.setOfport(Uint32.valueOf(ofPort));
             } else {
-                LOG.debug("Received negative value for ofPort from ovsdb for {} {}",
-                        interf.getName(),ofPort);
+                LOG.debug("Received negative value for ofPort from ovsdb for {} {}", interf.getName(),ofPort);
             }
         }
     }
@@ -557,11 +554,9 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand {
             Iterator<Long> ofPortRequestsIter = ofPortRequests.iterator();
             int ofPort = ofPortRequestsIter.next().intValue();
             if (ofPort >= 0) {
-                ovsdbTerminationPointBuilder
-                    .setOfportRequest(ofPort);
+                ovsdbTerminationPointBuilder.setOfportRequest(Uint16.valueOf(ofPort));
             } else {
-                LOG.debug("Received negative value for ofPort from ovsdb for {} {}",
-                        interf.getName(),ofPort);
+                LOG.debug("Received negative value for ofPort from ovsdb for {} {}", interf.getName(),ofPort);
             }
         }
     }
@@ -754,7 +749,7 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand {
         if (ingressPolicingRate != null) {
             if (ingressPolicingRate >= 0) {
                 ovsdbTerminationPointBuilder
-                    .setIngressPolicingRate(ingressPolicingRate);
+                    .setIngressPolicingRate(Uint32.valueOf(ingressPolicingRate));
             } else {
                 LOG.debug("Received negative value for ingressPolicingRate from ovsdb for {} {}",
                         interf.getName(),ingressPolicingRate);
@@ -768,7 +763,7 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand {
         if (ingressPolicingBurst != null) {
             if (ingressPolicingBurst >= 0) {
                 ovsdbTerminationPointBuilder
-                    .setIngressPolicingBurst(ingressPolicingBurst);
+                    .setIngressPolicingBurst(Uint32.valueOf(ingressPolicingBurst));
             } else {
                 LOG.debug("Received negative value for ingressPolicingBurst from ovsdb for {} {}",
                         interf.getName(),ingressPolicingBurst);

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQosUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQosUpdateCommand.java
index 601f95decf0e4e0c92bef59429a3da296c5e3551..b7182261cc78c9743e70b4bb814ba98ff7bbb34c 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQosUpdateCommand.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQosUpdateCommand.java
@@ -49,6 +49,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.re
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint32;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -307,7 +308,7 @@ public class OvsdbQosUpdateCommand extends AbstractTransactionCommand {
         Collection<Long> queueListKeys = oldQueueList.keySet();
         for (Long queueListKey : queueListKeys) {
             KeyedInstanceIdentifier<QueueList, QueueListKey> otherIId =
-                    qosIId.child(QueueList.class, new QueueListKey(Long.valueOf(queueListKey.toString())));
+                    qosIId.child(QueueList.class, new QueueListKey(Uint32.valueOf(queueListKey)));
             transaction.delete(LogicalDatastoreType.OPERATIONAL, otherIId);
         }
     }
@@ -321,7 +322,7 @@ public class OvsdbQosUpdateCommand extends AbstractTransactionCommand {
             if (queueIid != null) {
                 newQueueList.add(
                     new QueueListBuilder()
-                    .setQueueNumber(queueEntry.getKey())
+                    .setQueueNumber(Uint32.valueOf(queueEntry.getKey()))
                     .setQueueRef(new OvsdbQueueRef(queueIid)).build());
             }
 

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQueueUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQueueUpdateCommand.java
index d0123e9695f3160420957b908d4f51e98aedde9e..c3e9af0bfbd722ce50dd98d6121cc63e63c2a2d5 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQueueUpdateCommand.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQueueUpdateCommand.java
@@ -41,6 +41,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.re
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint8;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -91,7 +92,7 @@ public class OvsdbQueueUpdateCommand extends AbstractTransactionCommand {
                 queuesBuilder.setQueueUuid(new Uuid(entry.getKey().toString()));
                 Collection<Long> dscp = queue.getDscpColumn().getData();
                 if (!dscp.isEmpty()) {
-                    queuesBuilder.setDscp(dscp.iterator().next().shortValue());
+                    queuesBuilder.setDscp(Uint8.valueOf(dscp.iterator().next().shortValue()));
                 }
                 Queue oldQueue = oldQueueRows.get(entry.getKey());
                 setOtherConfig(transaction, queuesBuilder, oldQueue, queue, nodeIId);

diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbDataTreeChangeListenerTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbDataTreeChangeListenerTest.java
index 2ada74611afb78533318782e2c12d5346df4b5b4..dbc0cfe49d54f77b56a9799f2f2b7242623b095c 100644 (file)
--- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbDataTreeChangeListenerTest.java
+++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbDataTreeChangeListenerTest.java
@@ -30,6 +30,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.re
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.node.attributes.ConnectionInfoBuilder;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint16;
 
 /**
  * Unit tests for the data-tree change listener.
@@ -63,7 +64,7 @@ public class OvsdbDataTreeChangeListenerTest extends AbstractConcurrentDataBroke
         InetAddress inetAddress = InetAddress.getByName("127.0.0.1");
         int port = 6640;
         IpAddress ipAddress = SouthboundMapper.createIpAddress(inetAddress);
-        PortNumber portNumber = new PortNumber(port);
+        PortNumber portNumber = new PortNumber(Uint16.valueOf(port));
 
         final ConnectionInfo connectionInfo = new ConnectionInfoBuilder()
                 .setRemoteIp(ipAddress)

diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundMapperTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundMapperTest.java
index 33a44199396b41b463cee74505c8f7ffa373ed87..f6fd76cb9ae26d758510562db1ff1f83bc16c84d 100644 (file)
--- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundMapperTest.java
+++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundMapperTest.java
@@ -62,6 +62,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.re
 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.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 public class SouthboundMapperTest {
 
@@ -357,7 +358,7 @@ public class SouthboundMapperTest {
 
         assertEquals(Collections.singletonList(new ManagerEntryBuilder()
                 .setConnected(true)
-                .setNumberOfConnections(999L)
+                .setNumberOfConnections(Uint32.valueOf(999))
                 .setTarget(Uri.getDefaultInstance("dummy"))
                 .build()), SouthboundMapper.createManagerEntries(ovsdbNode, updatedManagerRows));
 
@@ -365,7 +366,7 @@ public class SouthboundMapperTest {
         statusAttributeMap.remove("n_connections");
         assertEquals(Collections.singletonList(new ManagerEntryBuilder()
                 .setConnected(true)
-                .setNumberOfConnections(1L)
+                .setNumberOfConnections(Uint32.ONE)
                 .setTarget(Uri.getDefaultInstance("dummy"))
                 .build()), SouthboundMapper.createManagerEntries(ovsdbNode, updatedManagerRows));
     }
@@ -412,7 +413,7 @@ public class SouthboundMapperTest {
 
         assertEquals(Collections.singletonList(new ManagerEntryBuilder()
                 .setConnected(true)
-                .setNumberOfConnections(999L)
+                .setNumberOfConnections(Uint32.valueOf(999))
                 .setTarget(Uri.getDefaultInstance("dummy"))
                 .build()), SouthboundMapper.createManagerEntries(ovsdbNode, updatedManagerRows));
 
@@ -420,7 +421,7 @@ public class SouthboundMapperTest {
         statusAttributeMap.remove("n_connections");
         assertEquals(Collections.singletonList(new ManagerEntryBuilder()
                 .setConnected(true)
-                .setNumberOfConnections(1L)
+                .setNumberOfConnections(Uint32.ONE)
                 .setTarget(Uri.getDefaultInstance("dummy"))
                 .build()), SouthboundMapper.createManagerEntries(ovsdbNode, updatedManagerRows));
     }

diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommandTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommandTest.java
index 73c0a8e03e8c9878f8aa80ae0fe8d5d649b8d9b2..10434b3e57d30e6200a076d782efebdb25a740ab 100644 (file)
--- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommandTest.java
+++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommandTest.java
@@ -81,6 +81,8 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointBuilder;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint32;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.api.support.membermodification.MemberMatcher;
 import org.powermock.api.support.membermodification.MemberModifier;
@@ -545,10 +547,10 @@ public class OvsdbPortUpdateCommandTest {
         when(column.getData()).thenReturn(ofPorts);
         OvsdbTerminationPointAugmentationBuilder ovsdbTerminationPointBuilder = mock(
                 OvsdbTerminationPointAugmentationBuilder.class);
-        when(ovsdbTerminationPointBuilder.setOfport(any(Long.class))).thenReturn(ovsdbTerminationPointBuilder);
+        when(ovsdbTerminationPointBuilder.setOfport(any(Uint32.class))).thenReturn(ovsdbTerminationPointBuilder);
         when(interf.getName()).thenReturn(INTERFACE_NAME);
         Whitebox.invokeMethod(ovsdbPortUpdateCommand, "updateOfPort", interf, ovsdbTerminationPointBuilder);
-        verify(ovsdbTerminationPointBuilder).setOfport(any(Long.class));
+        verify(ovsdbTerminationPointBuilder).setOfport(any(Uint32.class));
     }
 
     @SuppressWarnings("unchecked")
@@ -562,11 +564,11 @@ public class OvsdbPortUpdateCommandTest {
         when(column.getData()).thenReturn(ofPortRequests);
         OvsdbTerminationPointAugmentationBuilder ovsdbTerminationPointBuilder = mock(
                 OvsdbTerminationPointAugmentationBuilder.class);
-        when(ovsdbTerminationPointBuilder.setOfportRequest(any(Integer.class)))
+        when(ovsdbTerminationPointBuilder.setOfportRequest(any(Uint16.class)))
                 .thenReturn(ovsdbTerminationPointBuilder);
         when(interf.getName()).thenReturn(INTERFACE_NAME);
         Whitebox.invokeMethod(ovsdbPortUpdateCommand, "updateOfPortRequest", interf, ovsdbTerminationPointBuilder);
-        verify(ovsdbTerminationPointBuilder).setOfportRequest(any(Integer.class));
+        verify(ovsdbTerminationPointBuilder).setOfportRequest(any(Uint16.class));
     }
 
     @SuppressWarnings("unchecked")