diff --git a/neutron/agent/linux/ip_lib.py b/neutron/agent/linux/ip_lib.py
index c0ce718348a..863a42d2880 100644
--- a/neutron/agent/linux/ip_lib.py
+++ b/neutron/agent/linux/ip_lib.py
@@ -456,6 +456,8 @@ class IpLinkCommand(IpDeviceCommandBase):
         privileged.set_link_attribute(
             self.name, self._parent.namespace, net_ns_fd=namespace)
         self._parent.namespace = namespace
+        common_utils.wait_until_true(lambda: self.exists, timeout=5,
+                                     sleep=0.5)
 
     def set_name(self, name):
         privileged.set_link_attribute(
diff --git a/neutron/tests/functional/agent/linux/test_ip_lib.py b/neutron/tests/functional/agent/linux/test_ip_lib.py
index 8fafefe7741..e8175a3f463 100644
--- a/neutron/tests/functional/agent/linux/test_ip_lib.py
+++ b/neutron/tests/functional/agent/linux/test_ip_lib.py
@@ -1100,3 +1100,14 @@ class GetDevicesWithIpTestCase(functional_base.BaseSudoTestCase):
             ip_addresses = self._remove_loopback_interface(ip_addresses)
             ip_addresses = self._remove_ipv6_scope_link(ip_addresses)
             self.assertEqual(0, len(ip_addresses))
+
+
+class IpLinkCommandTestCase(IpLibTestFramework):
+
+    def test_set_netns(self):
+        device_name = ('int_' + uuidutils.generate_uuid())[
+                      :constants.DEVICE_NAME_MAX_LEN]
+        device = ip_lib.IPDevice(device_name, kind='dummy')
+        device.link.create()
+        namespace = self.useFixture(net_helpers.NamespaceFixture())
+        device.link.set_netns(namespace.name)
diff --git a/neutron/tests/unit/agent/linux/test_ip_lib.py b/neutron/tests/unit/agent/linux/test_ip_lib.py
index eb6b51baa76..b9c44cb4916 100644
--- a/neutron/tests/unit/agent/linux/test_ip_lib.py
+++ b/neutron/tests/unit/agent/linux/test_ip_lib.py
@@ -657,8 +657,9 @@ class TestIpLinkCommand(TestIPCmdBase):
         set_link_attribute.assert_called_once_with(
             self.parent.name, self.parent.namespace, state='down')
 
+    @mock.patch.object(priv_lib, 'interface_exists', return_value=True)
     @mock.patch.object(priv_lib, 'set_link_attribute')
-    def test_set_netns(self, set_link_attribute):
+    def test_set_netns(self, set_link_attribute, *args):
         original_namespace = self.parent.namespace
         self.link_cmd.set_netns('foo')
         set_link_attribute.assert_called_once_with(