lib/vagrant-windows/communication/guestnetwork.rb in vagrant-windows-1.7.0.pre.1 vs lib/vagrant-windows/communication/guestnetwork.rb in vagrant-windows-1.7.0.pre.2

@@ -10,17 +10,14 @@
     class GuestNetwork
       
       PS_GET_WSMAN_VER = '((test-wsman).productversion.split(" ") | select -last 1).split("\.")[0]'
       WQL_NET_ADAPTERS_V2 = 'SELECT * FROM Win32_NetworkAdapter WHERE MACAddress IS NOT NULL'
 
-      attr_reader :logger
-      attr_reader :winrmshell
-
-      def initialize(winrmshell)
-        @logger = Log4r::Logger.new("vagrant_windows::communication::winrmshell")
+      def initialize(communicator)
+        @logger = Log4r::Logger.new("vagrant_windows::communication::guestnetwork")
         @logger.debug("initializing WinRMShell")
-        @winrmshell = winrmshell
+        @communicator = communicator
       end
       
       # Returns an array of all NICs on the guest. Each array entry is a
       # Hash of the NICs properties.
       #
@@ -31,28 +28,28 @@
       
       # Checks to see if the specified NIC is currently configured for DHCP.
       #
       # @return [Boolean]
       def is_dhcp_enabled(nic_index)
-        has_dhcp_enabled = false
-        cmd = "Get-WmiObject -Class Win32_NetworkAdapterConfiguration -Filter \"Index=#{nic_index} and DHCPEnabled=True\""
-        @winrmshell.powershell(cmd) do |type, line|
-          has_dhcp_enabled = !line.nil?
-        end
-        @logger.debug("NIC #{nic_index} has DHCP enabled: #{has_dhcp_enabled}")
-        has_dhcp_enabled
+        cmd = <<-EOH
+          if (Get-WmiObject -Class Win32_NetworkAdapterConfiguration -Filter "Index=#{nic_index} and DHCPEnabled=True") {
+            exit 0
+          }
+          exit 1
+        EOH
+        @communicator.test(cmd)
       end
       
       # Configures the specified interface for DHCP
       #
       # @param [Integer] The interface index.
       # @param [String] The unique name of the NIC, such as 'Local Area Connection'.
       def configure_dhcp_interface(nic_index, net_connection_id)
         @logger.info("Configuring NIC #{net_connection_id} for DHCP")
         if !is_dhcp_enabled(nic_index)
           netsh = "netsh interface ip set address \"#{net_connection_id}\" dhcp"
-          @winrmshell.powershell(netsh)
+          @communicator.execute(netsh)
         end
       end
       
       # Configures the specified interface using a static address
       #
@@ -62,20 +59,20 @@
       # @param [String] The network mask to use with the static IP.
       def configure_static_interface(nic_index, net_connection_id, ip, netmask)
         @logger.info("Configuring NIC #{net_connection_id} using static ip #{ip}")
         #netsh interface ip set address "Local Area Connection 2" static 192.168.33.10 255.255.255.0
         netsh = "netsh interface ip set address \"#{net_connection_id}\" static #{ip} #{netmask}"
-        @winrmshell.powershell(netsh)
+        @communicator.execute(netsh)
       end
       
       # Sets all networks on the guest to 'Work Network' mode. This is
       # to allow guest access from the host via a private IP on Win7
       # https://github.com/WinRb/vagrant-windows/issues/63
       def set_all_networks_to_work()
         @logger.info("Setting all networks to 'Work Network'")
         command = VagrantWindows.load_script("set_work_network.ps1")
-        @winrmshell.powershell(command)
+        @communicator.execute(command)
       end
       
 
       protected
       
@@ -84,11 +81,11 @@
       #
       # @return [Integer]
       def wsman_version()
         @logger.debug("querying WSMan version")
         version = ''
-        @winrmshell.powershell(PS_GET_WSMAN_VER) do |type, line|
+        @communicator.execute(PS_GET_WSMAN_VER) do |type, line|
           version = version + "#{line}" if type == :stdout && !line.nil?
         end
         @logger.debug("wsman version: #{version}")
         Integer(version)
       end
@@ -100,11 +97,11 @@
       # @return [Array]
       def network_adapters_v2_winrm()
         @logger.debug("querying network adapters")
         # Get all NICs that have a MAC address
         # http://msdn.microsoft.com/en-us/library/windows/desktop/aa394216(v=vs.85).aspx
-        adapters = @winrmshell.wql(WQL_NET_ADAPTERS_V2)[:win32_network_adapter]
+        adapters = @communicator.execute(WQL_NET_ADAPTERS_V2, { :shell => :wql } )[:win32_network_adapter]
         @logger.debug("#{adapters.inspect}")
         return adapters
       end
       
       # Returns an array of all NICs on the guest. Each array entry is a
@@ -115,10 +112,10 @@
       #
       # @return [Array]
       def network_adapters_v3_winrm()
         winrs_v3_get_adapters_ps1 = VagrantWindows.load_script("winrs_v3_get_adapters.ps1")
         output = ''
-        @winrmshell.powershell(winrs_v3_get_adapters_ps1) do |type, line|
+        @communicator.execute(winrs_v3_get_adapters_ps1) do |type, line|
           output = output + "#{line}" if type == :stdout && !line.nil?
         end
         adapters = []
         JSON.parse(output).each do |nic|
           adapters << nic.inject({}){ |memo,(k,v)| memo[k.to_sym] = v; memo }