def upgrade_networks(*args):
"""
upgrade-networks
Upgrade networks configuration to up-to-date format.
"""
netupgrade.upgrade()
def upgrade_networks(*args):
"""
upgrade-networks
Upgrade networks configuration to up-to-date format.
"""
netupgrade.upgrade()
def test_upgrade_volatile_running_config(self):
with create_running_config(volatile=True) as vol_rconfig:
with create_running_config(volatile=False) as pers_rconfig:
vol_rconfig.save()
netupgrade.upgrade()
self.assertFalse(vol_rconfig.config_exists())
self.assertTrue(pers_rconfig.config_exists())
def test_create_unified_config(self, mockRConfig, mockPConfig, mockKConfig,
mock_owned_device):
rconfig = mockRConfig.return_value
pconfig = mockPConfig.return_value
kconfig = mockKConfig.return_value
self._setup_missing_unified_config(kconfig, pconfig, rconfig)
netupgrade.upgrade()
self._assert_unified_config_created(kconfig, rconfig, mockRConfig)
def test_create_unified_config(
self, mockRConfig, mockPConfig, mockKConfig, mock_owned_device):
rconfig = mockRConfig.return_value
pconfig = mockPConfig.return_value
kconfig = mockKConfig.return_value
self._setup_missing_unified_config(kconfig, pconfig, rconfig)
netupgrade.upgrade()
self._assert_unified_config_created(kconfig, rconfig, mockRConfig)
def _assert_upgrade_config(
self, raw_config, normalized_config, rconfig, pconfig):
rconfig.networks = raw_config
pconfig.networks = raw_config
netupgrade.upgrade()
self.assertEqual(normalized_config, rconfig.networks)
self.assertEqual(normalized_config, pconfig.networks)
if normalized_config:
rconfig.save.assert_called_once_with()
pconfig.save.assert_called_once_with()
def _assert_upgrade_config(
self, raw_config, normalized_config, rconfig, pconfig):
rconfig.networks = raw_config
pconfig.networks = raw_config
netupgrade.upgrade()
self.assertEqual(normalized_config, rconfig.networks)
self.assertEqual(normalized_config, pconfig.networks)
if normalized_config:
rconfig.save.assert_called_once_with()
pconfig.save.assert_called_once_with()
def test_create_unified_config_in_ifcfg_persistence_mode(
self, mockRConfig, mockPConfig, mockKConfig, mock_owned_device):
rconfig = mockRConfig.return_value
pconfig = mockPConfig.return_value
kconfig = mockKConfig.return_value
self._setup_missing_unified_config(pconfig, rconfig)
kconfig.networks = {'netname': {}}
kconfig.bonds = {'bondname': {}}
netupgrade.upgrade()
self._assert_unified_config_created(kconfig, rconfig, mockRConfig)
def test_upgrade_volatile_running_config(self):
with namedTemporaryDir() as pdir, namedTemporaryDir() as vdir:
with mock.patch.object(netconf, 'CONF_RUN_DIR', pdir),\
mock.patch.object(netconf, 'CONF_VOLATILE_RUN_DIR', vdir):
vol_rconfig = netconf.RunningConfig(volatile=True)
vol_rconfig.save()
netupgrade.upgrade()
pers_rconfig = netconf.RunningConfig()
self.assertFalse(vol_rconfig.config_exists())
self.assertTrue(pers_rconfig.config_exists())
def test_upgrade_volatile_running_config(self):
with namedTemporaryDir() as pdir, namedTemporaryDir() as vdir:
with mock.patch.object(netconf, 'CONF_RUN_DIR', pdir),\
mock.patch.object(netconf, 'CONF_VOLATILE_RUN_DIR', vdir):
vol_rconfig = netconf.RunningConfig(volatile=True)
vol_rconfig.save()
netupgrade.upgrade()
pers_rconfig = netconf.RunningConfig()
self.assertFalse(vol_rconfig.config_exists())
self.assertTrue(pers_rconfig.config_exists())
def _assert_upgrade_config(self, raw_config, normalized_config, rconfig,
pconfig):
rconfig.networks = raw_config
pconfig.networks = raw_config
rconfig.netconf_path = ''
pconfig.netconf_path = ''
netupgrade.upgrade()
assert normalized_config == rconfig.networks
assert normalized_config == pconfig.networks
if normalized_config:
rconfig.save.assert_called_once_with()
pconfig.save.assert_called_once_with()
def test_create_unified_config_in_unified_persistence_mode(
self, mockRConfig, mockPConfig, mockKConfig, mock_owned_device):
rconfig = mockRConfig.return_value
pconfig = mockPConfig.return_value
kconfig = mockKConfig.return_value
self._setup_missing_unified_config(pconfig, rconfig)
# If the unified config files are missing and VDSM is in unified mode
# then there are no networks, but there may be some external bonds.
kconfig.networks = {}
kconfig.bonds = {'extbond': {}}
netupgrade.upgrade()
# External bonds should not appear in the unified config (rconfig).
kconfig.bonds = {}
self._assert_unified_config_created(kconfig, rconfig, mockRConfig)
