From 84fab6035bb4943205b30c619863bfed304877fe Mon Sep 17 00:00:00 2001
From: David Goldberg <gdavid@hpe.com>
Date: Wed, 28 Dec 2016 13:15:41 +0200
Subject: [PATCH] change wait time to 10

Change-Id: I79eec81bb61c1452da1840e7b4ac0b565fe78afd
Signed-off-by: David Goldberg <gdavid@hpe.com>
---
 .../unimgr/mef/netvirt/IpvcListener.java      | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/netvirt/src/main/java/org/opendaylight/unimgr/mef/netvirt/IpvcListener.java b/netvirt/src/main/java/org/opendaylight/unimgr/mef/netvirt/IpvcListener.java
index 69f39467..e696b749 100644
--- a/netvirt/src/main/java/org/opendaylight/unimgr/mef/netvirt/IpvcListener.java
+++ b/netvirt/src/main/java/org/opendaylight/unimgr/mef/netvirt/IpvcListener.java
@@ -111,8 +111,8 @@ public class IpvcListener extends UnimgrDataTreeChangeListener<Ipvc> {
                 MdsalUtils.commitTransaction(tx);
 
                 InstanceIdentifier<VpnInstance> vpnId = NetvirtVpnUtils.getVpnInstanceToVpnIdIdentifier(vpnName);
-                DataWaitListener<VpnInstance> vpnInstanceWaiter = new DataWaitListener<VpnInstance>(dataBroker, vpnId,
-                        5, LogicalDatastoreType.CONFIGURATION, vpn -> vpn.getVrfId());
+                DataWaitListener<VpnInstance> vpnInstanceWaiter = new DataWaitListener<>(dataBroker, vpnId, 10,
+                        LogicalDatastoreType.CONFIGURATION, vpn -> vpn.getVrfId());
                 if (!vpnInstanceWaiter.waitForData()) {
                     String errorMessage = String.format("Fail to wait for vrfId for vpn %s", vpnName);
                     Log.error(errorMessage);
@@ -213,7 +213,7 @@ public class IpvcListener extends UnimgrDataTreeChangeListener<Ipvc> {
             String vpnName = operIpvcVpn.getVpnId();
             InstanceIdentifier<VpnInstance> vpnId = NetvirtVpnUtils.getVpnInstanceToVpnIdIdentifier(vpnName);
             @SuppressWarnings("resource")
-            DataWaitListener<VpnInstance> vpnInstanceWaiter = new DataWaitListener<VpnInstance>(dataBroker, vpnId, 5,
+            DataWaitListener<VpnInstance> vpnInstanceWaiter = new DataWaitListener<>(dataBroker, vpnId, 10,
                     LogicalDatastoreType.CONFIGURATION, vpn -> vpn.getVrfId());
             if (!vpnInstanceWaiter.waitForData()) {
                 String errorMessage = String.format("Fail to wait for vrfId for vpn %s", vpnName);
@@ -233,14 +233,14 @@ public class IpvcListener extends UnimgrDataTreeChangeListener<Ipvc> {
                 uniToRemove.removeAll(updateUni);
                 removeUnis(ipvcId, operIpvcVpn, uniToRemove, txRemove);
                 MdsalUtils.commitTransaction(txRemove);
+            }
+            List<Uni> uniToCreate = new ArrayList<>(updateUni);
+            uniToCreate.removeAll(originalUni);
 
-                List<Uni> uniToCreate = new ArrayList<>(updateUni);
-                uniToCreate.removeAll(originalUni);
-                for (Uni uni : uniToCreate) {
-                    createInterfaces(vpnName, uni, ipvcId, rd);
-                }
-                createUnis(ipvcId, uniToCreate);
+            for (Uni uni : uniToCreate) {
+                createInterfaces(vpnName, uni, ipvcId, rd);
             }
+            createUnis(ipvcId, uniToCreate);
 
         } catch (final Exception e) {
             Log.error("Update ipvc failed !", e);
@@ -287,8 +287,8 @@ public class IpvcListener extends UnimgrDataTreeChangeListener<Ipvc> {
 
         InstanceIdentifier<VpnInstanceOpDataEntry> vpnId = NetvirtVpnUtils.getVpnInstanceOpDataIdentifier(rd);
         @SuppressWarnings("resource")
-        DataWaitListener<VpnInstanceOpDataEntry> vpnInstanceWaiter = new DataWaitListener<VpnInstanceOpDataEntry>(
-                dataBroker, vpnId, 5, LogicalDatastoreType.OPERATIONAL, vpn -> vpn.getVpnToDpnList());
+        DataWaitListener<VpnInstanceOpDataEntry> vpnInstanceWaiter = new DataWaitListener<>(dataBroker, vpnId, 10,
+                LogicalDatastoreType.OPERATIONAL, vpn -> vpn.getVpnToDpnList());
         if (!vpnInstanceWaiter.waitForData()) {
             String errorMessage = String.format("Fail to wait for vpn to dpn list %s", vpnName);
             Log.error(errorMessage);
-- 
2.36.6