MRI version bumpup for Aluminium

[netvirt.git] / qosservice / impl / src / main / java / org / opendaylight / netvirt / qosservice / QosTerminationPointListener.java

diff --git a/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosTerminationPointListener.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosTerminationPointListener.java
index b8f6273a1ba739f08eaa12baaee417586ac490a2..1a1325e0ca75c87f796c30a21c4f5ef6ba2a766f 100644 (file)
--- a/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosTerminationPointListener.java
+++ b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosTerminationPointListener.java
@@ -186,12 +186,12 @@ public class QosTerminationPointListener extends
                     tpAugmentationBuilder.setIngressPolicingRate(bwRule.getMaxKbps().longValue());
                     tpAugmentationBuilder.setIngressPolicingBurst(bwRule.getMaxBurstKbps().longValue());
 
-                    tx.merge(InstanceIdentifier.create(NetworkTopology.class)
+                    tx.mergeParentStructureMerge(InstanceIdentifier.create(NetworkTopology.class)
                             .child(Topology.class, new TopologyKey(SouthboundUtils.OVSDB_TOPOLOGY_ID))
                             .child(Node.class, identifier.firstKeyOf(Node.class))
                             .child(TerminationPoint.class, identifier.firstKeyOf(TerminationPoint.class))
                             .augmentation(OvsdbTerminationPointAugmentation.class),
-                            tpAugmentationBuilder.build(), true);
+                            tpAugmentationBuilder.build());
 
                 })));
     }
@@ -199,7 +199,7 @@ public class QosTerminationPointListener extends
     @Nullable
     private String getIfaceId(OvsdbTerminationPointAugmentation tpAugmentation) {
         if (tpAugmentation.getInterfaceExternalIds() != null) {
-            for (InterfaceExternalIds entry: tpAugmentation.getInterfaceExternalIds()) {
+            for (InterfaceExternalIds entry: tpAugmentation.getInterfaceExternalIds().values()) {
                 if (EXTERNAL_ID_INTERFACE_ID.equals(entry.getExternalIdKey())) {
                     return entry.getExternalIdValue();
                 }