openstack/os-net-config
Code Issues Proposed changes

ifcfg: Exclude ifcfg-lo from cleanup

Browse Source 
This interface should always exist... we don't want to clean
it up.
This commit is contained in:
Dan Prince
2014-08-15 09:53:58 -04:00
parent 79c82ffcf8
commit 2d3af95651
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
os_net_config/impl_ifcfg.py
View File

@@ -238,11 +238,13 @@ class IfcfgNetConfig(os_net_config.NetConfig):
if cleanup:
for ifcfg_file in glob.iglob(cleanup_pattern()):
if ifcfg_file not in all_file_names:
interface_name = ifcfg_file[37:]
logger.info('cleaning up interface: %s' % interface_name)
processutils.execute('/sbin/ifdown', interface_name,
check_exit_code=False)
os.remove(ifcfg_file)
interface_name = ifcfg_file[len(cleanup_pattern()) - 1:]
if interface_name != 'lo':
logger.info('cleaning up interface: %s' %
interface_name)
processutils.execute('/sbin/ifdown', interface_name,
check_exit_code=False)
os.remove(ifcfg_file)
for interface in restart_interfaces:
logger.info('running ifdown on interface: %s' % interface)

14
os_net_config/tests/test_impl_ifcfg.py
View File

@@ -221,7 +221,7 @@ class TestIfcfgNetConfigApply(base.TestCase):
self.temp_ifcfg_file = tempfile.NamedTemporaryFile()
self.temp_route_file = tempfile.NamedTemporaryFile()
self.temp_bridge_file = tempfile.NamedTemporaryFile()
self.temp_cleanup_file = tempfile.NamedTemporaryFile()
self.temp_cleanup_file = tempfile.NamedTemporaryFile(delete=False)
def test_ifcfg_path(name):
return self.temp_ifcfg_file.name
@@ -294,3 +294,15 @@ class TestIfcfgNetConfigApply(base.TestCase):
def test_cleanup(self):
self.provider.apply(cleanup=True)
self.assertTrue(not os.path.exists(self.temp_cleanup_file.name))
def test_cleanup_not_loopback(self):
tmp_lo_file = '%s-lo' % self.temp_cleanup_file.name
utils.write_config(tmp_lo_file, 'foo')
def test_cleanup_pattern():
return '%s-*' % self.temp_cleanup_file.name
self.stubs.Set(impl_ifcfg, 'cleanup_pattern', test_cleanup_pattern)
self.provider.apply(cleanup=True)
self.assertTrue(os.path.exists(tmp_lo_file))
os.remove(tmp_lo_file)