vagrant-windows 0.0.2 → 0.0.3

data/lib/vagrant-windows/guest/windows.rb

@@ -59,51 +59,34 @@ module Vagrant
       end
 
       def configure_networks(networks)
-        raise NotImplementedError, "Advanced Networking is not supported"
-        # First, remove any previous network modifications
-        # from the interface file.
-        #vm.channel.sudo("sed -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' /etc/network/interfaces > /tmp/vagrant-network-interfaces")
-        #vm.channel.sudo("su -c 'cat /tmp/vagrant-network-interfaces > /etc/network/interfaces'")
-        #vm.channel.sudo("rm /tmp/vagrant-network-interfaces")
-
-        # Accumulate the configurations to add to the interfaces file as
-        # well as what interfaces we're actually configuring since we use that
-        # later.
-        #interfaces = Set.new
-        #entries = []
-        #networks.each do |network|
-        #  interfaces.add(network[:interface])
-        #  entry = TemplateRenderer.render("guests/debian/network_#{network[:type]}",
-        #                                  :options => network)
-
-        #  entries << entry
-        #end
-
-        # Perform the careful dance necessary to reconfigure
-        # the network interfaces
-        #temp = Tempfile.new("vagrant")
-        #temp.binmode
-        #temp.write(entries.join("\n"))
-        #temp.close
-
-        #vm.channel.upload(temp.path, "/tmp/vagrant-network-entry")
-
-        # Bring down all the interfaces we're reconfiguring. By bringing down
-        # each specifically, we avoid reconfiguring eth0 (the NAT interface) so
-        # SSH never dies.
-        #interfaces.each do |interface|
-        #  vm.channel.sudo("/sbin/ifdown eth#{interface} 2> /dev/null")
-        #end
+        ### HACK!!!!! 
+        Nori.advanced_typecasting = false
+        if driver_mac_address = @vm.driver.read_mac_addresses
+          driver_mac_address = driver_mac_address.invert
+        end
 
-        #vm.channel.sudo("cat /tmp/vagrant-network-entry >> /etc/network/interfaces")
-        #vm.channel.sudo("rm /tmp/vagrant-network-entry")
+        vm_interface_map = {}
+        @vm.channel.session.wql("SELECT * FROM Win32_NetworkAdapter WHERE NetConnectionStatus=2")[:win32_network_adapter].each do |nic|
+          naked_mac = nic[:mac_address].gsub(':','')
+          if driver_mac_address[naked_mac]
+            vm_interface_map[driver_mac_address[naked_mac]] = { :name => nic[:net_connection_id], :mac_address => naked_mac, :index => nic[:interface_index] }
+          end
+        end
+        puts networks
+        puts vm_interface_map
+        networks.each do |network|
+          if network[:type].to_sym == :static
+              vm.channel.execute("netsh interface ip set address \"#{vm_interface_map[network[:interface]+1][:name]}\" static #{network[:ip]} #{network[:netmask]}")
+          elsif network[:type].to_sym == :dhcp
+            vm.channel.execute("netsh interface ip set address \"#{vm_interface_map[network[:interface]+1][:name]}\" dhcp")
+          end
+        end
 
-        # Bring back up each network interface, reconfigured
-        #interfaces.each do |interface|
-        #  vm.channel.sudo("/sbin/ifup eth#{interface}")
-        #end
+        #netsh interface ip set address name="Local Area Connection" static 192.168.0.100 255.255.255.0 192.168.0.1 1
+        
       end
 
+
       def windows_path(path)
         p = ''
         if path =~ /^\//

data/lib/vagrant-windows/monkey_patches/driver.rb

@@ -0,0 +1,42 @@
+require 'vagrant/driver/virtualbox_base'
+require 'vagrant/driver/virtualbox'
+
+
+module Vagrant
+  module Driver
+
+    class VirtualBox_4_1 < VirtualBoxBase
+      def read_mac_addresses
+        macs = {}
+        info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
+        info.split("\n").each do |line|
+          if matcher = /^macaddress(\d+)="(.+?)"$/.match(line)
+            adapter = matcher[1].to_i
+            mac = matcher[2].to_s
+            macs[adapter] = mac
+          end
+        end
+        macs 
+      end
+    end
+
+    class VirtualBox_4_0 < VirtualBoxBase
+      def read_mac_addresses
+        macs = {}
+        info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
+        info.split("\n").each do |line|
+          if matcher = /^macaddress(\d+)="(.+?)"$/.match(line)
+            adapter = matcher[1].to_i
+            mac = matcher[2].to_s
+            macs[adapter] = mac
+          end
+        end
+        macs 
+      end
+    end
+
+    class VirtualBox < VirtualBoxBase
+      def_delegator :@driver, :read_mac_addresses
+    end
+  end
+end

data/lib/vagrant-windows/version.rb

@@ -1,3 +1,3 @@
 module VagrantWindows
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/vagrant_init.rb

@@ -11,6 +11,9 @@ require 'vagrant-windows/communication/winrm'
 #Monkey Patch the VM object to support multiple channels
 require 'vagrant-windows/monkey_patches/vm'
 
+#Monkey Patch the driver to support returning a mapping of mac addresses to nics
+require 'vagrant-windows/monkey_patches/driver'
+
 require 'vagrant-windows/winrm'
 
 #Errors are good

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2012-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm
@@ -76,6 +76,7 @@ files:
 - lib/vagrant-windows/config/winrm.rb
 - lib/vagrant-windows/errors.rb
 - lib/vagrant-windows/guest/windows.rb
+- lib/vagrant-windows/monkey_patches/driver.rb
 - lib/vagrant-windows/monkey_patches/vm.rb
 - lib/vagrant-windows/scripts/command_alias.ps1
 - lib/vagrant-windows/scripts/mount_volume.ps1.erb