diff options
| author | Scott Moser <smoser@brickies.net> | 2017-04-27 12:50:12 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-04-27 12:50:12 -0400 |
| commit | 8310484a880690529a4936615df596d467e51708 (patch) | |
| tree | 886aeb1a6e3ca809e466ddbcacbe9741b56dafa0 /cloudinit/net | |
| parent | af63cf763946bca6163dc797195a3aeae975f8da (diff) | |
| parent | 513e99e049eab4acea14e187f59d760adc755b40 (diff) | |
| download | vyos-cloud-init-8310484a880690529a4936615df596d467e51708.tar.gz vyos-cloud-init-8310484a880690529a4936615df596d467e51708.zip | |
merge from 513e99e049ea at 0.7.9-113-g513e99e0
Diffstat (limited to 'cloudinit/net')
| -rw-r--r-- | cloudinit/net/__init__.py | 7 | ||||
| -rw-r--r-- | cloudinit/net/network_state.py | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/cloudinit/net/__init__.py b/cloudinit/net/__init__.py index 346be5d3..a072a8d6 100644 --- a/cloudinit/net/__init__.py +++ b/cloudinit/net/__init__.py @@ -86,6 +86,11 @@ def is_bridge(devname): return os.path.exists(sys_dev_path(devname, "bridge")) +def is_vlan(devname): + uevent = str(read_sys_net_safe(devname, "uevent")) + return 'DEVTYPE=vlan' in uevent.splitlines() + + def is_connected(devname): # is_connected isn't really as simple as that. 2 is # 'physically connected'. 3 is 'not connected'. but a wlan interface will @@ -393,6 +398,8 @@ def get_interfaces_by_mac(): continue if is_bridge(name): continue + if is_vlan(name): + continue mac = get_interface_mac(name) # some devices may not have a mac (tun0) if not mac: diff --git a/cloudinit/net/network_state.py b/cloudinit/net/network_state.py index 692b6007..db3c3579 100644 --- a/cloudinit/net/network_state.py +++ b/cloudinit/net/network_state.py @@ -242,8 +242,8 @@ class NetworkStateInterpreter(object): if not skip_broken: raise else: - LOG.warn("Skipping invalid command: %s", command, - exc_info=True) + LOG.warning("Skipping invalid command: %s", command, + exc_info=True) LOG.debug(self.dump_network_state()) def parse_config_v2(self, skip_broken=True): @@ -262,8 +262,8 @@ class NetworkStateInterpreter(object): if not skip_broken: raise else: - LOG.warn("Skipping invalid command: %s", command, - exc_info=True) + LOG.warning("Skipping invalid command: %s", command, + exc_info=True) LOG.debug(self.dump_network_state()) @ensure_command_keys(['name']) |