summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViacheslav Hletenko <v.gletenko@vyos.io>2025-01-29 13:31:10 +0000
committerViacheslav Hletenko <v.gletenko@vyos.io>2025-01-29 13:31:10 +0000
commitf5aaef311484f90d87f46d5a5739897e560ceb40 (patch)
tree6465f08c714755e6f9465f2e4ae030cec8cc7560
parent2d5462f4a024469629f6fb2c5286e7f45d6a6df1 (diff)
downloadvyos-1x-f5aaef311484f90d87f46d5a5739897e560ceb40.tar.gz
vyos-1x-f5aaef311484f90d87f46d5a5739897e560ceb40.zip
Revert "warning: introduce a delay between add() and kernel_add()"
This reverts commit 405d3ee7ac909bbf458f522e6539a1f4eacdf7e6.
-rw-r--r--src/conf_mode/vpp_interfaces_bonding.py5
-rw-r--r--src/conf_mode/vpp_interfaces_geneve.py4
-rw-r--r--src/conf_mode/vpp_interfaces_gre.py4
-rw-r--r--src/conf_mode/vpp_interfaces_ipip.py4
-rw-r--r--src/conf_mode/vpp_interfaces_loopback.py4
-rw-r--r--src/conf_mode/vpp_interfaces_vxlan.py4
6 files changed, 0 insertions, 25 deletions
diff --git a/src/conf_mode/vpp_interfaces_bonding.py b/src/conf_mode/vpp_interfaces_bonding.py
index a93239d57..7ab1abb24 100644
--- a/src/conf_mode/vpp_interfaces_bonding.py
+++ b/src/conf_mode/vpp_interfaces_bonding.py
@@ -17,7 +17,6 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
import os
-import time
from vyos.config import Config
from vyos.configdict import leaf_node_changed
@@ -193,10 +192,6 @@ def apply(config):
state = 'up' if 'disable' not in config else 'down'
i = BondInterface(ifname, mode, lb, mac, kernel_interface, state)
- # Introduce a delay to address instability in the VPP API, which may fail to create the LCP
- # or establish a connection. This should be reviewed and resolved in future releases.
- time.sleep(2)
-
i.add()
# Add members to bond
if members:
diff --git a/src/conf_mode/vpp_interfaces_geneve.py b/src/conf_mode/vpp_interfaces_geneve.py
index 17e0f0cfb..a7e7ae8e5 100644
--- a/src/conf_mode/vpp_interfaces_geneve.py
+++ b/src/conf_mode/vpp_interfaces_geneve.py
@@ -17,7 +17,6 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
import os
-import time
from vyos import ConfigError
@@ -165,9 +164,6 @@ def apply(config):
# Add kernel-interface (LCP) if interface is not exist
if 'kernel_interface' in config and not is_interface(kernel_interface):
- # Introduce a delay to address instability in the VPP API, which may fail to create the LCP
- # or establish a connection. This should be reviewed and resolved in future releases.
- time.sleep(2)
i.kernel_add()
call_dependents()
diff --git a/src/conf_mode/vpp_interfaces_gre.py b/src/conf_mode/vpp_interfaces_gre.py
index c8e84f169..de7398248 100644
--- a/src/conf_mode/vpp_interfaces_gre.py
+++ b/src/conf_mode/vpp_interfaces_gre.py
@@ -17,7 +17,6 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
import os
-import time
from vyos import ConfigError
@@ -175,9 +174,6 @@ def apply(config):
# Add kernel-interface (LCP) if interface is not exist
if 'kernel_interface' in config and not is_interface(kernel_interface):
- # Introduce a delay to address instability in the VPP API, which may fail to create the LCP
- # or establish a connection. This should be reviewed and resolved in future releases.
- time.sleep(2)
i.kernel_add()
call_dependents()
diff --git a/src/conf_mode/vpp_interfaces_ipip.py b/src/conf_mode/vpp_interfaces_ipip.py
index 3b03f91cd..2428a9850 100644
--- a/src/conf_mode/vpp_interfaces_ipip.py
+++ b/src/conf_mode/vpp_interfaces_ipip.py
@@ -17,7 +17,6 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
import os
-import time
from vyos import ConfigError
@@ -164,9 +163,6 @@ def apply(config):
i.add()
if 'kernel_interface' in config:
- # Introduce a delay to address instability in the VPP API, which may fail to create the LCP
- # or establish a connection. This should be reviewed and resolved in future releases.
- time.sleep(2)
i.kernel_add()
call_dependents()
diff --git a/src/conf_mode/vpp_interfaces_loopback.py b/src/conf_mode/vpp_interfaces_loopback.py
index 6aa3fc850..f0bcdfb18 100644
--- a/src/conf_mode/vpp_interfaces_loopback.py
+++ b/src/conf_mode/vpp_interfaces_loopback.py
@@ -17,7 +17,6 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
import os
-import time
from vyos import ConfigError
@@ -136,9 +135,6 @@ def apply(config):
# Add kernel-interface (LCP) if interface is not exist
if 'kernel_interface' in config and not is_interface(kernel_interface):
- # Introduce a delay to address instability in the VPP API, which may fail to create the LCP
- # or establish a connection. This should be reviewed and resolved in future releases.
- time.sleep(2)
i.kernel_add()
call_dependents()
diff --git a/src/conf_mode/vpp_interfaces_vxlan.py b/src/conf_mode/vpp_interfaces_vxlan.py
index 81bc34bea..b94b39d6d 100644
--- a/src/conf_mode/vpp_interfaces_vxlan.py
+++ b/src/conf_mode/vpp_interfaces_vxlan.py
@@ -17,7 +17,6 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
import os
-import time
from vyos import ConfigError
@@ -171,9 +170,6 @@ def apply(config):
# Add kernel-interface (LCP) if interface is not exist
if 'kernel_interface' in config and not is_interface(kernel_interface):
- # Introduce a delay to address instability in the VPP API, which may fail to create the LCP
- # or establish a connection. This should be reviewed and resolved in future releases.
- time.sleep(2)
i.kernel_add()
call_dependents()