Bug 8960: port information for 1 dpn is missing in subnet-op-data and

[netvirt.git] / vpnservice / vpnmanager / vpnmanager-impl / src / main / java / org / opendaylight / netvirt / vpnmanager / SubnetOpDpnManager.java

diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetOpDpnManager.java b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetOpDpnManager.java
index f2ae403fa610a0bb2e91a27982d14e49023ddd56..7a8a491cb58f1d0e4af91a3c8fd1fa4479bc2dc9 100644 (file)
--- a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetOpDpnManager.java
+++ b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetOpDpnManager.java
@@ -146,14 +146,14 @@ public class SubnetOpDpnManager {
                 portOpBuilder =
                     new PortOpDataEntryBuilder().setKey(new PortOpDataEntryKey(intfName)).setPortId(intfName);
                 portOpBuilder.setSubnetId(subnetId);
-                portOpBuilder.setDpnId(dpnId);
-                portOpEntry = portOpBuilder.build();
             } else {
                 portOpBuilder = new PortOpDataEntryBuilder(optionalPortOp.get());
                 portOpBuilder.setSubnetId(subnetId);
+            }
+            if (dpnId != null && !dpnId.equals(BigInteger.ZERO)) {
                 portOpBuilder.setDpnId(dpnId);
-                portOpEntry = portOpBuilder.build();
             }
+            portOpEntry = portOpBuilder.build();
             SingleTransactionDataBroker.syncWrite(broker, LogicalDatastoreType.OPERATIONAL, portOpIdentifier,
                 portOpEntry);
             LOG.info("addPortOpDataEntry: Created PortOpData entry for port {} with DPNId {} intfName {}",