[master] Porting #52670 to master again

changelog/49078.fixed

@@ -0,0 +1 @@
+Use ip command instead of ifup/ifdown.

salt/modules/debian_ip.py

@@ -6,7 +6,6 @@
 * http://www.debian.org/doc/manuals/debian-reference/ch05.en.html
 """
 
-# Import python libs
 
 import functools
 import logging
@@ -15,11 +14,8 @@
 import re
 import time
 
-# Import third party libs
 import jinja2
 import jinja2.exceptions
-
-# Import salt libs
 import salt.utils.dns
 import salt.utils.files
 import salt.utils.odict
@@ -1775,7 +1771,8 @@ def down(iface, iface_type):
     # Slave devices are controlled by the master.
     # Source 'interfaces' aren't brought down.
     if iface_type not in ["slave", "source"]:
-        return __salt__["cmd.run"](["ifdown", iface])
+        cmd = ["ip", "link", "set", iface, "down"]
+        return __salt__["cmd.run"](cmd, python_shell=False)
     return None
 
 
@@ -1836,7 +1833,8 @@ def up(iface, iface_type):  # pylint: disable=C0103
     # Slave devices are controlled by the master.
     # Source 'interfaces' aren't brought up.
     if iface_type not in ("slave", "source"):
-        return __salt__["cmd.run"](["ifup", iface])
+        cmd = ["ip", "link", "set", iface, "up"]
+        return __salt__["cmd.run"](cmd, python_shell=False)
     return None
 
 

tests/unit/modules/test_debian_ip.py

@@ -6,13 +6,11 @@
 
 import jinja2.exceptions
 import salt.modules.debian_ip as debian_ip
-
-# Import Salt Testing Libs
 import salt.utils.files
 import salt.utils.platform
 from tests.support.helpers import slowTest
 from tests.support.mixins import LoaderModuleMockMixin
-from tests.support.mock import MagicMock, patch
+from tests.support.mock import MagicMock, patch, sentinel
 from tests.support.unit import TestCase, skipIf
 
 try:
@@ -917,9 +915,12 @@ def test_down(self):
         """
         self.assertEqual(debian_ip.down("eth0", "slave"), None)
 
-        mock = MagicMock(return_value="Salt")
+        mock = MagicMock(return_value=sentinel.ret)
         with patch.dict(debian_ip.__salt__, {"cmd.run": mock}):
-            self.assertEqual(debian_ip.down("eth0", "eth"), "Salt")
+            self.assertEqual(debian_ip.down("eth0", "eth"), sentinel.ret)
+            self.assertEqual(
+                mock.call_args[0], (["ip", "link", "set", "eth0", "down"],)
+            )
 
     # 'get_bond' function tests: 1
 
@@ -1031,9 +1032,10 @@ def test_up(self):
         """
         self.assertEqual(debian_ip.down("eth0", "slave"), None)
 
-        mock = MagicMock(return_value="Salt")
+        mock = MagicMock(return_value=sentinel.ret)
         with patch.dict(debian_ip.__salt__, {"cmd.run": mock}):
-            self.assertEqual(debian_ip.up("eth0", "eth"), "Salt")
+            self.assertEqual(debian_ip.up("eth0", "eth"), sentinel.ret)
+            self.assertEqual(mock.call_args[0], (["ip", "link", "set", "eth0", "up"],))
 
     # 'get_network_settings' function tests: 1