Merge "Fix IpNetnsCommand to execute without root_wrapper when no netns"

diff --cc neutron/agent/linux/ip_lib.py
Simple merge

diff --cc neutron/tests/unit/test_linux_ip_lib.py
index 2aaa90b63a40ed1d1f4ebc8c7767e749c517dfc0,874dfbaeec8fee281adb4158473ef9d887dc46d8..3bd7f2617ff660be6f6473c3d29b60c610c082ed
--- 1/neutron/tests/unit/test_linux_ip_lib.py
--- 2/neutron/tests/unit/test_linux_ip_lib.py
+++ b/neutron/tests/unit/test_linux_ip_lib.py
@@@ -822,11 -822,19 +822,20 @@@ class TestIpNetnsCommand(TestIPCmdBase)
              env = dict(FOO=1, BAR=2)
              self.netns_cmd.execute(['ip', 'link', 'list'], env)
              execute.assert_called_once_with(
 -                ['ip', 'netns', 'exec', 'ns', 'env', 'FOO=1', 'BAR=2',
 -                 'ip', 'link', 'list'],
 +                ['ip', 'netns', 'exec', 'ns', 'env'] +
 +                ['%s=%s' % (k, v) for k, v in env.items()] +
 +                ['ip', 'link', 'list'],
                  root_helper='sudo', check_exit_code=True)
  
+     def test_execute_nosudo_with_no_namespace(self):
+         with mock.patch('neutron.agent.linux.utils.execute') as execute:
+             self.parent.namespace = None
+             self.parent.root_helper = None
+             self.netns_cmd.execute(['test'])
+             execute.assert_called_once_with(['test'],
+                                             root_helper=None,
+                                             check_exit_code=True)
+ 
  
  class TestDeviceExists(base.BaseTestCase):
      def test_device_exists(self):