MRI version bumpup for Aluminium

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

diff --git a/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronUtils.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronUtils.java
index 7ffe635a1eebb60fccb3f0a43933b41df3ec1adc..50b6f97c5b1c8cf4fcba45c074c304ac762b1f4b 100644 (file)
--- a/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronUtils.java
+++ b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronUtils.java
@@ -485,11 +485,11 @@ public class QosNeutronUtils {
         tpBuilder.addAugmentation(OvsdbTerminationPointAugmentation.class, tpAugmentationBuilder.build());
         try {
             if (writeConfigTxn != null) {
-                writeConfigTxn.merge(InstanceIdentifier
+                writeConfigTxn.mergeParentStructureMerge(InstanceIdentifier
                         .create(NetworkTopology.class)
                         .child(Topology.class, new TopologyKey(SouthboundUtils.OVSDB_TOPOLOGY_ID))
                         .child(Node.class, bridgeNode.get().key())
-                        .child(TerminationPoint.class, new TerminationPointKey(tp.key())), tpBuilder.build(), true);
+                        .child(TerminationPoint.class, new TerminationPointKey(tp.key())), tpBuilder.build());
             } else {
                 MDSALUtil.syncUpdate(dataBroker, LogicalDatastoreType.CONFIGURATION, InstanceIdentifier
                         .create(NetworkTopology.class)
@@ -883,7 +883,7 @@ public class QosNeutronUtils {
 
     public int getIpVersions(Port port) {
         int versions = 0;
-        for (FixedIps fixedIp: port.getFixedIps()) {
+        for (FixedIps fixedIp: port.getFixedIps().values()) {
             if (fixedIp.getIpAddress().getIpv4Address() != null) {
                 versions |= (1 << QosConstants.IPV4_ADDR_MASK_BIT);
             } else if (fixedIp.getIpAddress().getIpv6Address() != null) {