Commit 1177d70e authored by Guido Trotter's avatar Guido Trotter
Browse files

Remove bridge NIC slot

This has been deprecated and unused since 2.1.
Signed-off-by: default avatarGuido Trotter <>
Reviewed-by: default avatarMichael Hanselmann <>
parent 4b784cf8
......@@ -389,7 +389,7 @@ class ConfigData(ConfigObject):
class NIC(ConfigObject):
"""Config object representing a network card."""
__slots__ = ["mac", "ip", "bridge", "nicparams"]
__slots__ = ["mac", "ip", "nicparams"]
def CheckParameterSyntax(cls, nicparams):
......@@ -409,21 +409,6 @@ class NIC(ConfigObject):
err = "Missing bridged nic link"
raise errors.ConfigurationError(err)
def UpgradeConfig(self):
"""Fill defaults for missing configuration values.
if self.nicparams is None:
self.nicparams = {}
if self.bridge is not None:
self.nicparams[constants.NIC_MODE] = constants.NIC_MODE_BRIDGED
self.nicparams[constants.NIC_LINK] = self.bridge
# bridge is no longer used it 2.1. The slot is left there to support
# upgrading, but can be removed once upgrades to the current version
# straight from 2.0 are deprecated.
if self.bridge is not None:
self.bridge = None
class Disk(ConfigObject):
"""Config object representing a block device."""
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment