Migrate to simplified addAugmentation() method

Builders have a much simpler addAugmentation method, move to it to
fix deprecation warnings. We also ditch a ton of unnecessary
indirection in the process of doing so.

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

diff --git a/cloudscaler/impl/src/test/java/org/opendaylight/genius/cloudscaler/tests/CloudScalerServiceTest.java b/cloudscaler/impl/src/test/java/org/opendaylight/genius/cloudscaler/tests/CloudScalerServiceTest.java
index 66b68cd87b112256b9d124f758cb9d6eebdb7a06..a2d9f283d5283aada160e4388994bfb0250afb2e 100644 (file)
--- a/cloudscaler/impl/src/test/java/org/opendaylight/genius/cloudscaler/tests/CloudScalerServiceTest.java
+++ b/cloudscaler/impl/src/test/java/org/opendaylight/genius/cloudscaler/tests/CloudScalerServiceTest.java
@@ -50,7 +50,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.met
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.meta.rev160406.bridge.ref.info.BridgeRefEntryKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.DatapathId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeAugmentationBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeRef;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.bridge.attributes.BridgeOtherConfigsBuilder;
@@ -139,7 +138,7 @@ public class CloudScalerServiceTest {
         otherConfigsBuilder.setBridgeOtherConfigValue(computeName);
         bridge.setDatapathId(new DatapathId(datapathid));
         bridge.setBridgeOtherConfigs(Lists.newArrayList(otherConfigsBuilder.build()));
-        nodeBuilder.addAugmentation(OvsdbBridgeAugmentation.class,bridge.build());
+        nodeBuilder.addAugmentation(bridge.build());
         return nodeBuilder.build();
     }
 
@@ -243,7 +242,7 @@ public class CloudScalerServiceTest {
             throws ExecutionException, InterruptedException, TransactionCommitFailedException {
 
         Set<Uint64> nodesRecoverd = new HashSet<>();
-        tombstonedNodeManager.addOnRecoveryCallback((dpnId) -> {
+        tombstonedNodeManager.addOnRecoveryCallback(dpnId -> {
             nodesRecoverd.add(dpnId);
             return null;
         });

diff --git a/commons/testutils/src/main/java/org/opendaylight/genius/testutils/interfacemanager/InterfaceHelper.java b/commons/testutils/src/main/java/org/opendaylight/genius/testutils/interfacemanager/InterfaceHelper.java
index 5bc908b00b8a1fc506ecac92297aaed8e55b7109..f5d60c9b0ff73c222d73c1bf59a162b045bf756c 100644 (file)
--- a/commons/testutils/src/main/java/org/opendaylight/genius/testutils/interfacemanager/InterfaceHelper.java
+++ b/commons/testutils/src/main/java/org/opendaylight/genius/testutils/interfacemanager/InterfaceHelper.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.genius.testutils.interfacemanager;
 
-import java.util.Collections;
 import java.util.concurrent.ExecutionException;
 import org.opendaylight.genius.datastoreutils.ExpectedDataObjectNotFoundException;
 import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;
@@ -22,9 +21,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfTunnel;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfTunnelBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.ParentRefs;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.ParentRefsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.TunnelTypeVxlan;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
@@ -53,37 +50,21 @@ public final class InterfaceHelper {
     }
 
     public static Interface buildVlanInterfaceFromInfo(InterfaceInfo interfaceInfo) {
-        ParentRefs parentRefs = new ParentRefsBuilder()
-                .setDatapathNodeIdentifier(interfaceInfo.getDpId())
-                .setParentInterface(interfaceInfo.getInterfaceName())
-                .build();
-
         return new InterfaceBuilder()
                 .withKey(new InterfaceKey(interfaceInfo.getInterfaceName()))
                 .setName(interfaceInfo.getInterfaceName())
                 .setDescription("Vlan interface")
                 .setEnabled(true)
                 .setType(L2vlan.class)
-                .addAugmentation(ParentRefs.class, parentRefs)
+                .addAugmentation(new ParentRefsBuilder()
+                        .setDatapathNodeIdentifier(interfaceInfo.getDpId())
+                        .setParentInterface(interfaceInfo.getInterfaceName())
+                        .build())
                 .build();
     }
 
     public static Interface buildVxlanTunnelInterfaceFromInfo(TunnelInterfaceDetails tunnelInterfaceDetails) {
         InterfaceInfo interfaceInfo = tunnelInterfaceDetails.getInterfaceInfo();
-        ParentRefs parentRefs = new ParentRefsBuilder()
-                .setDatapathNodeIdentifier(interfaceInfo.getDpId())
-                .setParentInterface(interfaceInfo.getInterfaceName())
-                .build();
-
-        IfTunnel tunnel = new IfTunnelBuilder()
-                .setTunnelDestination(new IpAddress(new Ipv4Address(tunnelInterfaceDetails.getDstIp())))
-                .setTunnelGateway(new IpAddress(new Ipv4Address(DEFAULT_GW)))
-                .setTunnelSource(new IpAddress(new Ipv4Address(tunnelInterfaceDetails.getSrcIp())))
-                .setTunnelInterfaceType(TunnelTypeVxlan.class)
-                .setInternal(!tunnelInterfaceDetails.isExternal())
-                .setTunnelRemoteIpFlow(false)
-                .setTunnelOptions(Collections.emptyList())
-                .build();
 
         return new InterfaceBuilder()
                 .withKey(new InterfaceKey(interfaceInfo.getInterfaceName()))
@@ -91,8 +72,18 @@ public final class InterfaceHelper {
                 .setDescription("Tunnel interface")
                 .setEnabled(true)
                 .setType(Tunnel.class)
-                .addAugmentation(ParentRefs.class, parentRefs)
-                .addAugmentation(IfTunnel.class, tunnel)
+                .addAugmentation(new ParentRefsBuilder()
+                        .setDatapathNodeIdentifier(interfaceInfo.getDpId())
+                        .setParentInterface(interfaceInfo.getInterfaceName())
+                        .build())
+                .addAugmentation(new IfTunnelBuilder()
+                        .setTunnelDestination(new IpAddress(new Ipv4Address(tunnelInterfaceDetails.getDstIp())))
+                        .setTunnelGateway(new IpAddress(new Ipv4Address(DEFAULT_GW)))
+                        .setTunnelSource(new IpAddress(new Ipv4Address(tunnelInterfaceDetails.getSrcIp())))
+                        .setTunnelInterfaceType(TunnelTypeVxlan.class)
+                        .setInternal(!tunnelInterfaceDetails.isExternal())
+                        .setTunnelRemoteIpFlow(false)
+                        .build())
                 .build();
     }
 }

diff --git a/interfacemanager/interfacemanager-api/src/main/java/org/opendaylight/genius/interfacemanager/globals/InterfaceServiceUtil.java b/interfacemanager/interfacemanager-api/src/main/java/org/opendaylight/genius/interfacemanager/globals/InterfaceServiceUtil.java
index 549a1ad0e8c38b39d511c53b797d09bbe81cbbde..ca0e6672b7062b2d516d8765f5e7cb79c005ea7c 100644 (file)
--- a/interfacemanager/interfacemanager-api/src/main/java/org/opendaylight/genius/interfacemanager/globals/InterfaceServiceUtil.java
+++ b/interfacemanager/interfacemanager-api/src/main/java/org/opendaylight/genius/interfacemanager/globals/InterfaceServiceUtil.java
@@ -11,6 +11,7 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
@@ -33,7 +34,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instru
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfL2vlan;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.ServiceModeIngress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.ServiceTypeFlowBased;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.StypeOpenflow;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.StypeOpenflowBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.service.bindings.ServicesInfo;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.service.bindings.ServicesInfoBuilder;
@@ -74,10 +74,11 @@ public final class InterfaceServiceUtil {
     }
 
     public static ServicesInfo buildServiceInfo(String serviceName, Uint8 servicePriority) {
-        List<BoundServices> boundService = new ArrayList<>();
-        boundService.add(new BoundServicesBuilder().setServicePriority(servicePriority)
-                .setServiceName(serviceName).build());
-        return new ServicesInfoBuilder().setBoundServices(boundService)
+        BoundServices boundService = new BoundServicesBuilder()
+                .setServicePriority(servicePriority)
+                .setServiceName(serviceName)
+                .build();
+        return new ServicesInfoBuilder().setBoundServices(Map.of(boundService.key(), boundService))
                 .withKey(new ServicesInfoKey(serviceName, ServiceModeIngress.class)).build();
     }
 
@@ -87,7 +88,7 @@ public final class InterfaceServiceUtil {
                 .setInstruction(instructions);
         return new BoundServicesBuilder().withKey(new BoundServicesKey(servicePriority)).setServiceName(serviceName)
                 .setServicePriority(servicePriority).setServiceType(ServiceTypeFlowBased.class)
-                .addAugmentation(StypeOpenflow.class, augBuilder.build()).build();
+                .addAugmentation(augBuilder.build()).build();
     }
 
     public static List<MatchInfo> getMatchInfoForVlanLPort(Uint64 dpId, long portNo, long vlanId,

diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java
index 1cac89ef9c47364ed19bb8747e76c0c1aa9b75c3..fbdbd6983d71c2b37e3ac4278893570dd11aac27 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java
+++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java
@@ -120,7 +120,7 @@ public class InterfacemgrProvider implements AutoCloseable, IInterfaceManager {
     private Map<InstanceIdentifier<Node>, OvsdbBridgeAugmentation> nodeIidToBridgeMap;
     private EntityOwnershipCandidateRegistration configEntityCandidate;
     private EntityOwnershipCandidateRegistration bindingEntityCandidate;
-    private InternalTunnelCache internalTunnelCache;
+    private final InternalTunnelCache internalTunnelCache;
 
     @Inject
     public InterfacemgrProvider(@Reference final DataBroker dataBroker,
@@ -421,12 +421,12 @@ public class InterfacemgrProvider implements AutoCloseable, IInterfaceManager {
         if (vlanId != null && vlanId > 0) {
             l2vlanBuilder.setVlanId(new VlanId(vlanId));
         }
-        ParentRefs parentRefs = new ParentRefsBuilder().setParentInterface(portName).build();
         InterfaceBuilder interfaceBuilder = new InterfaceBuilder().setEnabled(true).setName(interfaceName)
-                .setType(L2vlan.class).addAugmentation(IfL2vlan.class, l2vlanBuilder.build())
-                .addAugmentation(ParentRefs.class, parentRefs).setDescription(description);
+                .setType(L2vlan.class).addAugmentation(l2vlanBuilder.build())
+                .addAugmentation(new ParentRefsBuilder().setParentInterface(portName).build())
+                .setDescription(description);
         if (isExternal) {
-            interfaceBuilder.addAugmentation(IfExternal.class, new IfExternalBuilder().setExternal(true).build());
+            interfaceBuilder.addAugmentation(new IfExternalBuilder().setExternal(true).build());
         }
         InstanceIdentifier<Interface> interfaceIId = InterfaceManagerCommonUtils
                 .getInterfaceIdentifier(new InterfaceKey(interfaceName));

diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/hwvtep/confighelpers/HwVTEPInterfaceConfigAddHelper.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/hwvtep/confighelpers/HwVTEPInterfaceConfigAddHelper.java
index 3ae1a5e5dcb8589bc0c598240e52f66a613f3358..46e17e960ad43897210bbcd3b06e65ff794f81ca 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/hwvtep/confighelpers/HwVTEPInterfaceConfigAddHelper.java
+++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/hwvtep/confighelpers/HwVTEPInterfaceConfigAddHelper.java
@@ -22,7 +22,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfTunnel;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.EncapsulationTypeVxlanOverIpv4;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepPhysicalLocatorAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepPhysicalLocatorAugmentationBuilder;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPoint;
@@ -103,7 +102,7 @@ public final class HwVTEPInterfaceConfigAddHelper {
         tpBuilder.setTpId(terminationPointKey.getTpId());
         tpAugmentationBuilder.setEncapsulationType(EncapsulationTypeVxlanOverIpv4.class);
         SouthboundUtils.setDstIp(tpAugmentationBuilder, destIPAddress);
-        tpBuilder.addAugmentation(HwvtepPhysicalLocatorAugmentation.class, tpAugmentationBuilder.build());
+        tpBuilder.addAugmentation(tpAugmentationBuilder.build());
         LOG.debug("creating physical locator entry for {}", terminationPointKey);
         transaction.mergeParentStructurePut(tpPath, tpBuilder.build());
     }

diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/utilities/SouthboundUtils.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/utilities/SouthboundUtils.java
index 352d71779882da0553f7e57683f71bed14c8f154..1913e66c550c642bde0f5b85110916f94e60117b 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/utilities/SouthboundUtils.java
+++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/utilities/SouthboundUtils.java
@@ -154,7 +154,7 @@ public class SouthboundUtils {
                 new CacheConfigBuilder<String, String>()
                         .anchor(this)
                         .id("ovsVersionCache")
-                        .cacheFunction(key -> getVersionForBridgeNodeId(key))
+                        .cacheFunction(this::getVersionForBridgeNodeId)
                         .description("BridgeNodeId to OVS Version cache")
                         .build(),
                 new CachePolicyBuilder().maxEntries(MAX_CACHE_SIZE).build());
@@ -185,7 +185,7 @@ public class SouthboundUtils {
                 if (iface != null) {
                     IfTunnel ifTunnel = iface.augmentation(IfTunnel.class);
                     if (ifTunnel != null) {
-                        if (!(interfacemgrProvider.isItmDirectTunnelsEnabled() && ifTunnel.isInternal())) {
+                        if (!interfacemgrProvider.isItmDirectTunnelsEnabled() || !ifTunnel.isInternal()) {
                             addTunnelPortToBridge(ifTunnel, bridgeIid, iface, portName);
                         }
                         if (isOfTunnel(ifTunnel)) {
@@ -281,12 +281,11 @@ public class SouthboundUtils {
         }
         LOG.debug("update bfd parameters for interface {}", tpIid);
         OvsdbTerminationPointAugmentationBuilder tpAugmentationBuilder = new OvsdbTerminationPointAugmentationBuilder();
-        List<InterfaceBfd> bfdParams = getBfdParams(ifTunnel);
-        tpAugmentationBuilder.setInterfaceBfd(bfdParams);
+        tpAugmentationBuilder.setInterfaceBfd(getBfdParams(ifTunnel));
 
         TerminationPointBuilder tpBuilder = new TerminationPointBuilder();
         tpBuilder.withKey(InstanceIdentifier.keyOf(tpIid));
-        tpBuilder.addAugmentation(OvsdbTerminationPointAugmentation.class, tpAugmentationBuilder.build());
+        tpBuilder.addAugmentation(tpAugmentationBuilder.build());
 
         transaction.mergeParentStructureMerge(tpIid, tpBuilder.build());
     }
@@ -320,14 +319,13 @@ public class SouthboundUtils {
         if (isOfTunnel(ifTunnel)) {
             LOG.warn("BFD Monitoring not supported for OFTunnels");
         } else {
-            List<InterfaceBfd> bfdParams = getBfdParams(ifTunnel);
-            tpAugmentationBuilder.setInterfaceBfd(bfdParams);
+            tpAugmentationBuilder.setInterfaceBfd(getBfdParams(ifTunnel));
         }
         TerminationPointBuilder tpBuilder = new TerminationPointBuilder();
         InstanceIdentifier<TerminationPoint> tpIid = createTerminationPointInstanceIdentifier(
                 InstanceIdentifier.keyOf(bridgeIid.firstIdentifierOf(Node.class)), portName);
         tpBuilder.withKey(InstanceIdentifier.keyOf(tpIid));
-        tpBuilder.addAugmentation(OvsdbTerminationPointAugmentation.class, tpAugmentationBuilder.build());
+        tpBuilder.addAugmentation(tpAugmentationBuilder.build());
 
         batchingUtils.write(tpIid, tpBuilder.build(), BatchingUtils.EntityType.TOPOLOGY_CONFIG);
     }

diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/utilities/FlowBasedServicesUtils.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/utilities/FlowBasedServicesUtils.java
index c6f42020126a05833c10cb3905269657fb6389e7..fc80cc00afccf37d627a3ea56468c4ccf6f47ffe 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/utilities/FlowBasedServicesUtils.java
+++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/utilities/FlowBasedServicesUtils.java
@@ -440,7 +440,7 @@ public final class FlowBasedServicesUtils {
                 .setInstruction(instructions);
         return new BoundServicesBuilder().withKey(new BoundServicesKey(servicePriority)).setServiceName(serviceName)
                 .setServicePriority(servicePriority).setServiceType(ServiceTypeFlowBased.class)
-                .addAugmentation(StypeOpenflow.class, augBuilder.build()).build();
+                .addAugmentation(augBuilder.build()).build();
     }
 
     public static InstanceIdentifier<BoundServices> buildServiceId(String interfaceName, short serviceIndex) {

diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerConfigurationTest.java b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerConfigurationTest.java
index 95e3e48995ee9e77dee23884dd48ea7b0743a737..8a56c1b5dcbe1b8b87906ef88c744ca479ce9d6b 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerConfigurationTest.java
+++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerConfigurationTest.java
@@ -558,8 +558,7 @@ public class InterfaceManagerConfigurationTest {
                 interfaceBfd.sort(Comparator.comparing(o -> o.key().toString()));
                 newOvsdbTpAugmentationBuilder.setInterfaceBfd(interfaceBfd);
             }
-            newTpBuilder.addAugmentation(OvsdbTerminationPointAugmentation.class,
-                    newOvsdbTpAugmentationBuilder.build());
+            newTpBuilder.addAugmentation(newOvsdbTpAugmentationBuilder.build());
         }
         return newTpBuilder.build();
     }

diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestUtil.java b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestUtil.java
index df9cf02ef001f68900489244a9c07ae3f891c08b..7260481b13047db6c2810862430832a0db382fec 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestUtil.java
+++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestUtil.java
@@ -55,7 +55,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.ServiceBindings;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.ServiceModeIngress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.ServiceTypeFlowBased;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.StypeOpenflow;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.StypeOpenflowBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.service.bindings.ServicesInfo;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.service.bindings.ServicesInfoKey;
@@ -139,8 +138,7 @@ public final class InterfaceManagerTestUtil {
         NodeConnectorBuilder ncBuilder = new NodeConnectorBuilder()
                 .setId(ncId)
                 .withKey(new NodeConnectorKey(ncId));
-        ncBuilder.addAugmentation(FlowCapableNodeConnector.class,
-                buildFlowCapableNodeConnector(false, isLive,"AA:AA:AA:AA:AA:AA", portName));
+        ncBuilder.addAugmentation(buildFlowCapableNodeConnector(false, isLive,"AA:AA:AA:AA:AA:AA", portName));
         return ncBuilder.build();
     }
 
@@ -177,8 +175,7 @@ public final class InterfaceManagerTestUtil {
                                            String parentInterface, IfL2vlan.L2vlanMode l2vlanMode) {
         InterfaceBuilder builder = new InterfaceBuilder().withKey(new InterfaceKey(ifName)).setName(ifName)
                 .setDescription(desc).setEnabled(enabled).setType((Class<? extends InterfaceType>) ifType);
-        ParentRefs parentRefs = new ParentRefsBuilder().setParentInterface(parentInterface).build();
-        builder.addAugmentation(ParentRefs.class, parentRefs);
+        builder.addAugmentation(new ParentRefsBuilder().setParentInterface(parentInterface).build());
         if (ifType.equals(L2vlan.class)) {
             IfL2vlanBuilder ifL2vlanBuilder = new IfL2vlanBuilder().setL2vlanMode(l2vlanMode);
             if (IfL2vlan.L2vlanMode.TrunkMember.equals(l2vlanMode)) {
@@ -186,11 +183,10 @@ public final class InterfaceManagerTestUtil {
             } else {
                 ifL2vlanBuilder.setVlanId(VlanId.getDefaultInstance("0"));
             }
-            builder.addAugmentation(IfL2vlan.class, ifL2vlanBuilder.build());
+            builder.addAugmentation(ifL2vlanBuilder.build());
         } else if (ifType.equals(IfTunnel.class)) {
-            IfTunnel tunnel = new IfTunnelBuilder().setTunnelDestination(null).setTunnelGateway(null)
-                    .setTunnelSource(null).setTunnelInterfaceType(null).build();
-            builder.addAugmentation(IfTunnel.class, tunnel);
+            builder.addAugmentation(new IfTunnelBuilder().setTunnelDestination(null).setTunnelGateway(null)
+                    .setTunnelSource(null).setTunnelInterfaceType(null).build());
         }
         return builder.build();
     }
@@ -198,17 +194,23 @@ public final class InterfaceManagerTestUtil {
     static Interface buildTunnelInterface(BigInteger dpn, String ifName, String desc, boolean enabled,
                                           Class<? extends TunnelTypeBase> tunType, String remoteIpStr,
                                           String localIpStr) {
-        InterfaceBuilder builder = new InterfaceBuilder().withKey(new InterfaceKey(ifName)).setName(ifName)
-                .setDescription(desc).setEnabled(enabled).setType(Tunnel.class);
-        ParentRefs parentRefs = new ParentRefsBuilder().setDatapathNodeIdentifier(dpn).build();
-        builder.addAugmentation(ParentRefs.class, parentRefs);
         IpAddress remoteIp = new IpAddress(Ipv4Address.getDefaultInstance(remoteIpStr));
         IpAddress localIp = new IpAddress(Ipv4Address.getDefaultInstance(localIpStr));
-        IfTunnel tunnel = new IfTunnelBuilder().setTunnelDestination(remoteIp).setTunnelGateway(localIp)
-                .setTunnelSource(localIp).setTunnelInterfaceType(tunType).setInternal(true).setMonitorEnabled(false)
+        return new InterfaceBuilder()
+                .withKey(new InterfaceKey(ifName))
+                .setDescription(desc)
+                .setEnabled(enabled)
+                .setType(Tunnel.class)
+                .addAugmentation(new ParentRefsBuilder().setDatapathNodeIdentifier(dpn).build())
+                .addAugmentation(new IfTunnelBuilder()
+                        .setTunnelDestination(remoteIp)
+                        .setTunnelGateway(localIp)
+                        .setTunnelSource(localIp)
+                        .setTunnelInterfaceType(tunType)
+                        .setInternal(true)
+                        .setMonitorEnabled(false)
+                        .build())
                 .build();
-        builder.addAugmentation(IfTunnel.class, tunnel);
-        return builder.build();
     }
 
     static InstanceIdentifier<TerminationPoint> getTerminationPointId(InstanceIdentifier<?> bridgeIid,
@@ -242,16 +244,18 @@ public final class InterfaceManagerTestUtil {
     static void updateTunnelMonitoringAttributes(DataBroker dataBroker, String ifaceName)
             throws ExecutionException, InterruptedException {
         InstanceIdentifier<Interface> tunnelInstanceIdentifier = IfmUtil.buildId(ifaceName);
-        InterfaceBuilder builder = new InterfaceBuilder().withKey(new InterfaceKey(ifaceName)).setName(ifaceName);
-        IfTunnel tunnel = new IfTunnelBuilder().setMonitorProtocol(TunnelMonitoringTypeBfd.class)
-            .setMonitorEnabled(true).build();
-        builder.addAugmentation(IfTunnel.class, tunnel);
         WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
-        tx.merge(CONFIGURATION, tunnelInstanceIdentifier, builder.build());
+        tx.merge(CONFIGURATION, tunnelInstanceIdentifier, new InterfaceBuilder()
+                .withKey(new InterfaceKey(ifaceName))
+                .setName(ifaceName)
+                .addAugmentation(new IfTunnelBuilder()
+                        .setMonitorProtocol(TunnelMonitoringTypeBfd.class)
+                        .setMonitorEnabled(true)
+                        .build())
+                .build());
         tx.commit().get();
     }
 
-
     static void putInterfaceConfig(DataBroker dataBroker, String ifaceName, ParentRefs parentRefs,
                                           Class<? extends InterfaceType> ifType)
             throws ExecutionException, InterruptedException {
@@ -362,7 +366,7 @@ public final class InterfaceManagerTestUtil {
             .setInstruction(instructions);
         return new BoundServicesBuilder().withKey(new BoundServicesKey(servicePriority)).setServiceName(serviceName)
             .setServicePriority(servicePriority).setServiceType(ServiceTypeFlowBased.class)
-            .addAugmentation(StypeOpenflow.class, augBuilder.build()).build();
+            .addAugmentation(augBuilder.build()).build();
     }
 
     static InstanceIdentifier<BoundServices> buildServiceId(String vpnInterfaceName, short serviceIndex) {

diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/OvsdbSouthboundTestUtil.java b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/OvsdbSouthboundTestUtil.java
index 3599ca20ba17b33e892d690191448a69b1a1f78c..6b63554da78de0c785241312642029c65a927db0 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/OvsdbSouthboundTestUtil.java
+++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/OvsdbSouthboundTestUtil.java
@@ -49,7 +49,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.OvsdbBridgeAugmentationBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeName;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbNodeAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentationBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.bridge.attributes.ControllerEntry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.bridge.attributes.ControllerEntryBuilder;
@@ -111,7 +110,7 @@ public class OvsdbSouthboundTestUtil {
         OvsdbBridgeAugmentationBuilder bridgeCreateAugmentationBuilder = new OvsdbBridgeAugmentationBuilder();
         bridgeCreateAugmentationBuilder.setBridgeName(ovsdbBridgeName)
                 .setDatapathId(new DatapathId("00:00:00:00:00:00:00:01"));
-        bridgeCreateNodeBuilder.addAugmentation(OvsdbBridgeAugmentation.class, bridgeCreateAugmentationBuilder.build());
+        bridgeCreateNodeBuilder.addAugmentation(bridgeCreateAugmentationBuilder.build());
         LOG.debug("Built with the intent to store bridge data {}", bridgeCreateAugmentationBuilder.toString());
         WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
         tx.mergeParentStructurePut(LogicalDatastoreType.OPERATIONAL, ovsdbBridgeIid,
@@ -131,7 +130,7 @@ public class OvsdbSouthboundTestUtil {
         OvsdbBridgeAugmentationBuilder bridgeCreateAugmentationBuilder = new OvsdbBridgeAugmentationBuilder();
         bridgeCreateAugmentationBuilder.setBridgeName(ovsdbBridgeName)
             .setDatapathId(new DatapathId(datapathId));
-        bridgeCreateNodeBuilder.addAugmentation(OvsdbBridgeAugmentation.class, bridgeCreateAugmentationBuilder.build());
+        bridgeCreateNodeBuilder.addAugmentation(bridgeCreateAugmentationBuilder.build());
         LOG.debug("Built with the intent to store bridge data {}", bridgeCreateAugmentationBuilder.toString());
         WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
         tx.mergeParentStructureMerge(LogicalDatastoreType.OPERATIONAL, ovsdbBridgeIid,
@@ -223,7 +222,7 @@ public class OvsdbSouthboundTestUtil {
             interfaceExternalIds.add(interfaceExternalIds1);
             tpAugmentationBuilder.setInterfaceExternalIds(interfaceExternalIds);
         }
-        tpBuilder.addAugmentation(OvsdbTerminationPointAugmentation.class, tpAugmentationBuilder.build());
+        tpBuilder.addAugmentation(tpAugmentationBuilder.build());
         WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
         tx.mergeParentStructurePut(OPERATIONAL, tpId, tpBuilder.build());
         tx.commit().get();
@@ -249,7 +248,7 @@ public class OvsdbSouthboundTestUtil {
             .setBfdStatusKey("state").setBfdStatusValue("down").build());
 
         tpAugmentationBuilder.setInterfaceBfdStatus(interfaceBfdStatuses);
-        tpBuilder.addAugmentation(OvsdbTerminationPointAugmentation.class, tpAugmentationBuilder.build());
+        tpBuilder.addAugmentation(tpAugmentationBuilder.build());
         WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
         tx.mergeParentStructureMerge(OPERATIONAL, tpId, tpBuilder.build());
         tx.commit().get();

diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedInterfaceConfig.xtend b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedInterfaceConfig.xtend
index 5db1e71b4c10dcc3fa0ba68da16c12adcb438eaf..e7d4fafadaa5b7762671fb15716fbdd805edfb60 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedInterfaceConfig.xtend
+++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedInterfaceConfig.xtend
@@ -9,12 +9,9 @@ package org.opendaylight.genius.interfacemanager.test.xtend
 
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.L2vlan
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceBuilder
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfExternal
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfExternalBuilder
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfL2vlan
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfL2vlan.L2vlanMode
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfL2vlanBuilder
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.ParentRefs
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.ParentRefsBuilder
 import org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.VlanId
 
@@ -26,9 +23,9 @@ class ExpectedInterfaceConfig {
             description = interfaceName
             name = interfaceName
             type = L2vlan
-            addAugmentation(ParentRefs, new ParentRefsBuilder >> [
+            addAugmentation(new ParentRefsBuilder >> [
                 parentInterface = "tap23701c04-7e"
-            ])addAugmentation(IfL2vlan, new IfL2vlanBuilder >> [
+            ])addAugmentation(new IfL2vlanBuilder >> [
                 l2vlanMode = L2vlanMode.Trunk
                 vlanId = new VlanId(0)
             ])
@@ -40,9 +37,9 @@ class ExpectedInterfaceConfig {
             description = interfaceName
             name = interfaceName
             type = L2vlan
-            addAugmentation(IfL2vlan, new IfL2vlanBuilder >> [
+            addAugmentation(new IfL2vlanBuilder >> [
                 l2vlanMode = L2vlanMode.Trunk
-            ])addAugmentation(ParentRefs, new ParentRefsBuilder >> [
+            ])addAugmentation(new ParentRefsBuilder >> [
                 parentInterface = parentRef
             ])
         ]
@@ -53,12 +50,12 @@ class ExpectedInterfaceConfig {
             description = interfaceName
             name = interfaceName
             type = L2vlan
-            addAugmentation(IfExternal, new IfExternalBuilder >> [
+            addAugmentation(new IfExternalBuilder >> [
                 external = true
             ])
-            addAugmentation(IfL2vlan, new IfL2vlanBuilder >> [
+            addAugmentation(new IfL2vlanBuilder >> [
                 l2vlanMode = L2vlanMode.Trunk
-            ])addAugmentation(ParentRefs, new ParentRefsBuilder >> [
+            ])addAugmentation(new ParentRefsBuilder >> [
                 parentInterface = parentRefs
             ])
         ]
@@ -70,10 +67,10 @@ class ExpectedInterfaceConfig {
                 description = interfaceName
                 name = interfaceName
                 type = L2vlan
-                addAugmentation(IfL2vlan, new IfL2vlanBuilder >> [
+                addAugmentation(new IfL2vlanBuilder >> [
                     l2vlanMode = L2vlanMode.Trunk
                     vlanId = new VlanId(0)
-                ])addAugmentation(ParentRefs, new ParentRefsBuilder >> [
+                ])addAugmentation(new ParentRefsBuilder >> [
                     parentInterface = parentRefs
                 ])
             ]

diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedServicesInfo.xtend b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedServicesInfo.xtend
index d72acdb32b81aef33878042523f255984e4f4ad1..9a72f05e4705557246f1c7ab786dbd6eff7d95fb 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedServicesInfo.xtend
+++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedServicesInfo.xtend
@@ -15,7 +15,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instru
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.apply.actions._case.ApplyActionsBuilder
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.InstructionBuilder
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.ServiceTypeFlowBased
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.StypeOpenflow
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.StypeOpenflowBuilder
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.service.bindings.services.info.BoundServicesBuilder
 
@@ -28,7 +27,7 @@ class ExpectedServicesInfo {
             serviceName = "default.23701c04-7e58-4c65-9425-78a80d49a218"
             servicePriority = 9 as short
             serviceType = ServiceTypeFlowBased
-            addAugmentation(StypeOpenflow, new StypeOpenflowBuilder >> [
+            addAugmentation(new StypeOpenflowBuilder >> [
                 flowCookie = 134217735bi
                 flowPriority = 9
                 instruction = #[

diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedTerminationPoint.xtend b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedTerminationPoint.xtend
index bf9412487367a6100d47e0a031c30e33c03babb1..383cce29babc79f3884e7a85de555ffb7dc04079 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedTerminationPoint.xtend
+++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedTerminationPoint.xtend
@@ -8,7 +8,6 @@
 package org.opendaylight.genius.interfacemanager.test.xtend
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeVxlan
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentationBuilder
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.InterfaceBfdBuilder
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.InterfaceExternalIdsBuilder
@@ -23,7 +22,7 @@ class ExpectedTerminationPoint {
     static def newTerminationPoint() {
         new TerminationPointBuilder >> [
             tpId = new TpId("tun414a856a7a4")
-            addAugmentation(OvsdbTerminationPointAugmentation, new OvsdbTerminationPointAugmentationBuilder >> [
+            addAugmentation(new OvsdbTerminationPointAugmentationBuilder >> [
                 interfaceType = InterfaceTypeVxlan
                 name = "tun414a856a7a4"
                 options = #[
@@ -48,7 +47,7 @@ class ExpectedTerminationPoint {
     static def newBfdEnabledTerminationPoint() {
     new TerminationPointBuilder >> [
         tpId = new TpId("tun414a856a7a4")
-        addAugmentation(OvsdbTerminationPointAugmentation, new OvsdbTerminationPointAugmentationBuilder >> [
+        addAugmentation(new OvsdbTerminationPointAugmentationBuilder >> [
             interfaceBfd = #[
                 new InterfaceBfdBuilder >> [
                     bfdKey = "forwarding_if_rx"

diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/impl/ItmUtils.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/impl/ItmUtils.java
index 5b353bc2ea7805b1ca34e3c82c4f5f1b4c71f916..72ec343259ea30bf4ca81ead39e703d140b752f3 100644 (file)
--- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/impl/ItmUtils.java
+++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/impl/ItmUtils.java
@@ -287,18 +287,16 @@ public final class ItmUtils {
     }
 
     public static Interface buildLogicalTunnelInterface(Uint64 dpn, String ifName, String desc, boolean enabled) {
-        InterfaceBuilder builder = new InterfaceBuilder().withKey(new InterfaceKey(ifName)).setName(ifName)
-                .setDescription(desc).setEnabled(enabled).setType(Tunnel.class);
-        ParentRefs parentRefs = new ParentRefsBuilder().setDatapathNodeIdentifier(dpn).build();
-        builder.addAugmentation(ParentRefs.class, parentRefs);
-
-        IfTunnel tunnel = new IfTunnelBuilder()
-                .setTunnelDestination(IpAddressBuilder.getDefaultInstance(ITMConstants.DUMMY_IP_ADDRESS))
-                .setTunnelSource(IpAddressBuilder.getDefaultInstance(ITMConstants.DUMMY_IP_ADDRESS)).setInternal(true)
-                .setMonitorEnabled(false).setTunnelInterfaceType(TunnelTypeLogicalGroup.class)
-                .setTunnelRemoteIpFlow(false).build();
-        builder.addAugmentation(IfTunnel.class, tunnel);
-        return builder.build();
+        return new InterfaceBuilder().withKey(new InterfaceKey(ifName)).setName(ifName)
+                .setDescription(desc).setEnabled(enabled).setType(Tunnel.class)
+                .addAugmentation(new ParentRefsBuilder().setDatapathNodeIdentifier(dpn).build())
+                .addAugmentation(new IfTunnelBuilder()
+                        .setTunnelDestination(IpAddressBuilder.getDefaultInstance(ITMConstants.DUMMY_IP_ADDRESS))
+                        .setTunnelSource(IpAddressBuilder.getDefaultInstance(ITMConstants.DUMMY_IP_ADDRESS))
+                        .setInternal(true).setMonitorEnabled(false).setTunnelInterfaceType(TunnelTypeLogicalGroup.class)
+                        .setTunnelRemoteIpFlow(false)
+                        .build())
+                .build();
     }
 
     public static Interface buildTunnelInterface(Uint64 dpn, String ifName, String desc, boolean enabled,
@@ -323,9 +321,10 @@ public final class ItmUtils {
                                                  List<TunnelOptions> tunnelOptions) {
         InterfaceBuilder builder = new InterfaceBuilder().withKey(new InterfaceKey(ifName)).setName(ifName)
                 .setDescription(desc).setEnabled(enabled).setType(Tunnel.class);
-        ParentRefs parentRefs =
-                new ParentRefsBuilder().setDatapathNodeIdentifier(dpn).setParentInterface(parentIfaceName).build();
-        builder.addAugmentation(ParentRefs.class, parentRefs);
+        builder.addAugmentation(new ParentRefsBuilder()
+                .setDatapathNodeIdentifier(dpn)
+                .setParentInterface(parentIfaceName)
+                .build());
         Long monitoringInterval = null;
         LOG.debug("buildTunnelInterface: monitorProtocol = {} and monitorInterval = {}",
                 monitorProtocol.getName(), monitorInterval);
@@ -334,14 +333,13 @@ public final class ItmUtils {
             monitoringInterval = monitorInterval.longValue();
         }
 
-        IfTunnel tunnel = new IfTunnelBuilder().setTunnelDestination(remoteIp)
-                .setTunnelSource(localIp).setTunnelInterfaceType(tunType)
+        return builder.addAugmentation(new IfTunnelBuilder()
+                .setTunnelDestination(remoteIp).setTunnelSource(localIp).setTunnelInterfaceType(tunType)
                 .setMonitorEnabled(monitorEnabled).setMonitorProtocol(monitorProtocol)
                 .setMonitorInterval(monitoringInterval).setTunnelRemoteIpFlow(useOfTunnel)
                 .setTunnelOptions(tunnelOptions).setInternal(internal)
+                .build())
                 .build();
-        builder.addAugmentation(IfTunnel.class, tunnel);
-        return builder.build();
     }
 
     public static Interface buildHwTunnelInterface(String tunnelIfName, String desc, boolean enabled, String topoId,
@@ -356,14 +354,13 @@ public final class ItmUtils {
         NodeIdentifier hwNode = new NodeIdentifierBuilder().withKey(new NodeIdentifierKey(topoId))
                 .setTopologyId(topoId).setNodeId(nodeId).build();
         nodeIds.add(hwNode);
-        ParentRefs parent = new ParentRefsBuilder().setNodeIdentifier(nodeIds).build();
-        builder.addAugmentation(ParentRefs.class, parent);
+        builder.addAugmentation(new ParentRefsBuilder().setNodeIdentifier(nodeIds).build());
         IfTunnel tunnel = new IfTunnelBuilder().setTunnelDestination(destIp).setTunnelGateway(gwIp)
                 .setTunnelSource(srcIp).setMonitorEnabled(monitorEnabled == null || monitorEnabled)
                 .setMonitorProtocol(monitorProtocol == null ? ITMConstants.DEFAULT_MONITOR_PROTOCOL : monitorProtocol)
                 .setMonitorInterval(DEFAULT_MONITORING_INTERVAL).setTunnelInterfaceType(tunType).setInternal(false)
                 .build();
-        builder.addAugmentation(IfTunnel.class, tunnel);
+        builder.addAugmentation(tunnel);
         LOG.trace("iftunnel {} built from hwvtep {} ", tunnel, nodeId);
         return builder.build();
     }

diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/renderer/ovs/utilities/DirectTunnelUtils.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/renderer/ovs/utilities/DirectTunnelUtils.java
index f53faeb7e31898027f6b8e58dad97e7d69b46a73..de0ca44ed36d31d16df3e1c420f8d6efd681b1f3 100644 (file)
--- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/renderer/ovs/utilities/DirectTunnelUtils.java
+++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/renderer/ovs/utilities/DirectTunnelUtils.java
@@ -538,7 +538,7 @@ public final class DirectTunnelUtils {
 
         TerminationPointBuilder tpBuilder = new TerminationPointBuilder();
         tpBuilder.withKey(InstanceIdentifier.keyOf(tpIid));
-        tpBuilder.addAugmentation(OvsdbTerminationPointAugmentation.class, tpAugmentationBuilder.build());
+        tpBuilder.addAugmentation(tpAugmentationBuilder.build());
 
         ITMBatchingUtils.write(tpIid, tpBuilder.build(), ITMBatchingUtils.EntityType.TOPOLOGY_CONFIG);
     }
@@ -601,7 +601,7 @@ public final class DirectTunnelUtils {
         LOG.debug("OvsdbTerminationPointAugmentation: {}", tpAugmentationBuilder);
         TerminationPointBuilder tpBuilder = new TerminationPointBuilder();
         tpBuilder.withKey(InstanceIdentifier.keyOf(tpIid));
-        tpBuilder.addAugmentation(OvsdbTerminationPointAugmentation.class, tpAugmentationBuilder.build());
+        tpBuilder.addAugmentation(tpAugmentationBuilder.build());
         ITMBatchingUtils.update(tpIid, tpBuilder.build(), ITMBatchingUtils.EntityType.TOPOLOGY_CONFIG);
     }
 

diff --git a/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/cli/TepCommandHelperTest.java b/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/cli/TepCommandHelperTest.java
index bee35c5ee505451acbb5084219a2785858ff1130..70c53226c019f7c2ece99a3b4af86c825a526f6c 100644 (file)
--- a/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/cli/TepCommandHelperTest.java
+++ b/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/cli/TepCommandHelperTest.java
@@ -14,7 +14,6 @@ import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import com.google.common.util.concurrent.FluentFuture;
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.util.ArrayList;
@@ -256,7 +255,7 @@ public class TepCommandHelperTest {
         doReturn(mockReadTx).when(dataBroker).newReadOnlyTransaction();
         doReturn(mockWriteTx).when(dataBroker).newWriteOnlyTransaction();
         lenient().doReturn(FluentFutures.immediateNullFluentFuture()).when(mockWriteTx).commit();
-        doReturn(FluentFuture.from(FluentFutures.immediateFluentFuture(CommitInfo.empty()))).when(mockWriteTx).commit();
+        doReturn(CommitInfo.emptyFluentFuture()).when(mockWriteTx).commit();
     }
 
     @Test

diff --git a/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/tests/OvsdbTestUtil.java b/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/tests/OvsdbTestUtil.java
index 7c5a69290719c47d059b308029f67c97d7f53421..6005d0ab8d197b197011931f73d79c6b800de340 100644 (file)
--- a/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/tests/OvsdbTestUtil.java
+++ b/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/tests/OvsdbTestUtil.java
@@ -23,10 +23,8 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 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.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.DatapathId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeAugmentationBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeName;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbNodeAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbNodeAugmentationBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbNodeRef;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.node.attributes.ConnectionInfo;
@@ -115,7 +113,7 @@ public final class OvsdbTestUtil {
         ovsdbNodeAugBuilder.setOpenvswitchOtherConfigs(otherConfigsList);
 
         // add OvsdbNodeAugmentation into Node
-        nodeBuilder.addAugmentation(OvsdbNodeAugmentation.class, ovsdbNodeAugBuilder.build());
+        nodeBuilder.addAugmentation(ovsdbNodeAugBuilder.build());
         Node ovsdbNode = nodeBuilder.build();
 
         WriteTransaction transaction = dataBroker.newWriteOnlyTransaction();
@@ -185,7 +183,7 @@ public final class OvsdbTestUtil {
         ovsdbNodeAugBuilder.setOpenvswitchOtherConfigs(otherConfigsList);
 
         // add OvsdbNodeAugmentation into Node
-        nodeBuilder.addAugmentation(OvsdbNodeAugmentation.class, ovsdbNodeAugBuilder.build());
+        nodeBuilder.addAugmentation(ovsdbNodeAugBuilder.build());
         Node ovsdbNode = nodeBuilder.build();
 
         //ReadWriteTransaction transaction = dataBroker.newReadWriteTransaction();
@@ -212,7 +210,7 @@ public final class OvsdbTestUtil {
         ovsdbBridgeAugmentationBuilder.setManagedBy(new OvsdbNodeRef(
             SouthboundUtils.createInstanceIdentifier(nodeKey.getNodeId())));
 
-        bridgeNodeBuilder.addAugmentation(OvsdbBridgeAugmentation.class, ovsdbBridgeAugmentationBuilder.build());
+        bridgeNodeBuilder.addAugmentation(ovsdbBridgeAugmentationBuilder.build());
 
         Node bridgeNode = bridgeNodeBuilder.build();
 

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionNdOptionType.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionNdOptionType.java
index 80ab41c7439e0b16566ea6349b36a4c2c539d513..10124483639ff6458e81bce3667ead4b71ca6dfd 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionNdOptionType.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionNdOptionType.java
@@ -9,24 +9,20 @@ package org.opendaylight.genius.mdsalutil.actions;
 
 import java.util.Collections;
 import org.opendaylight.genius.mdsalutil.ActionInfo;
-import org.opendaylight.openflowplugin.extension.api.ExtensionAugment;
 import org.opendaylight.openflowplugin.extension.api.GroupingLooseResolver;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetFieldCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.field._case.SetFieldBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.ActionBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.ActionKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.eric.match.rev180730.EricAugMatchNodesNodeTableFlow;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.eric.match.rev180730.EricAugMatchNodesNodeTableFlowBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.eric.match.rev180730.Icmpv6NdOptionsTypeKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.eric.match.rev180730.eric.of.icmpv6.nd.options.type.grouping.EricOfIcmpv6NdOptionsTypeBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchNodesNodeTableFlowWriteActionsSetField;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchNodesNodeTableFlowWriteActionsSetFieldBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralExtensionListGrouping;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.ExtensionBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.list.grouping.ExtensionListBuilder;
-import org.opendaylight.yangtools.yang.binding.Augmentation;
 
 /**
  * Set source IPv6 action.
@@ -59,36 +55,27 @@ public class ActionNdOptionType extends ActionInfo {
                 new GroupingLooseResolver<>(GeneralExtensionListGrouping.class);
         eqGroup.add(GeneralAugMatchNodesNodeTableFlowWriteActionsSetField.class);
 
-        ExtensionAugment<? extends Augmentation<Extension>> extensionMatch
-                =  new ExtensionAugment<>(EricAugMatchNodesNodeTableFlow.class,
-                new EricAugMatchNodesNodeTableFlowBuilder().setEricOfIcmpv6NdOptionsType(
-                        new EricOfIcmpv6NdOptionsTypeBuilder().setIcmpv6NdOptionsType(ndOptionType).build()).build(),
-                Icmpv6NdOptionsTypeKey.class);
-
-        ExtensionListBuilder extListBld = null;
-        ExtensionBuilder extBld = new ExtensionBuilder();
-        extBld.addAugmentation(extensionMatch.getAugmentationClass(), extensionMatch.getAugmentationObject());
-
-        extListBld = new ExtensionListBuilder();
-        extListBld.setExtension(extBld.build());
-        extListBld.setExtensionKey(extensionMatch.getKey());
-
-        GeneralAugMatchNodesNodeTableFlowWriteActionsSetField ndOptionsTypeSetField =
-                new GeneralAugMatchNodesNodeTableFlowWriteActionsSetFieldBuilder()
-                        .setExtensionList(Collections.singletonList(extListBld.build())).build();
-
         return new ActionBuilder()
-                .setAction(new SetFieldCaseBuilder()
-                        .setSetField(new SetFieldBuilder()
-                                .addAugmentation(GeneralAugMatchNodesNodeTableFlowWriteActionsSetField.class,
-                                        ndOptionsTypeSetField)
+            .setAction(new SetFieldCaseBuilder()
+                .setSetField(new SetFieldBuilder()
+                    .addAugmentation(new GeneralAugMatchNodesNodeTableFlowWriteActionsSetFieldBuilder()
+                        .setExtensionList(Collections.singletonList(new ExtensionListBuilder()
+                            .setExtension(new ExtensionBuilder()
+                                .addAugmentation(new EricAugMatchNodesNodeTableFlowBuilder()
+                                    .setEricOfIcmpv6NdOptionsType(new EricOfIcmpv6NdOptionsTypeBuilder()
+                                        .setIcmpv6NdOptionsType(ndOptionType)
+                                        .build())
+                                    .build())
                                 .build())
+                            .setExtensionKey(Icmpv6NdOptionsTypeKey.class)
+                            .build()))
                         .build())
-                .withKey(new ActionKey(newActionKey))
-                .build();
+                    .build())
+                .build())
+            .withKey(new ActionKey(newActionKey))
+            .build();
     }
 
-
     @Override
     public boolean equals(Object other) {
         if (this == other) {

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionNdReserved.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionNdReserved.java
index 1c8400909406a21329026438c982b3c3ff3c2c2e..26c2b4761ab427b1f7c3c21d3468ea91694b4e63 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionNdReserved.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionNdReserved.java
@@ -9,24 +9,20 @@ package org.opendaylight.genius.mdsalutil.actions;
 
 import java.util.Collections;
 import org.opendaylight.genius.mdsalutil.ActionInfo;
-import org.opendaylight.openflowplugin.extension.api.ExtensionAugment;
 import org.opendaylight.openflowplugin.extension.api.GroupingLooseResolver;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetFieldCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.field._case.SetFieldBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.ActionBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.ActionKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.eric.match.rev180730.EricAugMatchNodesNodeTableFlow;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.eric.match.rev180730.EricAugMatchNodesNodeTableFlowBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.eric.match.rev180730.Icmpv6NdReservedKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.eric.match.rev180730.eric.of.icmpv6.nd.reserved.grouping.EricOfIcmpv6NdReservedBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchNodesNodeTableFlowWriteActionsSetField;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralAugMatchNodesNodeTableFlowWriteActionsSetFieldBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralExtensionListGrouping;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.ExtensionBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.list.grouping.ExtensionListBuilder;
-import org.opendaylight.yangtools.yang.binding.Augmentation;
 
 /**
  * Set source IPv6 action.
@@ -59,33 +55,25 @@ public class ActionNdReserved extends ActionInfo {
                 new GroupingLooseResolver<>(GeneralExtensionListGrouping.class);
         eqGroup.add(GeneralAugMatchNodesNodeTableFlowWriteActionsSetField.class);
 
-        ExtensionAugment<? extends Augmentation<Extension>> extensionMatch
-                =  new ExtensionAugment<>(EricAugMatchNodesNodeTableFlow.class,
-                new EricAugMatchNodesNodeTableFlowBuilder().setEricOfIcmpv6NdReserved(
-                        new EricOfIcmpv6NdReservedBuilder().setIcmpv6NdReserved(ndReserved).build()).build(),
-                Icmpv6NdReservedKey.class);
-
-        ExtensionListBuilder extListBld = null;
-        ExtensionBuilder extBld = new ExtensionBuilder();
-        extBld.addAugmentation(extensionMatch.getAugmentationClass(), extensionMatch.getAugmentationObject());
-
-        extListBld = new ExtensionListBuilder();
-        extListBld.setExtension(extBld.build());
-        extListBld.setExtensionKey(extensionMatch.getKey());
-
-        GeneralAugMatchNodesNodeTableFlowWriteActionsSetField ndReservedSetField =
-                new GeneralAugMatchNodesNodeTableFlowWriteActionsSetFieldBuilder()
-                        .setExtensionList(Collections.singletonList(extListBld.build())).build();
-
         return new ActionBuilder()
-                .setAction(new SetFieldCaseBuilder()
-                        .setSetField(new SetFieldBuilder()
-                                .addAugmentation(GeneralAugMatchNodesNodeTableFlowWriteActionsSetField.class,
-                                        ndReservedSetField)
+            .setAction(new SetFieldCaseBuilder()
+                .setSetField(new SetFieldBuilder()
+                    .addAugmentation(new GeneralAugMatchNodesNodeTableFlowWriteActionsSetFieldBuilder()
+                        .setExtensionList(Collections.singletonList(new ExtensionListBuilder()
+                            .setExtension(new ExtensionBuilder()
+                                .addAugmentation(new EricAugMatchNodesNodeTableFlowBuilder()
+                                    .setEricOfIcmpv6NdReserved(new EricOfIcmpv6NdReservedBuilder()
+                                        .setIcmpv6NdReserved(ndReserved)
+                                        .build())
+                                    .build())
                                 .build())
+                            .setExtensionKey(Icmpv6NdReservedKey.class)
+                            .build()))
                         .build())
-                .withKey(new ActionKey(newActionKey))
-                .build();
+                    .build())
+                .build())
+            .withKey(new ActionKey(newActionKey))
+            .build();
     }
 
     @Override

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/ericmatches/EricMatchInfoHelper.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/ericmatches/EricMatchInfoHelper.java
index 66bba53e74f7665e4a03f4d7c4f071fadb728e40..5d5a32196e91ede11a05e3701ff7fc219c9caf09 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/ericmatches/EricMatchInfoHelper.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/ericmatches/EricMatchInfoHelper.java
@@ -57,9 +57,7 @@ public abstract class EricMatchInfoHelper<T extends DataObject, B extends Builde
             EricAugMatchNodesNodeTableFlow ericAugMatch = ericAugMatchBuilder.build();
             GeneralAugMatchNodesNodeTableFlow existingAugmentations = matchBuilder
                     .augmentation(GeneralAugMatchNodesNodeTableFlow.class);
-            GeneralAugMatchNodesNodeTableFlow genAugMatch = generalAugMatchBuilder(existingAugmentations,
-                    ericAugMatch, keyClass);
-            matchBuilder.addAugmentation(GeneralAugMatchNodesNodeTableFlow.class, genAugMatch);
+            matchBuilder.addAugmentation(generalAugMatchBuilder(existingAugmentations, ericAugMatch, keyClass));
         }
     }
 
@@ -74,9 +72,7 @@ public abstract class EricMatchInfoHelper<T extends DataObject, B extends Builde
             extensions = new HashMap<>();
         }
         ExtensionList extensionList = new ExtensionListBuilder().setExtensionKey(extentionKey)
-                .setExtension(
-                        new ExtensionBuilder().addAugmentation(EricAugMatchNodesNodeTableFlow.class, ericAugMatch)
-                                .build())
+                .setExtension(new ExtensionBuilder().addAugmentation(ericAugMatch).build())
                 .build();
         extensions.put(extensionList.key(),extensionList);
         return new GeneralAugMatchNodesNodeTableFlowBuilder().setExtensionList(extensions).build();

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/nxmatches/NxMatchInfoHelper.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/nxmatches/NxMatchInfoHelper.java
index 09b87ee54d86d03c535c4a16f18971acddcee40a..cd809ce895f0b5a37b9e9fe3253d0c500c57bcb6 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/nxmatches/NxMatchInfoHelper.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/nxmatches/NxMatchInfoHelper.java
@@ -59,9 +59,7 @@ public abstract class NxMatchInfoHelper<T extends DataObject, B extends Builder<
             NxAugMatchNodesNodeTableFlow nxAugMatch = nxAugMatchBuilder.build();
             GeneralAugMatchNodesNodeTableFlow existingAugmentations = matchBuilder
                     .augmentation(GeneralAugMatchNodesNodeTableFlow.class);
-            GeneralAugMatchNodesNodeTableFlow genAugMatch = generalAugMatchBuilder(existingAugmentations,
-                    nxAugMatch, keyClass);
-            matchBuilder.addAugmentation(GeneralAugMatchNodesNodeTableFlow.class, genAugMatch);
+            matchBuilder.addAugmentation(generalAugMatchBuilder(existingAugmentations, nxAugMatch, keyClass));
         }
     }
 
@@ -79,8 +77,7 @@ public abstract class NxMatchInfoHelper<T extends DataObject, B extends Builder<
         }
 
         ExtensionList extensionList = new ExtensionListBuilder().setExtensionKey(extentionKey)
-                .setExtension(new ExtensionBuilder().addAugmentation(NxAugMatchNodesNodeTableFlow.class,
-                        nxAugMatch).build()).build();
+                .setExtension(new ExtensionBuilder().addAugmentation(nxAugMatch).build()).build();
         extensions.put(extensionList.key(),extensionList);
         return new GeneralAugMatchNodesNodeTableFlowBuilder().setExtensionList(extensions).build();
     }

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/hwvtep/HwvtepUtils.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/hwvtep/HwvtepUtils.java
index f7961b1db156bae36ce57d59937bfd9673bac061..06fe80cb84c6b4b7d4300052318e3aeafc803a6e 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/hwvtep/HwvtepUtils.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/hwvtep/HwvtepUtils.java
@@ -316,11 +316,10 @@ public final class HwvtepUtils {
                                           final HwvtepPhysicalLocatorAugmentation phyLocator) {
         InstanceIdentifier<TerminationPoint> iid = HwvtepSouthboundUtils.createPhysicalLocatorInstanceIdentifier(nodeId,
                 phyLocator);
-        TerminationPoint terminationPoint = new TerminationPointBuilder()
+        transaction.mergeParentStructurePut(LogicalDatastoreType.CONFIGURATION, iid, new TerminationPointBuilder()
                 .withKey(HwvtepSouthboundUtils.getTerminationPointKey(phyLocator))
-                .addAugmentation(HwvtepPhysicalLocatorAugmentation.class, phyLocator).build();
-
-        transaction.mergeParentStructurePut(LogicalDatastoreType.CONFIGURATION, iid, terminationPoint);
+                .addAugmentation(phyLocator)
+                .build());
     }
 
     /**