vagrant-parallels 0.0.5 → 0.0.6

data/README.md

@@ -65,9 +65,10 @@ By default 'vagrant-parallels' uses the basic Vagrant networking approach. By de
 But you can also add one ore more `:private_network` adapters, as described below: 
 
 ### Private Network
-It is fully compatible with basic Vagrant [Private Networking](http://docs.vagrantup.com/v2/networking/private_network.html). 
+It is fully compatible with basic Vagrant [Private Networks](http://docs.vagrantup.com/v2/networking/private_network.html).
 #### Available arguments:
-- `type` - IP configuration way: `:static` or `:dhcp`. Default is `:static`. If `:dchp` is set, such interface will get an IP dynamically from default subnet "10.37.129.1/255.255.255.0".
+- `type` - IP configuration way: `:static` or `:dhcp` (exactly Symbol object). Default is `:static`. If `:dchp` is set, such interface will get an IP dynamically from default subnet "10.37.129.1/255.255.255.0".
+- `mac` - MAC address which will be assigned to this network adapter. If omitted, MAC will be automatically generated at the first `up` of VM.
 - `ip` - IP address which will be assigned to this network adapter. It is required only if type is `:static`.
 - `netmask` - network mask. Default is `"255.255.255.0"`. It is required only if type is `:static`.
 - `nic_type` - Unnecessary argument, means the type of network adapter. Can be any of `"virtio"`, `"e1000"` or `"rtl"`. Default is `"e1000"`.
@@ -83,6 +84,28 @@ It means that two private network adapters will be configured:
 1) The first will have static ip '33.33.33.50' and mask '255.255.0.0'. It will be represented as device `"e1000"` by default (e.g. 'Intel(R) PRO/1000 MT').
 2) The second adapter will be configured as `"rtl"` ('Realtek RTL8029AS') and get an IP from internal DHCP server, which is working on the default network "10.37.129.1/255.255.255.0".
 
+### Public Network
+It is fully compatible with basic Vagrant [Public Networks](http://docs.vagrantup.com/v2/networking/public_network.html).
+#### Available arguments (unnecessary, but provider specific):
+- `bridge` - target host's interface for bridged network. You can specify full (ex: `Wi-Fi`) or short (ex: `en0`) name of interface. If omitted, you will be asked to choose the interface during the VM boot (or if only one interface exists, it will be chosen automatically).
+_Hint:_ Full names of network interfaces are displayed in _System Preferences -> Network_ window, and short names - in the `ifconfig` command output on your Mac.
+- `mac` - MAC address which will be assigned to this network adapter. If omitted, MAC will be automatically generated at the first `up` of VM.
+- `ip` - IP address which will be assigned to this network adapter. Use it, if you want to configure adapter manually.
+- `netmask` - network mask. Default is `"255.255.255.0"`. It is used only in pair with `ip`
+- `type` - IP configuration way, only `:dhcp` is available. Use it only if your public network has a valid DHCP server. Otherwise, omit this attribute or use an `ip` and `netmask` described above.
+- `nic_type` - type of network adapter. Can be any of `"virtio"`, `"e1000"` or `"rtl"`. Default is `"e1000"`.
+
+#### Example:
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.network :public_network, bridge: "Wi-Fi", mac: "001C425FC3AB", type: :dhcp
+  config.vm.network :public_network, bridge: "en4", ip: "10.3.1.18", netmask: "255.255.252.0"
+end
+```
+It means that two public network adapters will be configured:
+1) The first will be bridged to the 'Wi-Fi' host machine's interface and will have the specified MAC address. After the VM boot it will be automatically configured to get an IP from the DHCP server, which is accessible in the 'Wi-Fi' network).
+2) The second adapter will be bridged to the interface 'en4' and will have static ip '10.3.1.18' and mask '255.255.252.0'.
+
 ## Development
 
 To work on the `vagrant-parallels` plugin, clone this repository out

data/lib/vagrant-parallels/action/network.rb

@@ -98,6 +98,95 @@ module VagrantPlugins
 
         end
 
+        def bridged_config(options)
+          if options[:type] and options[:type].to_sym == :dhcp
+            options[:dhcp] = true
+          end
+
+          return {
+              :bridge    => nil,
+              :mac       => nil,
+              :nic_type  => "e1000",
+          }.merge(options || {})
+        end
+
+        def bridged_adapter(config)
+          # Find the bridged interfaces that are available
+          bridgedifs = @env[:machine].provider.driver.read_bridged_interfaces
+          bridgedifs.delete_if { |interface| interface[:status] == "Down" }
+
+          # The name of the chosen bridge interface will be assigned to this
+          # variable.
+          chosen_bridge = nil
+
+          if config[:bridge]
+            @logger.debug("Bridge was directly specified in config, searching for: #{config[:bridge]}")
+
+            # Search for a matching bridged interface
+            bridgedifs.each do |interface|
+              if [interface[:name].downcase, interface[:bound_to]].include? config[:bridge].downcase
+                @logger.debug("Specific bridge found as configured in the Vagrantfile. Using it.")
+                chosen_bridge = interface
+                break
+              end
+            end
+
+            # If one wasn't found, then we notify the user here.
+            if !chosen_bridge
+              @env[:ui].info I18n.t("vagrant.actions.vm.bridged_networking.specific_not_found",
+                                    :bridge => config[:bridge])
+            end
+          end
+
+          # If we still don't have a bridge chosen (this means that one wasn't
+          # specified in the Vagrantfile, or the bridge specified in the Vagrantfile
+          # wasn't found), then we fall back to the normal means of searching for a
+          # bridged network.
+          if !chosen_bridge
+            if bridgedifs.length == 1
+              # One bridgable interface? Just use it.
+              chosen_bridge = bridgedifs[0]
+              @logger.debug("Only one bridged interface available. Using it by default.")
+            else
+              # More than one bridgable interface requires a user decision, so
+              # show options to choose from.
+              @env[:ui].info I18n.t("vagrant.actions.vm.bridged_networking.available",
+                                    :prefix => false)
+              bridgedifs.each_index do |index|
+                interface = bridgedifs[index]
+                @env[:ui].info("#{index + 1}) #{interface[:name]}", :prefix => false)
+              end
+
+              # The range of valid choices
+              valid = Range.new(1, bridgedifs.length)
+
+              # The choice that the user has chosen as the bridging interface
+              choice = nil
+              while !valid.include?(choice)
+                choice = @env[:ui].ask("What interface should the network bridge to? Enter a number: ")
+                choice = choice.to_i
+              end
+
+              chosen_bridge = bridgedifs[choice - 1]
+            end
+          end
+
+          @logger.info("Bridging adapter #{config[:adapter]} to #{chosen_bridge[:name]} (#{chosen_bridge[:bound_to]})")
+
+          # Given the choice we can now define the adapter we're using
+          return {
+              :adapter     => config[:adapter],
+              :type        => :bridged,
+              :bridge      => chosen_bridge[:name],
+              :bound_to    => chosen_bridge[:bound_to],
+              :mac_address => config[:mac],
+              :dhcp        => config[:dhcp],
+              :ip          => config[:ip],
+              :netmask     => config[:netmask],
+              :nic_type    => config[:nic_type]
+          }
+        end
+
         def hostonly_config(options)
           options = {
               :mac         => nil,

data/lib/vagrant-parallels/driver/prl_ctl.rb

@@ -125,6 +125,8 @@ module VagrantPlugins
               args.concat(["--dhcp", "yes"])
             elsif adapter[:ip]
               args.concat(["--ipdel", "all", "--ipadd", "#{adapter[:ip]}/#{adapter[:netmask]}"])
+            else
+              args.concat(["--dhcp", "no"])
             end
 
             if adapter[:mac_address]
@@ -187,23 +189,24 @@ module VagrantPlugins
             info = {}
             ifconfig = raw('ifconfig', iface['Bound To']).stdout
             # Assign default values
-            info[:name]    = iface['Network ID']
+            info[:name]    = iface['Network ID'].gsub(/\s\(.*?\)$/, '')
+            info[:bound_to] = iface['Bound To']
             info[:ip]      = "0.0.0.0"
             info[:netmask] = "0.0.0.0"
             info[:status]  = "Down"
 
-            ifconfig.split("\n").each do |line|
-              if line =~ /(?<=inet\s)(\S*)/
-                info[:ip] = $1.to_s
-              end
-              if line =~ /(?<=netmask\s)(\S*)/
-                # Netmask will be converted from hex to dec:
-                # '0xffffff00' -> '255.255.255.0'
-                info[:netmask] = $1.hex.to_s(16).scan(/../).each.map{|octet| octet.hex}.join(".")
-              elsif line =~ /\W(UP)\W/
-                info[:status] = "Up"
-              end
+            if ifconfig =~ /(?<=inet\s)(\S*)/
+              info[:ip] = $1.to_s
+            end
+            if ifconfig =~ /(?<=netmask\s)(\S*)/
+              # Netmask will be converted from hex to dec:
+              # '0xffffff00' -> '255.255.255.0'
+              info[:netmask] = $1.hex.to_s(16).scan(/../).each.map{|octet| octet.hex}.join(".")
             end
+            if ifconfig =~ /\W(UP)\W/ and ifconfig !~ /(?<=status:\s)inactive$/
+              info[:status] = "Up"
+            end
+
             bridged_ifaces << info
           end
           bridged_ifaces

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler