aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-14 12:36:55 +0000
committerGerrit Code Review <review@openstack.org>2016-06-14 12:36:55 +0000
commitf742dcbda0d92bee0278b4a1614d65f2ad5b1a78 (patch)
tree980d90641ac117e8d3eb2a8c48f4332784a5bc75
parent4d88e7f349f725704c707093c8b44d7409eae481 (diff)
parent5a6f63a1ad80e3218eb5e1c5098aa30694660339 (diff)
Merge "Add some debugging output to ordered_active_nics"
-rw-r--r--os_net_config/utils.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/os_net_config/utils.py b/os_net_config/utils.py
index 4e25d30..7ff19fb 100644
--- a/os_net_config/utils.py
+++ b/os_net_config/utils.py
@@ -83,19 +83,26 @@ def _natural_sort_key(s):
def ordered_active_nics():
embedded_nics = []
nics = []
+ logger.debug("Finding active nics")
for name in glob.iglob(_SYS_CLASS_NET + '/*'):
nic = name[(len(_SYS_CLASS_NET) + 1):]
if _is_active_nic(nic):
if nic.startswith('em') or nic.startswith('eth') or \
nic.startswith('eno'):
+ logger.debug("%s is an embedded active nic" % nic)
embedded_nics.append(nic)
else:
+ logger.debug("%s is an active nic" % nic)
nics.append(nic)
+ else:
+ logger.debug("%s is not an active nic" % nic)
# NOTE: we could just natural sort all active devices,
# but this ensures em, eno, and eth are ordered first
# (more backwards compatible)
- return (sorted(embedded_nics, key=_natural_sort_key) +
- sorted(nics, key=_natural_sort_key))
+ active_nics = (sorted(embedded_nics, key=_natural_sort_key) +
+ sorted(nics, key=_natural_sort_key))
+ logger.debug("Active nics are %s" % active_nics)
+ return active_nics
def diff(filename, data):