x/cloudbase-init
Code Issues Proposed changes

Filter network adapters to require a MAC address

Browse Source 
If Windows has multiple network adapters with the same name, we
filter out the adapters that do not have a MAC address.

Added SQl-like syntax
This commit is contained in:
Adrian Vladu 2013-09-18 15:56:48 +02:00 committed by Adrian Vladu
parent 5b7b2c280d
commit cddc6da954
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cloudbaseinit/osutils/windows.py
View File

@ -227,7 +227,8 @@ class WindowsUtils(base.BaseOSUtils):
conn = wmi.WMI(moniker='//./root/cimv2')
# Get Ethernet adapters only
q = conn.query('SELECT * FROM Win32_NetworkAdapter WHERE '
'AdapterTypeId = 0 AND PhysicalAdapter = True')
'AdapterTypeId = 0 AND PhysicalAdapter = True AND '
'MACAddress IS NOT NULL')
for r in q:
l.append(r.Name)
return l
@ -237,8 +238,9 @@ class WindowsUtils(base.BaseOSUtils):
conn = wmi.WMI(moniker='//./root/cimv2')
adapter_name_san = self._sanitize_wmi_input(adapter_name)
q = conn.query('SELECT * FROM Win32_NetworkAdapter '
'where Name = \'%(adapter_name_san)s\'' % locals())
q = conn.query('SELECT * FROM Win32_NetworkAdapter WHERE '
'MACAddress IS NOT NULL AND '
'Name = \'%(adapter_name_san)s\'' % locals())
if not len(q):
raise Exception("Network adapter not found")