From 2cec760601a6e85ca8e0b6a30c173196a97a777a Mon Sep 17 00:00:00 2001
From: Kim <kim.sidney@gmail.com>
Date: Mon, 9 Aug 2021 16:06:18 +0200
Subject: VTI: T1501: VPN Commit Errors (#45)

Add a loop to check for the dhcp ip address so the commit will not fail if
the interface was configured in the same config session as the vti interface.
---
 scripts/vyatta-vti-config.pl | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scripts/vyatta-vti-config.pl b/scripts/vyatta-vti-config.pl
index 00685d5..3dcaa63 100755
--- a/scripts/vyatta-vti-config.pl
+++ b/scripts/vyatta-vti-config.pl
@@ -48,6 +48,8 @@ my $intfName="";
 my $conn_name="";
 my $action="";
 my $checkref="";
+my $dhcp_wait_attempts = 3;
+my $dhcp_wait_sleep = 1;
 
 GetOptions(
     "updown" => \$updown,
@@ -355,6 +357,13 @@ sub get_dhcp_addr {
         if (!(Vyatta::Misc::is_dhcp_enabled($dhcp_iface,0)));
     my @dhcp_addr = Vyatta::Misc::getIP($dhcp_iface,4);
     my $addr = pop(@dhcp_addr);
+    my $count = 0;
+    while (!defined($addr) and $count < $dhcp_wait_attempts){
+        @dhcp_addr = Vyatta::Misc::getIP($dhcp_iface,4);
+        $addr = pop(@dhcp_addr);
+        $count++;
+        sleep($dhcp_wait_sleep);
+    }
     if (!defined($addr)){
         $addr = '';
         return $addr;
-- 
cgit v1.2.3