summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-05-14 16:13:40 +0200
committerGitHub <noreply@github.com>2023-05-14 16:13:40 +0200
commit9e287778e073ee64333120bb58bca08727846aea (patch)
treed7383b41d70fc8bee2282614e075cf6d7a959791
parentaea89228d8c14ae0a11c5506a9c636200be97cfb (diff)
parentb9c438a6758b0511bea108af952a6492ca845737 (diff)
downloadvyos-1x-9e287778e073ee64333120bb58bca08727846aea.tar.gz
vyos-1x-9e287778e073ee64333120bb58bca08727846aea.zip
Merge pull request #2007 from frebib/veth-netns-revert
Revert "veth: T3829: Allow moving veth into netns"
-rw-r--r--interface-definitions/interfaces-virtual-ethernet.xml.in1
-rw-r--r--python/vyos/ifconfig/interface.py2
2 files changed, 1 insertions, 2 deletions
diff --git a/interface-definitions/interfaces-virtual-ethernet.xml.in b/interface-definitions/interfaces-virtual-ethernet.xml.in
index a5702bfc0..864f658da 100644
--- a/interface-definitions/interfaces-virtual-ethernet.xml.in
+++ b/interface-definitions/interfaces-virtual-ethernet.xml.in
@@ -22,7 +22,6 @@
#include <include/interface/dhcpv6-options.xml.i>
#include <include/interface/disable.xml.i>
#include <include/interface/vrf.xml.i>
- #include <include/interface/netns.xml.i>
<leafNode name="peer-name">
<properties>
<help>Virtual ethernet peer interface name</help>
diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py
index 2f1d5eb96..f62b9f7d2 100644
--- a/python/vyos/ifconfig/interface.py
+++ b/python/vyos/ifconfig/interface.py
@@ -532,7 +532,7 @@ class Interface(Control):
return None
# As a PoC we only allow 'dummy' interfaces
- if not ('dum' in self.ifname or 'veth' in self.ifname):
+ if 'dum' not in self.ifname:
return None
# Check if interface realy exists in namespace