mirror of
https://github.com/vagrant-libvirt/vagrant-libvirt.git
synced 2025-02-25 18:55:27 -06:00
Merge pull request #455 from skamithi/mcast_and_tcp_tunnel_support
UDP/TCP/Mcast tunnel support for point-2-point VM connections
This commit is contained in:
Dmitry Vasilets
commit
4a8b88fc87
43
README.md
43
README.md
@ -218,11 +218,16 @@ Vagrant.configure("2") do |config|
|
||||
|
||||
Networking features in the form of `config.vm.network` support private networks
|
||||
concept. It supports both the virtual network switch routing types and the point to
|
||||
point Guest OS to Guest OS setting using TCP tunnel interfaces.
|
||||
point Guest OS to Guest OS setting using UDP/Mcast/TCP tunnel interfaces.
|
||||
|
||||
http://wiki.libvirt.org/page/VirtualNetworking
|
||||
|
||||
https://libvirt.org/formatdomain.html#elementsNICSTCP
|
||||
|
||||
http://libvirt.org/formatdomain.html#elementsNICSMulticast
|
||||
|
||||
http://libvirt.org/formatdomain.html#elementsNICSUDP _(in libvirt v1.2.20 and higher)_
|
||||
|
||||
Public Network interfaces are currently implemented using the macvtap driver. The macvtap
|
||||
driver is only available with the Linux Kernel version >= 2.6.24. See the following libvirt
|
||||
documentation for the details of the macvtap usage.
|
||||
@ -242,18 +247,18 @@ An examples of network interface definitions:
|
||||
# Guest 1
|
||||
config.vm.define :test_vm1 do |test_vm1|
|
||||
test_vm1.vm.network :private_network,
|
||||
:libvirt__tcp_tunnel_type => 'server',
|
||||
:libvirt__tunnel_type => 'server',
|
||||
# default is 127.0.0.1 if omitted
|
||||
# :libvirt__tcp_tunnel_ip => '127.0.0.1',
|
||||
:libvirt__tcp_tunnel_port => '11111'
|
||||
# :libvirt__tunnel_ip => '127.0.0.1',
|
||||
:libvirt__tunnel_port => '11111'
|
||||
|
||||
# Guest 2
|
||||
config.vm.define :test_vm2 do |test_vm2|
|
||||
test_vm2.vm.network :private_network,
|
||||
:libvirt__tcp_tunnel_type => 'client',
|
||||
:libvirt__tunnel_type => 'client',
|
||||
# default is 127.0.0.1 if omitted
|
||||
# :libvirt__tcp_tunnel_ip => '127.0.0.1',
|
||||
:libvirt__tcp_tunnel_port => '11111'
|
||||
# :libvirt__tunnel_ip => '127.0.0.1',
|
||||
:libvirt__tunnel_port => '11111'
|
||||
|
||||
|
||||
# Public Network
|
||||
@ -317,15 +322,25 @@ starts with 'libvirt__' string. Here is a list of those options:
|
||||
* `:libvirt__forward_device` - Name of interface/device, where network should
|
||||
be forwarded (NATed or routed). Used only when creating new network. By
|
||||
default, all physical interfaces are used.
|
||||
* `:libvirt_tcp_tunnel_type` - Set it to "server" or "client" to enable TCP
|
||||
tunnel interface configuration. This configuration type uses TCP tunnels to
|
||||
* `:libvirt__tunnel_type` - Set to 'udp' if using UDP unicast tunnel mode (libvirt v1.2.20 or higher).
|
||||
Set this to either "server" or "client" for tcp tunneling. Set this to 'mcast' if using multicast
|
||||
tunneling. This configuration type uses tunnels to
|
||||
generate point to point connections between Guests. Useful for Switch VMs like
|
||||
Cumulus Linux. No virtual switch setting like "libvirt__network_name" applies with TCP
|
||||
Cumulus Linux. No virtual switch setting like "libvirt__network_name" applies with
|
||||
tunnel interfaces and will be ignored if configured.
|
||||
* `:libvirt_tcp_tunnel_ip` - Sets the source IP of the TCP Tunnel interface. By
|
||||
default this is `127.0.0.1`
|
||||
* `:libvirt_tcp_tunnel_port` - Sets the TCP Tunnel interface port that either
|
||||
the client will connect to, or the server will listen on.
|
||||
* `:libvirt__tunnel_ip` - Sets the source IP of the libvirt tunnel interface. By
|
||||
default this is `127.0.0.1` for TCP and UDP tunnels and `239.255.1.1` for Multicast
|
||||
tunnels. It populates the address field in the `<source address="XXX">` of the
|
||||
interface xml configuration.
|
||||
* `:libvirt__tunnel_port` - Sets the source port the tcp/udp/mcast tunnel
|
||||
with use. This port information is placed in the `<source port=XXX/>` section of
|
||||
interface xml configuration.
|
||||
* `:libvirt__tunnel_local_port` - Sets the local port used by the udp tunnel
|
||||
interface type. It populates the port field in the `<local port=XXX">` section of the
|
||||
interface xml configuration. _(This feature only works in libvirt 1.2.20 and higher)_
|
||||
* `:libvirt__tunnel_local_ip` - Sets the local IP used by the udp tunnel
|
||||
interface type. It populates the ip entry of the `<local address=XXX">` section of
|
||||
the interface xml configuration. _(This feature only works in libvirt 1.2.20 and higher)_
|
||||
* `:mac` - MAC address for the interface.
|
||||
* `:model_type` - parameter specifies the model of the network adapter when you create a domain value by default virtio KVM believe possible values, see the documentation for libvirt
|
||||
|
||||
|
||||
@ -79,15 +79,27 @@ module VagrantPlugins
|
||||
template_name = 'public_interface'
|
||||
@logger.info("Setting up public interface using device #{@device} in mode #{@mode}")
|
||||
@ovs = iface_configuration.fetch(:ovs, false)
|
||||
# configuration for tcp tunnel interfaces (p2p conn btwn guest OSes)
|
||||
elsif iface_configuration.fetch(:tcp_tunnel_type, nil)
|
||||
@tcp_tunnel_port = iface_configuration.fetch(:tcp_tunnel_port, nil)
|
||||
raise Errors::TcpTunnelPortNotDefined if @tcp_tunnel_port.nil?
|
||||
@tcp_tunnel_ip = iface_configuration.fetch(:tcp_tunnel_address, '127.0.0.1')
|
||||
@type = iface_configuration.fetch(:tcp_tunnel_type)
|
||||
# configuration for udp or tcp tunnel interfaces (p2p conn btwn guest OSes)
|
||||
elsif iface_configuration.fetch(:tunnel_type, nil)
|
||||
@type = iface_configuration.fetch(:tunnel_type)
|
||||
@tunnel_port = iface_configuration.fetch(:tunnel_port, nil)
|
||||
raise Errors::TunnelPortNotDefined if @tunnel_port.nil?
|
||||
if @type == 'udp'
|
||||
# default udp tunnel source to 127.0.0.1
|
||||
@udp_tunnel_local_ip = iface_configuration.fetch(:tunnel_local_ip, '127.0.0.1')
|
||||
@udp_tunnel_local_port = iface_configuration.fetch(:tunnel_local_port)
|
||||
end
|
||||
# default mcast tunnel to 239.255.1.1. Web search says this
|
||||
# 239.255.x.x is a safe range to use for general use mcast
|
||||
if @type == 'mcast'
|
||||
default_ip = '239.255.1.1'
|
||||
else
|
||||
default_ip = '127.0.0.1'
|
||||
end
|
||||
@tunnel_ip = iface_configuration.fetch(:tunnel_address, default_ip)
|
||||
@model_type = iface_configuration.fetch(:model_type, @nic_model_type)
|
||||
template_name = 'tcp_tunnel_interface'
|
||||
@logger.info("Setting up #{@type} tunnel interface using #{@tcp_tunnel_ip} port #{@tcp_tunnel_port}")
|
||||
template_name = 'tunnel_interface'
|
||||
@logger.info("Setting up #{@type} tunnel interface using #{@tunnel_ip} port #{@tunnel_port}")
|
||||
end
|
||||
|
||||
|
||||
@ -156,7 +168,7 @@ module VagrantPlugins
|
||||
end
|
||||
|
||||
# do not run configure_networks for tcp tunnel interfaces
|
||||
next if options.fetch(:tcp_tunnel_type, nil)
|
||||
next if options.fetch(:tunnel_type, nil)
|
||||
|
||||
networks_to_configure << network
|
||||
end
|
||||
@ -164,6 +176,7 @@ module VagrantPlugins
|
||||
env[:ui].info I18n.t('vagrant.actions.vm.network.configuring')
|
||||
env[:machine].guest.capability(
|
||||
:configure_networks, networks_to_configure)
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
@ -179,7 +192,7 @@ module VagrantPlugins
|
||||
# Return network name according to interface options.
|
||||
def interface_network(libvirt_client, options)
|
||||
# no need to get interface network for tcp tunnel config
|
||||
return 'tcp_tunnel' if options.fetch(:tcp_tunnel_type, nil)
|
||||
return 'tunnel_interface' if options.fetch(:tunnel_type, nil)
|
||||
|
||||
if options[:network_name]
|
||||
@logger.debug "Found network by name"
|
||||
|
||||
@ -36,7 +36,7 @@ module VagrantPlugins
|
||||
configured_networks(env, @logger).each do |options|
|
||||
# Only need to create private networks
|
||||
next if options[:iface_type] != :private_network or
|
||||
options.fetch(:tcp_tunnel_type, nil)
|
||||
options.fetch(:tunnel_type, nil)
|
||||
@logger.debug "Searching for network with options #{options}"
|
||||
|
||||
# should fix other methods so this doesn't have to be instance var
|
||||
|
||||
@ -106,8 +106,8 @@ module VagrantPlugins
|
||||
error_key(:activate_network_error)
|
||||
end
|
||||
|
||||
class TcpTunnelPortNotDefined < VagrantLibvirtError
|
||||
error_key(:tcp_tunnel_port_not_defined)
|
||||
class TunnelPortNotDefined < VagrantLibvirtError
|
||||
error_key(:tunnel_port_not_defined)
|
||||
end
|
||||
|
||||
# Other exceptions
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
<interface type='<%= @type %>'>
|
||||
<% if @mac %>
|
||||
<mac address='<%= @mac %>'/>
|
||||
<% end %>
|
||||
<source address='<%=@tcp_tunnel_ip%>' port='<%= @tcp_tunnel_port %>'/>
|
||||
<model type='<%=@model_type%>'/>
|
||||
</interface>
|
||||
11
lib/vagrant-libvirt/templates/tunnel_interface.xml.erb
Normal file
11
lib/vagrant-libvirt/templates/tunnel_interface.xml.erb
Normal file
@ -0,0 +1,11 @@
|
||||
<interface type='<%= @type %>'>
|
||||
<% if @mac %>
|
||||
<mac address='<%= @mac %>'/>
|
||||
<% end %>
|
||||
<source address='<%=@tunnel_ip%>' port='<%= @tunnel_port %>'>
|
||||
<% if @type == 'udp' %>
|
||||
<local address='<%=@udp_tunnel_local_ip%>' port='<%=@udp_tunnel_local_port%>' />
|
||||
<% end %>
|
||||
</source>
|
||||
<model type='<%=@model_type%>'/>
|
||||
</interface>
|
||||
@ -135,8 +135,8 @@ en:
|
||||
Error while removing network %{network_name}. %{error_message}.
|
||||
delete_snapshot_error: |-
|
||||
Error while deleting snapshot: %{error_message}.
|
||||
tcp_tunnel_port_not_defined: |-
|
||||
TCP tunnel port not defined.
|
||||
tunnel_port_not_defined: |-
|
||||
tunnel UDP or TCP port not defined.
|
||||
|
||||
states:
|
||||
paused: |-
|
||||
|
||||
Loading…
Reference in New Issue
Block a user