mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code Activity

Add address-purge attribute to disable purging of addresses on an

Browse Source 
interface.

Ticket: CM-3785
Reviewed By:
Testing Done: Tested disabling purging of existing addresses on an
interface with 'address-purge no'.

This helps in cases where some other daemon wants to manage ip addresses
on this interface
This commit is contained in:
Roopa Prabhu
2014-11-11 21:08:38 -08:00
parent 72213d5a2d
commit 394e68b526
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
addons/address.py
View File

@@ -50,7 +50,15 @@ class address(moduleBase):
'example': ['hwaddress 44:38:39:00:27:b8']}, 'example': ['hwaddress 44:38:39:00:27:b8']},
'alias' : 'alias' :
{ 'help': 'description/alias', { 'help': 'description/alias',
'example' : ['alias testnetwork']}}} 'example' : ['alias testnetwork']},
'address-purge' :
{ 'help': 'purge existing addresses. By default ' +
'any existing ip addresses on an interface are ' +
'purged to match persistant addresses in the ' +
'interfaces file. Set this attribute to \'no\'' +
'if you want to preserve existing addresses',
'default' : 'yes',
'example' : ['address-purge yes/no']}}}
def __init__(self, *args, **kargs): def __init__(self, *args, **kargs):
moduleBase.__init__(self, *args, **kargs) moduleBase.__init__(self, *args, **kargs)
@@ -72,6 +80,9 @@ class address(moduleBase):
vlan) vlan)
def _inet_address_config(self, ifaceobj): def _inet_address_config(self, ifaceobj):
purge_addresses = ifaceobj.get_attr_value_first('address-purge')
if not purge_addresses:
purge_addresses = 'yes'
newaddrs = [] newaddrs = []
addrs = ifaceobj.get_attr_value('address') addrs = ifaceobj.get_attr_value('address')
if addrs: if addrs:
@@ -89,7 +100,9 @@ class address(moduleBase):
else: else:
newaddrs.append(addr) newaddrs.append(addr)
if not self.PERFMODE and not (ifaceobj.flags & iface.HAS_SIBLINGS): if (not self.PERFMODE and
not (ifaceobj.flags & iface.HAS_SIBLINGS) and
purge_addresses == 'yes'):
# if perfmode is not set and also if iface has no sibling # if perfmode is not set and also if iface has no sibling
# objects, purge addresses that are not present in the new # objects, purge addresses that are not present in the new
# config # config