vagrant-vmware-dhcp 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d5f260c0846fb882557b8a0126d4bc905f93af9
-  data.tar.gz: a76636beea09d3be97f32cf5f23d1df7b520985d
+  metadata.gz: e0bc39c6cd747318ab85baf9c099e0744ef8eebc
+  data.tar.gz: b236907c228d090f4d935525b99a5f9f83b03a91
 SHA512:
-  metadata.gz: a0303e52af1f2727f7c050e84dad78c0360308ada672d15a99ea8b839540af466a52b39173c44324903860762f51b7f54129d369a4619a7484e7e5168cf2ffe8
-  data.tar.gz: 5153762c66271ffd56cdfa0ce238f688d8c4c2949a619883573283a33e7e5ced5e2c6d75eb03dbc3052d2bd6c1005563af74aee06103974996f985069c8bf382
+  metadata.gz: 90aa5e525f2b6ac08fe534db152f41c576878a10d5a65e0a1df0f979997fba67f3dd775bc5801205aeb627d46fbdd6f94a2efb736578b72808c44aebdfe6abc1
+  data.tar.gz: 2738e4446d5034abe7175718f604965638eb3963f62ae9954b82af9ab205c360ddea5abbb37c38678e1b906ff00db34f4ab818c85b55a1a4145f0af3abf8786c

data/lib/vagrant-vmware-dhcp/action/config_dhcp.rb

@@ -17,7 +17,7 @@ module VagrantPlugins
 
           if @env[:machine]
             if @env[:machine].provider_name == :vmware_fusion or @env[:machine].provider_name == :vmware_workstation
-              configure_dhcp
+              configure_dhcp(@env[:machine])
             end
           end
 
@@ -26,130 +26,29 @@ module VagrantPlugins
 
         private
 
-        def configure_dhcp
-          machine = @env[:machine]
+        def configure_dhcp(machine)
+          # dhcp_manager = VagrantPlugins::VagrantVmwareDhcp::DhcpManager.new(@env[:ui], @logger, machine)
+          dhcp_manager = get_dhcp_manager(machine)
 
-          vmx_networks = retrieve_vmx_network_settings(machine)
+          dhcp_manager.prune()
 
-          @logger.debug("After retrieval vmx_networks are #{vmx_networks}")
-
-          network_map = make_network_map(machine, vmx_networks)
-
-          @logger.debug("After retrieval network_map is #{network_map}")
-
-          apply_static_dhcp_config(machine, network_map)
-        end
-
-        def retrieve_vmx_network_settings(machine)
-          vmx_networks = {}
-
-          File.open(machine.provider.driver.vmx_path).each_line {
-            |line|
-
-            matches = /^(ethernet\d+\.)(.+?)\s*=\s*"?(.*?)"?\s*$/.match(line)
-
-            if not matches
-              next
-            end
-
-            adapter_name = matches[1]
-            adapter_property = matches[2]
-            property_value = matches[3]
-
-            if not vmx_networks.has_key?(adapter_name)
-              vmx_networks[adapter_name] = {}
-            end
-
-            vmx_networks[adapter_name][adapter_property] = property_value
-          }
-
-          vmx_networks_by_mac = {}
-
-          vmx_networks.each {
-            |adapter_name, properties|
-
-            if not properties.has_key?("address") or not properties.has_key?("vnet")
-              next
-            end
-
-            vmx_networks_by_mac[ properties['address'] ] = properties
-          }
-
-          vmx_networks_by_mac
-        end
-
-        def make_network_map(machine, vmx_networks)
-          vm_networks = machine.config.vm.networks.select { |vm_network| vm_network[0] == :private_network and vm_network[1][:ip] and vm_network[1][:mac] }
-
-          network_map = {}
-
-          vm_networks.each { |vm_network|
-            mac = vm_network[1][ :mac ]
-            mac = mac.scan(/.{2}/).join(":")
-
-            if not vmx_networks.has_key?(mac)
-              @logger.error("Missing VMX network configuration for vm_network #{vm_network}")
-              next
-            end
-
-            network_map[mac] = { :ip => vm_network[1][:ip], :vnet => vmx_networks[mac]["vnet"], :mac => mac }
-          }
-
-          network_map
-        end
-
-        def apply_static_dhcp_config(machine, network_map)
-
-          network_map.each {
-            |mac, network|
-
-            @logger.info("Pruning DHCP configuration for #{network[:ip]}")
-            prune_dhcpd_conf(network)
-
-            @env[:ui].error("CONTROL_DHCP is #{machine.config.control_dhcp.enable}")
-
-            if machine.config.control_dhcp.enable
-              @env[:ui].info("Configuring DHCP for #{network[:ip]} on #{network[:vnet]}")
-
-              write_dhcpd_conf(network)
-            end
-          }
-
-          trigger_dhcpd_update
-
-          @env[:ui].info("DHCP Configured")
+          if machine.config.control_dhcp.enable
+            dhcp_manager.configure()
+          end
 
+          dhcp_manager.reload()
         end
 
-        def get_dhcpd_section(network)
-          netname = [network[:vnet], network[:ip].gsub(/\./, '_')].join('_')
-
-          output = Vagrant::Util::TemplateRenderer.render('dhcpd_static',
-                                           mac: network[:mac],
-                                           ip: network[:ip],
-                                           vnet: network[:vnet],
-                                           name: netname,
-                                           template_root: VagrantPlugins::VagrantVmwareDhcp.source_root().join("templates")
-                                           )
-          return output
+        def get_dhcp_manager(machine)
+          if Vagrant::Util::Platform.windows?
+            return VagrantPlugins::VagrantVmwareDhcp::DhcpManagerWindows.new(@env[:ui], @logger, machine)
+          elsif Vagrant::Util::Platform.linux?
+            return VagrantPlugins::VagrantVmwareDhcp::DhcpManagerLinux.new(@env[:ui], @logger, machine)
+          elsif Vagrant::Util::Platform.darwin?
+            return VagrantPlugins::VagrantVmwareDhcp::DhcpManagerDarwin.new(@env[:ui], @logger, machine)
+          end
         end
 
-        # def prune_dhcpd_conf(network)
-        #   raise "This should never happen!"
-        # end
-        #
-        # def dhcpd_conf_location(network)
-        #   raise "This should never happen!"
-        # end
-        #
-        # def write_dhcpd_conf(network)
-        #   raise "This should never happen!"
-        # end
-        #
-        # def trigger_dhcpd_update(network)
-        #   raise "This should never happen!"
-        # end
-
       end
     end
   end

data/lib/vagrant-vmware-dhcp/action/prune_dhcp.rb

@@ -0,0 +1,52 @@
+require "log4r"
+require "digest"
+
+# Someone who's had some sleep recently is welcome to come fill in comments here...
+module VagrantPlugins
+  module VagrantVmwareDhcp
+    module Action
+      class PruneDhcp
+        def initialize(app, env)
+          @app    = app
+          @env    = env
+          @logger = Log4r::Logger.new("vagrant::plugins::vagrant-vmware-dhcp::prune_dhcp")
+        end
+
+        def call(env)
+          @env = env
+
+          if @env[:machine]
+            if @env[:machine].provider_name == :vmware_fusion or @env[:machine].provider_name == :vmware_workstation
+              @env[:ui].info("Pruning altered DHCP configuration")
+              prune_dhcp(@env[:machine])
+            end
+          end
+
+          @app.call(@env)
+        end
+
+        private
+
+        def prune_dhcp(machine)
+          # dhcp_manager = VagrantPlugins::VagrantVmwareDhcp::DhcpManager.new(@env[:ui], @logger, machine)
+          dhcp_manager = get_dhcp_manager(machine)
+
+          dhcp_manager.prune()
+
+          dhcp_manager.reload()
+        end
+
+        def get_dhcp_manager(machine)
+          if Vagrant::Util::Platform.windows?
+            return VagrantPlugins::VagrantVmwareDhcp::DhcpManagerWindows.new(@env[:ui], @logger, machine)
+          elsif Vagrant::Util::Platform.linux?
+            return VagrantPlugins::VagrantVmwareDhcp::DhcpManagerLinux.new(@env[:ui], @logger, machine)
+          elsif Vagrant::Util::Platform.darwin?
+            return VagrantPlugins::VagrantVmwareDhcp::DhcpManagerDarwin.new(@env[:ui], @logger, machine)
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-vmware-dhcp/action.rb

@@ -1,9 +1,7 @@
-module AutoNetwork
-  module Action
-    require 'vagrant-vmware-dhcp/action/set_mac'
-    require 'vagrant-vmware-dhcp/action/config_dhcp'
-    require 'vagrant-vmware-dhcp/action/config_dhcp_darwin'
-    require 'vagrant-vmware-dhcp/action/config_dhcp_linux'
-    require 'vagrant-vmware-dhcp/action/config_dhcp_windows'
+module VagrantPlugins
+  module VagrantVmwareDhcp
+    require_relative 'action/set_mac'
+    require_relative 'action/config_dhcp'
+    require_relative 'action/prune_dhcp'
   end
 end

data/lib/vagrant-vmware-dhcp/dhcp.rb

@@ -0,0 +1,8 @@
+module VagrantPlugins
+  module VagrantVmwareDhcp
+    require_relative 'dhcp_manager/dhcp_manager.rb'
+    require_relative 'dhcp_manager/dhcp_manager_darwin.rb'
+    require_relative 'dhcp_manager/dhcp_manager_linux.rb'
+    require_relative 'dhcp_manager/dhcp_manager_windows.rb'
+  end
+end

data/lib/vagrant-vmware-dhcp/dhcp_manager/dhcp_manager.rb

@@ -0,0 +1,129 @@
+require "log4r"
+require "digest"
+
+# Someone who's had some sleep recently is welcome to come fill in comments here...
+module VagrantPlugins
+  module VagrantVmwareDhcp
+    class DhcpManager
+
+      def initialize(ui, logger, machine)
+        @ui = ui
+        @logger = logger
+        @machine = machine
+        @network_map = make_network_map(machine)
+      end
+
+      def prune()
+        @network_map.each {
+          |mac, network|
+
+          prune_configuration(network)
+        }
+
+        reload_configuration
+      end
+
+      def configure()
+        @network_map.each {
+          |mac, network|
+
+          @ui.info("Configuring DHCP for #{network[:ip]} on #{network[:vnet]}")
+
+          write_configuration(network)
+        }
+
+        @ui.info("DHCP Configured")
+      end
+
+      def reload()
+        @ui.info("Reloading DHCP Configuration")
+        reload_configuration
+      end
+
+      protected
+
+      def template_machine_definition(network)
+        netname = [network[:vnet], network[:ip].gsub(/\./, '_')].join('_')
+
+        output = Vagrant::Util::TemplateRenderer.render('dhcpd_static',
+                                         mac: network[:mac],
+                                         ip: network[:ip],
+                                         vnet: network[:vnet],
+                                         name: netname,
+                                         template_root: VagrantPlugins::VagrantVmwareDhcp.source_root().join("templates")
+                                         )
+
+        @logger.debug("DHCPD template for interface #{network[:vnet]} is #{output}")
+
+        return output
+      end
+
+      private
+
+      def make_network_map(machine)
+        vmx_networks = retrieve_vmx_network_settings(machine)
+
+        vm_networks = machine.config.vm.networks.select { |vm_network| vm_network[0] == :private_network and vm_network[1][:ip] and vm_network[1][:mac] }
+
+        network_map = {}
+
+        vm_networks.each { |vm_network|
+          mac = vm_network[1][ :mac ]
+          mac = mac.scan(/.{2}/).join(":")
+
+          if not vmx_networks.has_key?(mac)
+            @logger.error("Missing VMX network configuration for vm_network #{vm_network}")
+            next
+          end
+
+          network_map[mac] = { :ip => vm_network[1][:ip], :vnet => vmx_networks[mac]["vnet"], :mac => mac }
+        }
+
+        @logger.debug("After mutating, network_map is #{network_map}")
+
+        network_map
+      end
+
+      def retrieve_vmx_network_settings(machine)
+        vmx_networks = {}
+
+        File.open(machine.provider.driver.vmx_path).each_line {
+          |line|
+
+          matches = /^(ethernet\d+\.)(.+?)\s*=\s*"?(.*?)"?\s*$/.match(line)
+
+          if not matches
+            next
+          end
+
+          adapter_name = matches[1]
+          adapter_property = matches[2]
+          property_value = matches[3]
+
+          if not vmx_networks.has_key?(adapter_name)
+            vmx_networks[adapter_name] = {}
+          end
+
+          vmx_networks[adapter_name][adapter_property] = property_value
+        }
+
+        vmx_networks_by_mac = {}
+
+        vmx_networks.each {
+          |adapter_name, properties|
+
+          if not properties.has_key?("address") or not properties.has_key?("vnet")
+            next
+          end
+
+          vmx_networks_by_mac[ properties['address'] ] = properties
+        }
+
+        @logger.debug("After retrieval vmx_networks_by_mac is #{vmx_networks_by_mac}")
+
+        vmx_networks_by_mac
+      end
+
+    end
+  end
+end

data/lib/vagrant-vmware-dhcp/dhcp_manager/dhcp_manager_darwin.rb

@@ -0,0 +1,106 @@
+require "log4r"
+require "digest"
+require "vagrant/util/shell_quote"
+require "vagrant/util/subprocess"
+
+# Someone who's had some sleep recently is welcome to come fill in comments here...
+module VagrantPlugins
+  module VagrantVmwareDhcp
+    class DhcpManagerDarwin < DhcpManager
+
+      protected
+
+      def dhcpd_conf_location(network)
+        # Locations from https://pubs.vmware.com/workstation-9/index.jsp?topic=%2Fcom.vmware.ws.using.doc%2FGUID-04D783E1-3AB9-4D98-9891-2C58215905CC.html
+
+        location = "/Library/Preferences/VMware Fusion/#{network[:vnet]}/dhcpd.conf"
+
+        @logger.debug("Using dhcpd.conf at #{location}")
+
+        return location
+      end
+
+      def prune_configuration(network)
+        @logger.info("Pruning DHCP configuration for #{network[:ip]}")
+
+        conf_location = dhcpd_conf_location(network)
+        escaped_conf_location = Vagrant::Util::ShellQuote.escape(conf_location, "'")
+
+        mac = network[:mac]
+        ip = network[:ip]
+
+        before = File.open(conf_location).read
+        @logger.debug("Before altering, dhcpd.conf content is #{before}")
+
+        command = []
+        command << "sudo" if !File.writable?(conf_location)
+        command += [
+          "sed", "-E", "-e",
+          "/^# VAGRANT-BEGIN: #{mac}/," +
+          "/^# VAGRANT-END: #{mac}\s*/ d",
+          "-ibak",
+          conf_location
+        ]
+
+        system(*command)
+
+        command = []
+        command << "sudo" if !File.writable?(conf_location)
+        command += [
+          "sed", "-E", "-e",
+          "/^# VAGRANT-BEGIN: #{ip}/," +
+          "/^# VAGRANT-END: #{ip}\s*/ d",
+          "-ibak",
+          conf_location
+        ]
+
+        system(*command)
+
+        after = File.open(conf_location).read
+        @logger.debug("After, dhcpd.conf content is #{after}")
+      end
+
+      def write_configuration(network)
+        conf_location = dhcpd_conf_location(network)
+        escaped_conf_location = Vagrant::Util::ShellQuote.escape(conf_location, "'")
+
+        sudo_command = ""
+        sudo_command = "sudo " if !File.writable?(conf_location)
+
+        output = template_machine_definition(network)
+
+        before = File.open(conf_location).read
+        @logger.debug("Before altering, dhcpd.conf content is #{before}")
+
+        output.split("\n").each do |line|
+          line = Vagrant::Util::ShellQuote.escape(line, "'")
+          system(%Q[echo '#{line}' | #{sudo_command}tee -a '#{escaped_conf_location}' >/dev/null])
+        end
+
+        after = File.open(conf_location).read
+        @logger.debug("After, dhcpd.conf content is #{after}")
+      end
+
+      def reload_configuration
+        # Per http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1026510
+
+        vmnet_cli = "/Applications/VMware Fusion.app/Contents/Library/vmnet-cli"
+
+        configureCommand = [ "sudo", vmnet_cli, "--configure" ].flatten
+        stopCommand      = [ "sudo", vmnet_cli, "--stop" ].flatten
+        startCommand     = [ "sudo", vmnet_cli, "--start" ].flatten
+        statusCommand    = [ "sudo", vmnet_cli, "--status" ].flatten
+
+        Vagrant::Util::Subprocess.execute(*configureCommand)
+        Vagrant::Util::Subprocess.execute(*stopCommand)
+        Vagrant::Util::Subprocess.execute(*startCommand)
+        r = Vagrant::Util::Subprocess.execute(*statusCommand)
+
+        if r.exit_code != 0
+          @ui.error("VMNet status exited with code #{r.exit_code} and output:\n#{r.stdout.chomp}")
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-vmware-dhcp/dhcp_manager/dhcp_manager_linux.rb

@@ -0,0 +1,101 @@
+require "log4r"
+require "digest"
+require "vagrant/util/shell_quote"
+require "vagrant/util/subprocess"
+
+# Someone who's had some sleep recently is welcome to come fill in comments here...
+module VagrantPlugins
+  module VagrantVmwareDhcp
+    class DhcpManagerLinux < DhcpManager
+
+      protected
+
+      def dhcpd_conf_location(network)
+        # Locations from https://pubs.vmware.com/workstation-9/index.jsp?topic=%2Fcom.vmware.ws.using.doc%2FGUID-04D783E1-3AB9-4D98-9891-2C58215905CC.html
+
+        location = "/etc/vmware/#{network[:vnet]}/dhcpd/dhcpd.conf"
+
+        @logger.debug("Using dhcpd.conf at #{location}")
+
+        return location
+      end
+
+      def prune_configuration(network)
+        @logger.info("Pruning DHCP configuration for #{network[:ip]}")
+
+        conf_location = dhcpd_conf_location(network)
+
+        mac = network[:mac]
+        ip = network[:ip]
+
+        before = File.open(conf_location).read
+        @logger.debug("Before altering, dhcpd.conf content is #{before}")
+
+        command = []
+        command << "sudo" if !File.writable?(conf_location)
+        command += [
+          "sed", "-E", "-e",
+          "/^# VAGRANT-BEGIN: #{mac}/," +
+          "/^# VAGRANT-END: #{mac}\s*/ d",
+          "-ibak",
+          conf_location
+        ]
+
+        system(*command)
+
+        command = []
+        command << "sudo" if !File.writable?(conf_location)
+        command += [
+          "sed", "-E", "-e",
+          "/^# VAGRANT-BEGIN: #{ip}/," +
+          "/^# VAGRANT-END: #{ip}\s*/ d",
+          "-ibak",
+          conf_location
+        ]
+
+        system(*command)
+
+        after = File.open(conf_location).read
+        @logger.debug("After, dhcpd.conf content is #{after}")
+      end
+
+      def write_configuration(network)
+        conf_location = dhcpd_conf_location(network)
+        escaped_conf_location = Vagrant::Util::ShellQuote.escape(conf_location, "'")
+
+        sudo_command = ""
+        sudo_command = "sudo " if !File.writable?(conf_location)
+
+        output = template_machine_definition(network)
+
+        before = File.open(conf_location).read
+        @logger.debug("Before altering, dhcpd.conf content is #{before}")
+
+        output.split("\n").each do |line|
+          line = Vagrant::Util::ShellQuote.escape(line, "'")
+          system(%Q[echo '#{line}' | #{sudo_command}tee -a '#{escaped_conf_location}' >/dev/null])
+        end
+
+        after = File.open(conf_location).read
+        @logger.debug("After, dhcpd.conf content is #{after}")
+      end
+
+      def reload_configuration
+        # Per http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1026510
+
+        service_location = "/etc/rc.d/init.d/vmware"
+
+        restartCommand = [ "sudo", service_location, "restart" ].flatten
+        statusCommand    = [ "sudo", service_location, "status" ].flatten
+
+        Vagrant::Util::Subprocess.execute(*restartCommand)
+        r = Vagrant::Util::Subprocess.execute(*statusCommand)
+
+        if r.exit_code != 0
+          @ui.error("VMNet status exited with code #{r.exit_code} and output:\n#{r.stdout.chomp}")
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-vmware-dhcp/dhcp_manager/dhcp_manager_windows.rb

@@ -0,0 +1,78 @@
+require "log4r"
+require "digest"
+require "vagrant/util/shell_quote"
+require "vagrant/util/subprocess"
+
+# Someone who's had some sleep recently is welcome to come fill in comments here...
+module VagrantPlugins
+  module VagrantVmwareDhcp
+    class DhcpManagerWindows < DhcpManager
+
+      protected
+
+      def dhcpd_conf_location(network)
+        # Locations from https://pubs.vmware.com/workstation-9/index.jsp?topic=%2Fcom.vmware.ws.using.doc%2FGUID-04D783E1-3AB9-4D98-9891-2C58215905CC.html
+
+        if File.exist?('c:\ProgramData\VMware\vmnetdhcp.conf')
+          location = 'C:\ProgramData\VMware\vmnetdhcp.conf'
+        elsif File.exist?('C:\Documents and Settings\All Users\Application Data\VMware\vmnetdhcp.conf')
+          location = 'C:\Documents and Settings\All Users\Application Data\VMware\vmnetdhcp.conf'              
+        end
+
+        @logger.debug("Using dhcpd.conf at #{location}")
+
+        return location
+      end
+
+      def prune_configuration(network)
+        conf_location = dhcpd_conf_location(network)
+
+        mac = network[:mac]
+        ip = network[:ip]
+
+        before = File.open(conf_location).read
+        @logger.debug("Before altering, dhcpd.conf content is #{before}")
+
+        intermediate = before.gsub(/^# VAGRANT-BEGIN: #{mac}.*^# VAGRANT-END: #{mac}\s+/m, '')
+        after = intermediate.gsub(/^# VAGRANT-BEGIN: #{ip}.*^# VAGRANT-END: #{ip}\s+/m, '')
+
+        File.open(conf_location, "w") { |fd| fd.write(after) }
+
+        after = File.open(conf_location).read
+        @logger.debug("After altering, dhcpd.conf content is #{after}")
+      end
+
+      def write_configuration(network)
+        conf_location = dhcpd_conf_location(network)
+
+        section = get_dhcpd_section(network)
+
+        @logger.debug("DHCPD template for interface #{network[:vnet]} is #{section}")
+
+        before = File.open(conf_location).read
+        @logger.debug("Before altering, dhcpd.conf content is #{before}")
+
+        after = "#{before}\n\n#{section}\n"
+
+        File.open(conf_location, "w") { |fd| fd.write(after) }
+
+        after = File.open(conf_location).read
+        @logger.debug("After, dhcpd.conf content is #{after}")
+      end
+
+      def reload_configuration
+        # This is non-authoritative, but is the obvious solution and seems to work.
+
+        stopCommand = [ "NET", "STOP", "VMware DHCP Service" ]
+        startCommand = [ "NET", "START", "VMware DHCP Service" ]
+
+        Vagrant::Util::Subprocess.execute(*stopCommand)
+        r = Vagrant::Util::Subprocess.execute(*startCommand)
+
+        if r.exit_code != 0
+          @ui.error("VMNet dhcp start exited with code #{r.exit_code} and output:\n#{r.stdout.chomp}")
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-vmware-dhcp/plugin.rb

@@ -1,4 +1,5 @@
 require_relative "action"
+require_relative "dhcp"
 
 module VagrantPlugins
   module VagrantVmwareDhcp
@@ -13,26 +14,33 @@ module VagrantPlugins
         Config
       end
 
-      action_hook('DA VMWare Network: Configure MAC addresses') do |hook|
+      action_hook('DA VMware Network: Configure MAC addresses') do |hook|
         action = Vagrant::Action::Builtin::ConfigValidate
         hook.before(action, VagrantVmwareDhcp::Action::SetMac)
       end
 
-      action_hook('DA VMWare Network: Configure dhcp.conf') do |hook|
-        if defined?(ActionClass) and defined?(ConfigDhcpClass)
+      action_hook('DA VMware Network: Configure dhcp.conf') do |hook|
+        if defined?(ActionConfigure)
           # no-op
-        elsif Vagrant::Util::Platform.windows?
-          ConfigDhcpClass = VagrantVmwareDhcp::Action::ConfigDhcpWindows
-          ActionClass = HashiCorp::VagrantVMwareworkstation::Action::Network
-        elsif Vagrant::Util::Platform.linux?
-          ConfigDhcpClass = VagrantVmwareDhcp::Action::ConfigDhcpLinux
-          ActionClass = HashiCorp::VagrantVMwareworkstation::Action::Network
+        elsif Vagrant::Util::Platform.windows? or Vagrant::Util::Platform.linux?
+          ActionConfigure = HashiCorp::VagrantVMwareworkstation::Action::Network
         elsif Vagrant::Util::Platform.darwin?
-          ConfigDhcpClass = VagrantVmwareDhcp::Action::ConfigDhcpDarwin
-          ActionClass = HashiCorp::VagrantVMwarefusion::Action::Network
+          ActionConfigure = HashiCorp::VagrantVMwarefusion::Action::Network
         end
 
-        hook.after(ActionClass, ConfigDhcpClass)
+        hook.after(ActionConfigure, VagrantVmwareDhcp::Action::ConfigDhcp)
+      end
+
+      action_hook('DA VMware Network: Prune dhcp.conf') do |hook|
+        if defined?(ActionPrune)
+          # no-op
+        elsif Vagrant::Util::Platform.windows? or Vagrant::Util::Platform.linux?
+          ActionPrune = HashiCorp::VagrantVMwareworkstation::Action::Destroy
+        elsif Vagrant::Util::Platform.darwin?
+          ActionPrune = HashiCorp::VagrantVMwarefusion::Action::Destroy
+        end
+
+        hook.before(ActionPrune, VagrantVmwareDhcp::Action::PruneDhcp)
       end
 
       # action_hook(:init_i18n, :environment_load) { init_i18n }

data/lib/vagrant-vmware-dhcp/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VagrantVmwareDhcp
-    VERSION = '0.0.8'
+    VERSION = '0.0.9'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vmware-dhcp
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Israel Shirk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -54,11 +54,14 @@ files:
 - lib/vagrant-vmware-dhcp.rb
 - lib/vagrant-vmware-dhcp/action.rb
 - lib/vagrant-vmware-dhcp/action/config_dhcp.rb
-- lib/vagrant-vmware-dhcp/action/config_dhcp_darwin.rb
-- lib/vagrant-vmware-dhcp/action/config_dhcp_linux.rb
-- lib/vagrant-vmware-dhcp/action/config_dhcp_windows.rb
+- lib/vagrant-vmware-dhcp/action/prune_dhcp.rb
 - lib/vagrant-vmware-dhcp/action/set_mac.rb
 - lib/vagrant-vmware-dhcp/config.rb
+- lib/vagrant-vmware-dhcp/dhcp.rb
+- lib/vagrant-vmware-dhcp/dhcp_manager/dhcp_manager.rb
+- lib/vagrant-vmware-dhcp/dhcp_manager/dhcp_manager_darwin.rb
+- lib/vagrant-vmware-dhcp/dhcp_manager/dhcp_manager_linux.rb
+- lib/vagrant-vmware-dhcp/dhcp_manager/dhcp_manager_windows.rb
 - lib/vagrant-vmware-dhcp/plugin.rb
 - lib/vagrant-vmware-dhcp/version.rb
 - locales/en.yml

data/lib/vagrant-vmware-dhcp/action/config_dhcp_darwin.rb

@@ -1,106 +0,0 @@
-require "log4r"
-require "digest"
-
-# Someone who's had some sleep recently is welcome to come fill in comments here...
-module VagrantPlugins
-  module VagrantVmwareDhcp
-    module Action
-      class ConfigDhcpDarwin < ConfigDhcp
-
-        protected
-
-        def dhcpd_conf_location(network)
-          # Locations from https://pubs.vmware.com/workstation-9/index.jsp?topic=%2Fcom.vmware.ws.using.doc%2FGUID-04D783E1-3AB9-4D98-9891-2C58215905CC.html
-
-          location = "/Library/Preferences/VMware Fusion/#{network[:vnet]}/dhcpd.conf"
-
-          @logger.debug("Using dhcpd.conf at #{location}")
-
-          return location
-        end
-
-        def prune_dhcpd_conf(network)
-          conf_location = dhcpd_conf_location(network)
-          escaped_conf_location = Vagrant::Util::ShellQuote.escape(conf_location, "'")
-
-          mac = network[:mac]
-          ip = network[:ip]
-
-          before = File.open(conf_location).read
-          @logger.debug("Before altering, dhcpd.conf content is #{before}")
-
-          command = []
-          command << "sudo" if !File.writable?(conf_location)
-          command += [
-            "sed", "-E", "-e",
-            "/^# VAGRANT-BEGIN: #{mac}/," +
-            "/^# VAGRANT-END: #{mac}/ d",
-            "-ibak",
-            conf_location
-          ]
-
-          system(*command)
-
-          command = []
-          command << "sudo" if !File.writable?(conf_location)
-          command += [
-            "sed", "-E", "-e",
-            "/^# VAGRANT-BEGIN: #{ip}/," +
-            "/^# VAGRANT-END: #{ip}/ d",
-            "-ibak",
-            conf_location
-          ]
-
-          system(*command)
-
-          after = File.open(conf_location).read
-          @logger.debug("After, dhcpd.conf content is #{after}")
-        end
-
-        def write_dhcpd_conf(network)
-          conf_location = dhcpd_conf_location(network)
-          escaped_conf_location = Vagrant::Util::ShellQuote.escape(conf_location, "'")
-
-          sudo_command = ""
-          sudo_command = "sudo " if !File.writable?(conf_location)
-
-          output = get_dhcpd_section(network)
-
-          @logger.debug("DHCPD template for interface #{network[:vnet]} is #{output}")
-
-          before = File.open(conf_location).read
-          @logger.debug("Before altering, dhcpd.conf content is #{before}")
-
-          output.split("\n").each do |line|
-            line = Vagrant::Util::ShellQuote.escape(line, "'")
-            system(%Q[echo '#{line}' | #{sudo_command}tee -a '#{escaped_conf_location}' >/dev/null])
-          end
-
-          after = File.open(conf_location).read
-          @logger.debug("After, dhcpd.conf content is #{after}")
-        end
-
-        def trigger_dhcpd_update
-          # Per http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1026510
-
-          vmnet_cli = "/Applications/VMware Fusion.app/Contents/Library/vmnet-cli"
-
-          configureCommand = [ "sudo", vmnet_cli, "--configure" ].flatten
-          stopCommand      = [ "sudo", vmnet_cli, "--stop" ].flatten
-          startCommand     = [ "sudo", vmnet_cli, "--start" ].flatten
-          statusCommand    = [ "sudo", vmnet_cli, "--status" ].flatten
-
-          Vagrant::Util::Subprocess.execute(*configureCommand)
-          Vagrant::Util::Subprocess.execute(*stopCommand)
-          Vagrant::Util::Subprocess.execute(*startCommand)
-          r = Vagrant::Util::Subprocess.execute(*statusCommand)
-
-          if r.exit_code != 0
-            @env[:ui].error("VMNet status exited with code #{r.exit_code} and output:\n#{r.stdout.chomp}")
-          end
-
-        end
-      end
-    end
-  end
-end

data/lib/vagrant-vmware-dhcp/action/config_dhcp_linux.rb

@@ -1,106 +0,0 @@
-require "log4r"
-require "digest"
-
-# Someone who's had some sleep recently is welcome to come fill in comments here...
-module VagrantPlugins
-  module VagrantVmwareDhcp
-    module Action
-      class ConfigDhcpLinux < ConfigDhcp
-
-        protected
-
-        def dhcpd_conf_location(network)
-          # Locations from https://pubs.vmware.com/workstation-9/index.jsp?topic=%2Fcom.vmware.ws.using.doc%2FGUID-04D783E1-3AB9-4D98-9891-2C58215905CC.html
-
-          location = "/etc/vmware/#{network[:vnet]}/dhcp/dhcp.conf"
-
-          @logger.debug("Using dhcpd.conf at #{location}")
-
-          return location
-        end
-
-        def prune_dhcpd_conf(network)
-          conf_location = dhcpd_conf_location(network)
-          escaped_conf_location = Vagrant::Util::ShellQuote.escape(conf_location, "'")
-
-          mac = network[:mac]
-          ip = network[:ip]
-
-          before = File.open(conf_location).read
-          @logger.debug("Before altering, dhcpd.conf content is #{before}")
-
-          command = []
-          command << "sudo" if !File.writable?(conf_location)
-          command += [
-            "sed", "-E", "-e",
-            "/^# VAGRANT-BEGIN: #{mac}/," +
-            "/^# VAGRANT-END: #{mac}/ d",
-            "-ibak",
-            conf_location
-          ]
-
-          system(*command)
-
-          command = []
-          command << "sudo" if !File.writable?(conf_location)
-          command += [
-            "sed", "-E", "-e",
-            "/^# VAGRANT-BEGIN: #{ip}/," +
-            "/^# VAGRANT-END: #{ip}/ d",
-            "-ibak",
-            conf_location
-          ]
-
-          system(*command)
-
-          after = File.open(conf_location).read
-          @logger.debug("After, dhcpd.conf content is #{after}")
-        end
-
-        def write_dhcpd_conf(network)
-          conf_location = dhcpd_conf_location(network)
-          escaped_conf_location = Vagrant::Util::ShellQuote.escape(conf_location, "'")
-
-          sudo_command = ""
-          sudo_command = "sudo " if !File.writable?(conf_location)
-
-          output = get_dhcpd_section(network)
-
-          @logger.debug("DHCPD template for interface #{network[:vnet]} is #{output}")
-
-          before = File.open(conf_location).read
-          @logger.debug("Before altering, dhcpd.conf content is #{before}")
-
-          output.split("\n").each do |line|
-            line = Vagrant::Util::ShellQuote.escape(line, "'")
-            system(%Q[echo '#{line}' | #{sudo_command}tee -a '#{escaped_conf_location}' >/dev/null])
-          end
-
-          after = File.open(conf_location).read
-          @logger.debug("After, dhcpd.conf content is #{after}")
-        end
-
-        def trigger_dhcpd_update
-          # Per http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1026510
-
-          vmnet_cli = "/Applications/VMware Fusion.app/Contents/Library/vmnet-cli"
-
-          configureCommand = [ "sudo", vmnet_cli, "--configure" ].flatten
-          stopCommand      = [ "sudo", vmnet_cli, "--stop" ].flatten
-          startCommand     = [ "sudo", vmnet_cli, "--start" ].flatten
-          statusCommand    = [ "sudo", vmnet_cli, "--status" ].flatten
-
-          Vagrant::Util::Subprocess.execute(*configureCommand)
-          Vagrant::Util::Subprocess.execute(*stopCommand)
-          Vagrant::Util::Subprocess.execute(*startCommand)
-          r = Vagrant::Util::Subprocess.execute(*statusCommand)
-
-          if r.exit_code != 0
-            @env[:ui].error("VMNet status exited with code #{r.exit_code} and output:\n#{r.stdout.chomp}")
-          end
-
-        end
-      end
-    end
-  end
-end

data/lib/vagrant-vmware-dhcp/action/config_dhcp_windows.rb

@@ -1,79 +0,0 @@
-require "log4r"
-require "digest"
-
-# Someone who's had some sleep recently is welcome to come fill in comments here...
-module VagrantPlugins
-  module VagrantVmwareDhcp
-    module Action
-      class ConfigDhcpWindows < ConfigDhcp
-
-        protected
-
-        def dhcpd_conf_location(network)
-          # Locations from https://pubs.vmware.com/workstation-9/index.jsp?topic=%2Fcom.vmware.ws.using.doc%2FGUID-04D783E1-3AB9-4D98-9891-2C58215905CC.html
-
-          if File.exist?('c:\ProgramData\VMware\vmnetdhcp.conf')
-            location = 'C:\ProgramData\VMware\vmnetdhcp.conf'
-          elsif File.exist?('C:\Documents and Settings\All Users\Application Data\VMware\vmnetdhcp.conf')
-            location = 'C:\Documents and Settings\All Users\Application Data\VMware\vmnetdhcp.conf'              
-          end
-
-          @logger.debug("Using dhcpd.conf at #{location}")
-
-          return location
-        end
-
-        def prune_dhcpd_conf(network)
-          conf_location = dhcpd_conf_location(network)
-
-          mac = network[:mac]
-          ip = network[:ip]
-
-          before = File.open(conf_location).read
-          @logger.debug("Before altering, dhcpd.conf content is #{before}")
-
-          intermediate = before.gsub(/^# VAGRANT-BEGIN: #{mac}.*^# VAGRANT-END: #{mac}\s+/m, '')
-          after = intermediate.gsub(/^# VAGRANT-BEGIN: #{ip}.*^# VAGRANT-END: #{ip}\s+/m, '')
-
-          File.open(conf_location, "w") { |fd| fd.write(after) }
-
-          after = File.open(conf_location).read
-          @logger.debug("After altering, dhcpd.conf content is #{after}")
-        end
-
-        def write_dhcpd_conf(network)
-          conf_location = dhcpd_conf_location(network)
-
-          section = get_dhcpd_section(network)
-
-          @logger.debug("DHCPD template for interface #{network[:vnet]} is #{section}")
-
-          before = File.open(conf_location).read
-          @logger.debug("Before altering, dhcpd.conf content is #{before}")
-
-          after = "#{before}\n\n#{section}\n"
-
-          File.open(conf_location, "w") { |fd| fd.write(after) }
-
-          after = File.open(conf_location).read
-          @logger.debug("After, dhcpd.conf content is #{after}")
-        end
-
-        def trigger_dhcpd_update
-          # This is non-authoritative, but is the obvious solution and seems to work.
-
-          stopCommand = [ "NET", "STOP", "VMware DHCP Service" ]
-          startCommand = [ "NET", "START", "VMware DHCP Service" ]
-
-          Vagrant::Util::Subprocess.execute(*stopCommand)
-          r = Vagrant::Util::Subprocess.execute(*startCommand)
-
-          if r.exit_code != 0
-            @env[:ui].error("VMNet dhcp start exited with code #{r.exit_code} and output:\n#{r.stdout.chomp}")
-          end
-
-        end
-      end
-    end
-  end
-end