Migrate users of addAugmentation()

Builders have a simplified addAugmentation() method, migrate last
two users to it.

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

diff --git a/hwvtepsouthbound/hwvtepsouthbound-it/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/it/HwvtepSouthboundIT.java b/hwvtepsouthbound/hwvtepsouthbound-it/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/it/HwvtepSouthboundIT.java
index a189c255e490afd81e65d5dfbc1c4a6240085214..874db8033093135e95576931eda3b50b3bd00a45 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-it/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/it/HwvtepSouthboundIT.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-it/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/it/HwvtepSouthboundIT.java
@@ -424,7 +424,7 @@ public class HwvtepSouthboundIT extends AbstractMdsalTestBase {
             psAugBuilder.setManagementIps(managementIps);
             psAugBuilder.setTunnelIps(tunnelIps);
             psAugBuilder.setTunnels(tunnels);
-            psNodeBuilder.addAugmentation(PhysicalSwitchAugmentation.class, psAugBuilder.build());
+            psNodeBuilder.addAugmentation(psAugBuilder.build());
             LOG.debug("Built with intent to store PhysicalSwitch data {}", psAugBuilder);
             Assert.assertTrue(
                     mdsalUtils.merge(LogicalDatastoreType.CONFIGURATION, psIid, psNodeBuilder.build()));

diff --git a/utils/hwvtepsouthbound-utils/src/main/java/org/opendaylight/ovsdb/utils/hwvtepsouthbound/utils/HwvtepSouthboundUtils.java b/utils/hwvtepsouthbound-utils/src/main/java/org/opendaylight/ovsdb/utils/hwvtepsouthbound/utils/HwvtepSouthboundUtils.java
index d08d7ef186727d1c3b6926f91e710b7ff9fed3b4..f0cae55bef68252b3161d97853357d5b43369455 100644 (file)
--- a/utils/hwvtepsouthbound-utils/src/main/java/org/opendaylight/ovsdb/utils/hwvtepsouthbound/utils/HwvtepSouthboundUtils.java
+++ b/utils/hwvtepsouthbound-utils/src/main/java/org/opendaylight/ovsdb/utils/hwvtepsouthbound/utils/HwvtepSouthboundUtils.java
@@ -42,16 +42,14 @@ public final class HwvtepSouthboundUtils {
     }
 
     public static Node createNode(ConnectionInfo key) {
-        NodeBuilder nodeBuilder = new NodeBuilder();
-        nodeBuilder.setNodeId(createNodeId(key.getRemoteIp(), key.getRemotePort()));
-        nodeBuilder.addAugmentation(HwvtepGlobalAugmentation.class, createHwvtepAugmentation(key));
-        return nodeBuilder.build();
+        return new NodeBuilder()
+            .setNodeId(createNodeId(key.getRemoteIp(), key.getRemotePort()))
+            .addAugmentation(createHwvtepAugmentation(key))
+            .build();
     }
 
     public static HwvtepGlobalAugmentation createHwvtepAugmentation(ConnectionInfo key) {
-        HwvtepGlobalAugmentationBuilder hwvtepGlobalBuilder = new HwvtepGlobalAugmentationBuilder();
-        hwvtepGlobalBuilder.setConnectionInfo(key);
-        return hwvtepGlobalBuilder.build();
+        return new HwvtepGlobalAugmentationBuilder().setConnectionInfo(key).build();
     }
 
     public static InstanceIdentifier<Node> createInstanceIdentifier(ConnectionInfo key) {