vagrant-vmware-dhcp 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a870444e4958940d62c99dc53976515823d5626
-  data.tar.gz: d794239606d79b0c19e9912f9d3c261b1aa25509
+  metadata.gz: 627b3ac504a958a623599945dd706121b4e4d558
+  data.tar.gz: 0167b871cbd3af221471245097e322d66eb9f12a
 SHA512:
-  metadata.gz: a01346653754d4e6109f1fe60b91bb3a0803d92d188a5e297c20d85a9c867d5e862cb1bc8afa4bebbe711b5b330d04714261d4defbca2fd8c7f1b462eb9b7d70
-  data.tar.gz: 440f762251a8db57d251439b2111bf4ed1c3eaff9f20398793616c847a1d92f752d04b0188c44e4f60f54c4cc8a47db51d5f8ce30245bbc2933eaab1d82e88a4
+  metadata.gz: c2fd55f82159162eada877583665ee6094d60e002f715018572c39c2e6599baa5092fa4ac3e1c09129e32f8647afcf86fb44b5c230d43a4926ca878be992d51b
+  data.tar.gz: 08b14de6bfc80cc1545c54779e77535cdeceaa7486f5b111d8e83878e1b081d10ea7e0019e49f3db3964626c594c80e42a5981b9e4621a35dd9ad1c3158e7f4e

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

@@ -16,10 +16,10 @@ module VagrantPlugins
           @env = env
 
           if @env[:machine]
-            @logger.info("In config_dhcp provider_name is #{@env[:machine].provider_name}")
+            @logger.debug("In config_dhcp provider_name is #{@env[:machine].provider_name}")
 
-            # or env[:machine].provider_name == :vmware_desktop
-            if @env[:machine].provider_name == :vmware_fusion
+            # or env[:machine].provider_name == :vmware_workstation
+            if @env[:machine].provider_name == :vmware_fusion or @env[:machine].provider_name == :vmware_workstation
               configure_dhcp
             end
           end
@@ -101,12 +101,6 @@ module VagrantPlugins
           network_map
         end
 
-        def guess_dhcpd_conf_location(network)
-          @logger.debug("Using dhcpd.conf at #{network[:vnet]}")
-          location = "/Library/Preferences/VMware Fusion/#{network[:vnet]}/dhcpd.conf"
-          return location
-        end
-
         def apply_static_dhcp_config(machine, network_map)
 
           network_map.each {
@@ -124,32 +118,7 @@ module VagrantPlugins
 
         end
 
-        def prune_dhcpd_conf(network)
-          conf_location = guess_dhcpd_conf_location(network)
-          escaped_conf_location = Vagrant::Util::ShellQuote.escape(conf_location, "'")
-
-          mac = network[:mac]
-
-          command = []
-          command << "sudo" if !File.writable?(conf_location)
-          command += [
-            "sed", "-E", "-e",
-            "/^# VAGRANT-BEGIN: #{mac}/," +
-            "/^# VAGRANT-END: #{mac}/ d",
-            "-ibak",
-            conf_location
-          ]
-
-          system(*command)
-        end
-
-        def write_dhcpd_conf(network)
-          conf_location = guess_dhcpd_conf_location(network)
-          escaped_conf_location = Vagrant::Util::ShellQuote.escape(conf_location, "'")
-
-          sudo_command = ""
-          sudo_command = "sudo " if !File.writable?(conf_location)
-
+        def get_dhcpd_section(network)
           netname = [network[:vnet], network[:ip].gsub(/\./, '_')].join('_')
 
           output = Vagrant::Util::TemplateRenderer.render('dhcpd_static',
@@ -159,41 +128,24 @@ module VagrantPlugins
                                            name: netname,
                                            template_root: VagrantPlugins::VagrantVmwareDhcp.source_root().join("templates")
                                            )
-
-          @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}")
+          return output
         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
+        # 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

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

@@ -0,0 +1,87 @@
+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]
+
+          command = []
+          command << "sudo" if !File.writable?(conf_location)
+          command += [
+            "sed", "-E", "-e",
+            "/^# VAGRANT-BEGIN: #{mac}/," +
+            "/^# VAGRANT-END: #{mac}/ d",
+            "-ibak",
+            conf_location
+          ]
+
+          system(*command)
+        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

@@ -0,0 +1,87 @@
+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]
+
+          command = []
+          command << "sudo" if !File.writable?(conf_location)
+          command += [
+            "sed", "-E", "-e",
+            "/^# VAGRANT-BEGIN: #{mac}/," +
+            "/^# VAGRANT-END: #{mac}/ d",
+            "-ibak",
+            conf_location
+          ]
+
+          system(*command)
+        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

@@ -0,0 +1,78 @@
+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]
+
+          before = File.open(conf_location).read
+
+          @logger.debug("Before altering, dhcpd.conf content is #{before}")
+
+          after = before.gsub(/^# VAGRANT-BEGIN: #{mac}.*^# VAGRANT-END: #{mac}\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

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

@@ -16,6 +16,10 @@ module VagrantPlugins
 
           machine = env[:machine]
 
+          # @env[:ui].error("Host is #{YAML::dump(env[:host].public_methods)}")
+
+          @env[:host].capability?("darwin")
+
           if machine
             set_mac_address(env)
           end

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

@@ -2,5 +2,8 @@ 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'
   end
 end

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

@@ -14,9 +14,21 @@ module VagrantPlugins
         hook.before(action, VagrantVmwareDhcp::Action::SetMac)
       end
 
+
+
+      if Vagrant::Util::Platform.windows?
+        ConfigDhcpClass = VagrantVmwareDhcp::Action::ConfigDhcpWindows
+        ActionClass = HashiCorp::VagrantVMwaredesktop::Action::Network
+      elsif Vagrant::Util::Platform.linux?
+        ConfigDhcpClass = VagrantVmwareDhcp::Action::ConfigDhcpLinux
+        ActionClass = HashiCorp::VagrantVMwaredesktop::Action::Network
+      elsif Vagrant::Util::Platform.darwin?
+        ConfigDhcpClass = VagrantVmwareDhcp::Action::ConfigDhcpDarwin
+        ActionClass = HashiCorp::VagrantVMwarefusion::Action::Network
+      end
+
       action_hook('DA VMWare Network: Configure dhcp.conf') do |hook|
-        action = HashiCorp::VagrantVMwarefusion::Action::Network
-        hook.after(action, VagrantVmwareDhcp::Action::ConfigDhcp)
+        hook.after(ActionClass, ConfigDhcpClass)
       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.2'
+    VERSION = '0.0.4'
   end
 end

data/shipit.sh

@@ -0,0 +1,9 @@
+rvm use 2.0.0@da-vmware-network --create
+
+rake build
+
+cp pkg/* ~/gemrepo/gems/
+(
+cd ~/gemrepo/gems
+gem generate_index
+)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vmware-dhcp
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Israel Shirk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -54,10 +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/set_mac.rb
 - lib/vagrant-vmware-dhcp/plugin.rb
 - lib/vagrant-vmware-dhcp/version.rb
 - locales/en.yml
+- shipit.sh
 - spec/spec_helper.rb
 - spec/vagrant/vmware/dhcp_spec.rb
 - templates/dhcpd_static.erb