x/vmware-nsx
Code Issues Proposed changes

Merge "Don't use root to list namespaces"

Browse Source
This commit is contained in:
Jenkins 2014-03-20 05:20:19 +00:00 committed by Gerrit Code Review
commit 4e1a15c436
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/agent/linux/ip_lib.py
View File

@ -466,7 +466,7 @@ class IpNetnsCommand(IpCommandBase):
check_exit_code=check_exit_code) check_exit_code=check_exit_code)
def exists(self, name): def exists(self, name):
output = self._as_root('list', options='o', use_root_namespace=True) output = self._run('list', options='o')
for line in output.split('\n'): for line in output.split('\n'):
if name == line.strip(): if name == line.strip():

8
neutron/tests/unit/test_linux_ip_lib.py
View File

@ -713,17 +713,17 @@ class TestIpNetnsCommand(TestIPCmdBase):
def test_namespace_exists(self): def test_namespace_exists(self):
retval = '\n'.join(NETNS_SAMPLE) retval = '\n'.join(NETNS_SAMPLE)
self.parent._as_root.return_value = retval self.parent._run.return_value = retval
self.assertTrue( self.assertTrue(
self.netns_cmd.exists('bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb')) self.netns_cmd.exists('bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb'))
self._assert_sudo('o', ('list',), force_root_namespace=True) self._assert_call('o', ('list',))
def test_namespace_doest_not_exist(self): def test_namespace_doest_not_exist(self):
retval = '\n'.join(NETNS_SAMPLE) retval = '\n'.join(NETNS_SAMPLE)
self.parent._as_root.return_value = retval self.parent._run.return_value = retval
self.assertFalse( self.assertFalse(
self.netns_cmd.exists('bbbbbbbb-1111-2222-3333-bbbbbbbbbbbb')) self.netns_cmd.exists('bbbbbbbb-1111-2222-3333-bbbbbbbbbbbb'))
self._assert_sudo('o', ('list',), force_root_namespace=True) self._assert_call('o', ('list',))
def test_execute(self): def test_execute(self):
self.parent.namespace = 'ns' self.parent.namespace = 'ns'