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

Fix a few minor ifquery check failures

Browse Source 
Ticket: CM-3346
Reviewed By:
Testing Done: Tested ifupdown2 sanity and query check failures.
This commit is contained in:
Roopa Prabhu
2014-11-19 17:25:26 -08:00
parent 4c39c7b84a
commit 16d854b461
11 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
addons/dhcp.py
View File

@@ -61,19 +61,19 @@ class dhcp(moduleBase):
if ifaceobj.addr_family != 'inet':
ifaceobjcurr.status = ifaceStatus.ERROR
ifaceobjcurr.addr_method = 'dhcp'
ifaceobjcurr.status = ifaceStatus.SUCCESS
elif self.dhclientcmd.is_running6(ifaceobjcurr.name):
ifaceobjcurr.addr_family = 'inet6'
if ifaceobj.addr_family != 'inet6':
ifaceobjcurr.status = ifaceStatus.ERROR
ifaceobjcurr.addr_method = 'dhcp'
ifaceobjcurr.status = ifaceStatus.SUCCESS
else:
ifaceobjcurr.addr_family = None
ifaceobjcurr.status = ifaceStatus.ERROR
def _query_running(self, ifaceobjrunning):
if not self.ipcmd.link_exists(ifaceobjrunning.name):
self.logger.debug('iface %s not found' %ifaceobjrunning.name)
ifaceobjrunning.status = ifaceStatus.NOTFOUND
return
if self.dhclientcmd.is_running(ifaceobjrunning.name):
ifaceobjrunning.addr_family = 'inet'