summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-10-16 07:46:47 +0200
committerChristian Poessinger <christian@poessinger.com>2019-10-16 07:46:47 +0200
commit71a2b2502a2e44d45fa34b87b7fff85ee1975ba0 (patch)
tree64e6a28716f1d47414e8be94523a645b276286fc
parent50acd442ade9a4e447269eaf94ce14d354af8d0c (diff)
downloadvyos-1x-71a2b2502a2e44d45fa34b87b7fff85ee1975ba0.tar.gz
vyos-1x-71a2b2502a2e44d45fa34b87b7fff85ee1975ba0.zip
Revert "Python/ifconfig: T1712: wait when changing interface state"
This reverts commit 1257d7851866d42287018b38dd871f279b87286a. It will delay network interface configuration everywhere when e.g. no network cable is plugged in. We should find the root cause why DHCPd sometimes did not start.
-rw-r--r--python/vyos/ifconfig.py19
1 files changed, 1 insertions, 18 deletions
diff --git a/python/vyos/ifconfig.py b/python/vyos/ifconfig.py
index 3225971ef..0692f77f3 100644
--- a/python/vyos/ifconfig.py
+++ b/python/vyos/ifconfig.py
@@ -71,7 +71,6 @@ class Interface:
>>> i = Interface('eth0')
"""
self._ifname = str(ifname)
- self._statechange_wait = True
if not os.path.exists('/sys/class/net/{}'.format(ifname)) and not type:
raise Exception('interface "{}" not found'.format(self._ifname))
@@ -320,22 +319,7 @@ class Interface:
# Assemble command executed on system. Unfortunately there is no way
# to up/down an interface via sysfs
cmd = 'ip link set dev {} {}'.format(self._ifname, state)
- tmp = self._cmd(cmd)
-
- if self._statechange_wait:
- # better safe then sorry - wait until the interface is really up
- # but only for a given period of time to avoid potential deadlocks!
- cnt = 0
- while self.get_state() != state:
- cnt += 1
- if cnt == 50:
- print('Interface {} could not be brought up in time ...'.format(self._ifname))
- break
-
- # sleep 250ms
- sleep(0.250)
-
- return tmp
+ return self._cmd(cmd)
def set_proxy_arp(self, enable):
"""
@@ -1408,7 +1392,6 @@ class WireGuardIf(Interface):
def __init__(self, ifname):
super().__init__(ifname, type='wireguard')
- self._statechange_wait = False
self.config = {
'port': 0,