From b9c438a6758b0511bea108af952a6492ca845737 Mon Sep 17 00:00:00 2001
From: Joe Groocock <me@frebib.net>
Date: Sun, 14 May 2023 11:53:13 +0000
Subject: Revert "veth: T3829: Allow moving veth into netns"

netns management for any Vyos interfaces doesn't work past the initial
creation, because Vyos always tries to recreate it/move it into the
netns even though it already exists. Until this is fixed, don't let
anyone even attempt to use this:

    set interfaces virtual-ethernet veth10 peer-name 'veth100'
    set interfaces virtual-ethernet veth100 netns 'ns01'
    set interfaces virtual-ethernet veth100 peer-name 'veth10'
    set netns name ns01
    commit

    vyos@r14# sudo ip netns exec ns01 ip link show
    1: lo: <LOOPBACK> mtu 65536 qdisc noop state DOWN mode DEFAULT group default qlen 1000
        link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
    12: veth100@if13: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000
        link/ether ee:8f:0b:bd:a2:f8 brd ff:ff:ff:ff:ff:ff link-netnsid 0
    [edit]
    vyos@r14#

    set interfaces virtual-ethernet veth100 description MyNetns
    commit

    Traceback (most recent call last):
      File "/usr/libexec/vyos/conf_mode/interfaces-virtual-ethernet.py", line 111, in <module>
        apply(c)
      File "/usr/libexec/vyos/conf_mode/interfaces-virtual-ethernet.py", line 101, in apply
        p.update(veth)
      File "/usr/lib/python3/dist-packages/vyos/ifconfig/interface.py", line 1413, in update
        self.set_netns(config.get('netns', ''))
      File "/usr/lib/python3/dist-packages/vyos/ifconfig/interface.py", line 552, in set_netns
        self.set_interface('netns', netns)
      File "/usr/lib/python3/dist-packages/vyos/ifconfig/control.py", line 183, in set_interface
        return self._set_command(self.config, name, value)
               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
      File "/usr/lib/python3/dist-packages/vyos/ifconfig/control.py", line 110, in _set_command
        return self._command_set[name].get('format', lambda _: _)(self._cmd(cmd))
                                                                  ^^^^^^^^^^^^^^
      File "/usr/lib/python3/dist-packages/vyos/ifconfig/control.py", line 52, in _cmd
        return cmd(command, self.debug)
               ^^^^^^^^^^^^^^^^^^^^^^^^
      File "/usr/lib/python3/dist-packages/vyos/util.py", line 161, in cmd
        raise OSError(code, feedback)
    PermissionError: [Errno 1] failed to run command: ip link set dev veth100 netns ns01
    returned:
    exit code: 1

    noteworthy:
    cmd 'ip link set dev veth100 netns ns01'
    returned (out):

    returned (err):
    Cannot find device "veth100"

This reverts commit f5cc8453860568351cd9b3b7a05d06e1462460e8.
---
 python/vyos/ifconfig/interface.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'python')

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
-- 
cgit v1.2.3