Antoni Segura Puimedon has uploaded a new change for review. Change subject: Fixed support for reporting devices with only ipv6. ......................................................................
Fixed support for reporting devices with only ipv6. Change-Id: I92010740da24bb30c7316c268c704d9067b28aae Signed-off-by: Antoni S. Puimedon <[email protected]> --- M ovirt-guest-agent/GuestAgentLinux2.py 1 file changed, 13 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-guest-agent refs/changes/23/10223/1 diff --git a/ovirt-guest-agent/GuestAgentLinux2.py b/ovirt-guest-agent/GuestAgentLinux2.py index e6039fc..9e963a6 100644 --- a/ovirt-guest-agent/GuestAgentLinux2.py +++ b/ovirt-guest-agent/GuestAgentLinux2.py @@ -112,16 +112,21 @@ def ethtool_list_nics(self): interfaces = list() try: - for dev in self.ethtool.get_active_devices(): + for dev in self.ethtool.get_devices(): flags = self.ethtool.get_flags(dev) - if not(flags & self.ethtool.IFF_LOOPBACK): + if flags & self.ethtool.IFF_UP and \ + not(flags & self.ethtool.IFF_LOOPBACK): devinfo = self.ethtool.get_interfaces_info(dev)[0] - interfaces.append( - {'name': dev, - 'inet': [self.ethtool.get_ipaddr(dev)], - 'inet6': map(lambda ip: ip.address, - devinfo.get_ipv6_addresses()), - 'hw': self.ethtool.get_hwaddr(dev)}) + info = {'name': dev, + 'inet6': map(lambda ip: ip.address, + devinfo.get_ipv6_addresses()), + 'hw': self.ethtool.get_hwaddr(dev)} + try: + info['inet'] = [self.ethtool.get_ipaddr(dev)] + except IOError: + logging.info('Device %s has no ipv4 address', dev) + + interfaces.append(info) except: logging.exception("Error retrieving network interfaces.") return interfaces -- To view, visit http://gerrit.ovirt.org/10223 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I92010740da24bb30c7316c268c704d9067b28aae Gerrit-PatchSet: 1 Gerrit-Project: ovirt-guest-agent Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
