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

cleanup ifquery for interfaces that were configured but got deleted or

went away

Ticket: CM-1438
Reviewed By:
Testing Done:
This commit is contained in:
roopa
2013-11-13 23:00:02 -08:00
parent 3e8ee54f30
commit 10720a537d
3 changed files with 15 additions and 8 deletions

View File

@@ -284,16 +284,17 @@ class ifupdownMain():
if dlist is None:
dlist = self.get_dependents(ifaceobj, op)
else:
# we already have dependency info for this interface
continue
self.preprocess_dependency_list(dlist, op)
ifaceobj.set_dependents(dlist)
if dlist is not None:
self.preprocess_dependency_list(dlist, op)
ifaceobj.set_dependents(dlist)
if dependency_graph.get(i) is None:
dependency_graph[i] = dlist
self.generate_dependency_info(dlist, dependency_graph, op)
if dlist is not None:
self.generate_dependency_info(dlist, dependency_graph, op)
def is_valid_state_transition(self, ifname, to_be_state):
return self.statemanager.is_valid_state_transition(ifname,
@@ -688,9 +689,13 @@ class ifupdownMain():
ret = 0
for i in ifacenames:
ifaceobj = self.get_ifaceobjcurr(i)
ifaceobj.dump_pretty(self.logger)
if ifaceobj.get_status() == ifaceStatus.ERROR:
if ifaceobj.get_status() == ifaceStatus.NOTFOUND:
print 'iface %s' %ifaceobj.get_name() + ' (not found)'
ret = 1
continue
elif ifaceobj.get_status() == ifaceStatus.ERROR:
ret = 1
ifaceobj.dump_pretty(self.logger)
return ret