Bulk merge of l2gw changes

[netvirt.git] / elanmanager / impl / src / main / java / org / opendaylight / netvirt / elan / l2gw / ha / commands / TerminationPointCmd.java

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TerminationPointCmd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TerminationPointCmd.java
index 8f2bd38f6d5b18e75152e0e38838b44b9489ffba..70a1d46a39b7d2b57971d07be92bd10a22e2f4f5 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TerminationPointCmd.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TerminationPointCmd.java
@@ -69,11 +69,18 @@ public class TerminationPointCmd extends MergeCommand<TerminationPoint, NodeBuil
         TerminationPointBuilder tpBuilder = new TerminationPointBuilder(src);
         tpBuilder.removeAugmentation(HwvtepPhysicalPortAugmentation.class);
         HwvtepPhysicalPortAugmentationBuilder tpAugmentationBuilder =
-                new HwvtepPhysicalPortAugmentationBuilder(augmentation);
-
+                new HwvtepPhysicalPortAugmentationBuilder();
+        tpAugmentationBuilder.setAclBindings(augmentation.getAclBindings());
+        tpAugmentationBuilder.setHwvtepNodeDescription(augmentation.getHwvtepNodeDescription());
+        tpAugmentationBuilder.setHwvtepNodeName(augmentation.getHwvtepNodeName());
+        tpAugmentationBuilder.setPhysicalPortUuid(augmentation.getPhysicalPortUuid());
+        tpAugmentationBuilder.setVlanStats(augmentation.getVlanStats());
         if (augmentation.getVlanBindings() != null && augmentation.getVlanBindings().size() > 0) {
             tpAugmentationBuilder.setVlanBindings(augmentation.nonnullVlanBindings().values().stream().map(
                 vlanBindings -> {
+                    if (vlanBindings.getLogicalSwitchRef() == null) {
+                        LOG.error("Failed to get logical switch ref for vlan binding {} {} ", path, src);
+                    }
                     VlanBindingsBuilder vlanBindingsBuilder = new VlanBindingsBuilder(vlanBindings);
                     vlanBindingsBuilder.setLogicalSwitchRef(
                             HwvtepHAUtil.convertLogicalSwitchRef(vlanBindings.getLogicalSwitchRef(), path));
@@ -81,7 +88,7 @@ public class TerminationPointCmd extends MergeCommand<TerminationPoint, NodeBuil
                 }).collect(Collectors.toList()));
         }
 
-        tpBuilder.addAugmentation(HwvtepPhysicalPortAugmentation.class, tpAugmentationBuilder.build());
+        tpBuilder.addAugmentation(tpAugmentationBuilder.build());
         return tpBuilder.build();
     }