NuKVM/vagrant-libvirt
3
0
Fork 0
mirror of https://github.com/vagrant-libvirt/vagrant-libvirt.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup some public network MAC code.

Browse Source
This commit is contained in:
Jose A. Rivera
2017-02-06 15:12:22 +01:00
parent 9cc0ff906c
commit da87d06bfb
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/vagrant-libvirt/action/create_network_interfaces.rb
View File

@@ -122,20 +122,17 @@ module VagrantPlugins
end end
# Re-read the network configuration and grab the MAC address # Re-read the network configuration and grab the MAC address
next if @mac if iface_configuration[:iface_type] == :public_network and not @mac
xml = Nokogiri::XML(domain.xml_desc) xml = Nokogiri::XML(domain.xml_desc)
if iface_configuration[:iface_type] == :public_network source = "@network='#{@network_name}'"
if @type == 'direct' if @type == 'direct'
@mac = xml.xpath("/domain/devices/interface[source[@dev='#{@device}']]/mac/@address") source = "@dev='#{@device}'"
elsif !@portgroup.nil? elsif @portgroup.nil?
@mac = xml.xpath("/domain/devices/interface[source[@network='#{@network_name}']]/mac/@address") source = "@bridge='#{@device}'"
else
@mac = xml.xpath("/domain/devices/interface[source[@bridge='#{@device}']]/mac/@address")
end end
else @mac = xml.xpath("/domain/devices/interface[source[#{source}]]/mac/@address")
@mac = xml.xpath("/domain/devices/interface[source[@network='#{@network_name}']]/mac/@address") iface_configuration[:mac] = @mac.to_s
end end
iface_configuration[:mac] = @mac.to_s
end end
# Continue the middleware chain. # Continue the middleware chain.