MD-SAL API integration

[ovsdb.git] / southbound / southbound-impl / src / main / java / org / opendaylight / ovsdb / southbound / ovsdb / transact / QosUpdateCommand.java

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QosUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QosUpdateCommand.java
index d9273bc8bb00581ae421a53c0131ba7e4f6c6863..33aa7f94768617d113a62b190ceb2dd84329b112 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QosUpdateCommand.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QosUpdateCommand.java
@@ -15,10 +15,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
+import org.opendaylight.mdsal.binding.api.DataTreeModification;
 import org.opendaylight.ovsdb.lib.notation.UUID;
 import org.opendaylight.ovsdb.lib.operations.TransactionBuilder;
-import org.opendaylight.ovsdb.lib.schema.typed.TyperUtils;
 import org.opendaylight.ovsdb.schema.openvswitch.Qos;
 import org.opendaylight.ovsdb.southbound.InstanceIdentifierCodec;
 import org.opendaylight.ovsdb.southbound.SouthboundConstants;
@@ -44,22 +43,23 @@ public class QosUpdateCommand implements TransactCommand {
     private static final Logger LOG = LoggerFactory.getLogger(QosUpdateCommand.class);
 
     @Override
-    public void execute(TransactionBuilder transaction, BridgeOperationalState state,
-            DataChangeEvent events, InstanceIdentifierCodec instanceIdentifierCodec) {
+    public void execute(final TransactionBuilder transaction, final BridgeOperationalState state,
+            final DataChangeEvent events, final InstanceIdentifierCodec instanceIdentifierCodec) {
         execute(transaction, state, TransactUtils.extractCreatedOrUpdated(events, QosEntries.class),
                 instanceIdentifierCodec);
     }
 
     @Override
-    public void execute(TransactionBuilder transaction, BridgeOperationalState state,
-            Collection<DataTreeModification<Node>> modifications, InstanceIdentifierCodec instanceIdentifierCodec) {
+    public void execute(final TransactionBuilder transaction, final BridgeOperationalState state,
+            final Collection<DataTreeModification<Node>> modifications,
+            final InstanceIdentifierCodec instanceIdentifierCodec) {
         execute(transaction, state, TransactUtils.extractCreatedOrUpdated(modifications, QosEntries.class),
                 instanceIdentifierCodec);
     }
 
-    private void execute(TransactionBuilder transaction, BridgeOperationalState state,
-            Map<InstanceIdentifier<QosEntries>, QosEntries> createdOrUpdated,
-            InstanceIdentifierCodec instanceIdentifierCodec) {
+    private void execute(final TransactionBuilder transaction, final BridgeOperationalState state,
+            final Map<InstanceIdentifier<QosEntries>, QosEntries> createdOrUpdated,
+            final InstanceIdentifierCodec instanceIdentifierCodec) {
         for (Entry<InstanceIdentifier<QosEntries>, QosEntries> qosMapEntry: createdOrUpdated.entrySet()) {
             InstanceIdentifier<OvsdbNodeAugmentation> iid =
                     qosMapEntry.getKey().firstIdentifierOf(OvsdbNodeAugmentation.class);
@@ -67,10 +67,10 @@ public class QosUpdateCommand implements TransactCommand {
                 return;
             }
             OvsdbNodeAugmentation operNode =
-                state.getBridgeNode(iid).get().getAugmentation(OvsdbNodeAugmentation.class);
+                state.getBridgeNode(iid).get().augmentation(OvsdbNodeAugmentation.class);
 
             QosEntries qosEntry = qosMapEntry.getValue();
-            Qos qos = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), Qos.class);
+            Qos qos = transaction.getTypedRowWrapper(Qos.class);
 
             if (qosEntry.getQosType() != null) {
                 qos.setType(SouthboundMapper.createQosType(qosEntry.getQosType()));
@@ -81,7 +81,7 @@ public class QosUpdateCommand implements TransactCommand {
             if (queueList != null && !queueList.isEmpty()) {
                 for (QueueList queue : queueList) {
                     if (queue.getQueueRef() != null) {
-                        newQueueList.put(queue.getQueueNumber(),
+                        newQueueList.put(queue.getQueueNumber().toJava(),
                                 new UUID(getQueueUuid(queue.getQueueRef(), operNode)));
                     }
                 }
@@ -118,8 +118,7 @@ public class QosUpdateCommand implements TransactCommand {
                 LOG.info("Added QoS Uuid: {} for node : {} ", namedUuid, operNode.getConnectionInfo());
             } else {
                 UUID uuid = new UUID(operQosUuid.getValue());
-                Qos extraQos = TyperUtils.getTypedRowWrapper(
-                        transaction.getDatabaseSchema(), Qos.class, null);
+                Qos extraQos = transaction.getTypedRowSchema(Qos.class);
                 extraQos.getUuidColumn().setData(uuid);
                 transaction.add(op.update(qos)
                         .where(extraQos.getUuidColumn().getSchema().opEqual(uuid)).build());
@@ -128,7 +127,7 @@ public class QosUpdateCommand implements TransactCommand {
         }
     }
 
-    private String getQueueUuid(OvsdbQueueRef queueRef, OvsdbNodeAugmentation operNode) {
+    private String getQueueUuid(final OvsdbQueueRef queueRef, final OvsdbNodeAugmentation operNode) {
         QueuesKey queueKey = queueRef.getValue().firstKeyOf(Queues.class);
         if (operNode.getQueues() != null && !operNode.getQueues().isEmpty()) {
             for (Queues queue : operNode.getQueues()) {
@@ -141,7 +140,7 @@ public class QosUpdateCommand implements TransactCommand {
                 + TransactUtils.bytesToHexString(queueKey.getQueueId().getValue().getBytes(UTF_8));
     }
 
-    private Uuid getQosEntryUuid(List<QosEntries> operQosEntries, Uri qosId) {
+    private Uuid getQosEntryUuid(final List<QosEntries> operQosEntries, final Uri qosId) {
         if (operQosEntries != null && !operQosEntries.isEmpty()) {
             for (QosEntries qosEntry : operQosEntries) {
                 if (qosEntry.getQosId().equals(qosId)) {