vagrant-azure 1.0.5 → 1.1.0

data/lib/vagrant-azure/action/connect_azure.rb

@@ -1,46 +1,49 @@
-#---------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the Apache 2.0 License.
-#--------------------------------------------------------------------------
-require 'azure'
-require 'log4r'
-
-# FIXME:
-# This is a required to patch few exception handling which are not done in
-# Azure Ruby SDK
-require_relative "vagrant_azure_service"
-
-module VagrantPlugins
-  module WinAzure
-    module Action
-      class ConnectAzure
-        def initialize(app, env)
-          @app = app
-          @logger = Log4r::Logger.new('vagrant_azure::action::connect_aws')
-        end
-
-        def call (env)
-          config = env[:machine].provider_config
-
-          Azure.configure do |c|
-            c.subscription_id                       = config.subscription_id
-            c.management_certificate                = config.mgmt_certificate
-            c.management_endpoint                   = config.mgmt_endpoint
-            c.storage_account_name                  = config.storage_acct_name
-            c.storage_access_key                    = config.storage_access_key
-          end
-
-          # FIXME:
-          # Defining a new class VagrantAzureService
-          # Here we call the native azure virtual machine management service method
-          # and add some exception handling.
-          # Remove this once the Azure SDK adds the exception handling for the
-          # methods defined in VagrantAzureService
-          env[:azure_vm_service] = VagrantAzureService.new(Azure::VirtualMachineManagementService.new)
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end
+#---------------------------------------------------------------------------
+# Copyright (c) Microsoft Open Technologies, Inc.
+# All Rights Reserved.  Licensed under the Apache License, Version 2.0.
+# See License.txt in the project root for license information.
+#--------------------------------------------------------------------------
+require 'azure'
+require 'log4r'
+
+# FIXME:
+# This is a required to patch few exception handling which are not done in
+# Azure Ruby SDK
+require_relative "vagrant_azure_service"
+
+module VagrantPlugins
+  module WinAzure
+    module Action
+      class ConnectAzure
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new('vagrant_azure::action::connect_aws')
+        end
+
+        def call (env)
+          if env[:azure_vm_service].nil?
+            config = env[:machine].provider_config
+
+            Azure.configure do |c|
+              c.subscription_id                       = config.subscription_id
+              c.management_certificate                = config.mgmt_certificate
+              c.management_endpoint                   = config.mgmt_endpoint
+              c.storage_account_name                  = config.storage_acct_name
+              c.storage_access_key                    = config.storage_access_key
+            end
+
+            # FIXME:
+            # Defining a new class VagrantAzureService
+            # Here we call the native azure virtual machine management service method
+            # and add some exception handling.
+            # Remove this once the Azure SDK adds the exception handling for the
+            # methods defined in VagrantAzureService
+            env[:azure_vm_service] = VagrantAzureService.new(Azure::VirtualMachineManagementService.new)
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-azure/action/os_type.rb

@@ -0,0 +1,34 @@
+#--------------------------------------------------------------------------
+# Copyright (c) Microsoft Open Technologies, Inc.
+# All Rights Reserved.  Licensed under the Apache License, Version 2.0.
+# See License.txt in the project root for license information.
+#--------------------------------------------------------------------------
+require 'log4r'
+
+module VagrantPlugins
+  module WinAzure
+    module Action
+      class OSType
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new('vagrant_azure::action::os_type')
+        end
+
+        def call(env)
+
+          unless env[:machine].config.vm.guest
+            env[:ui].info 'Determining OS Type By Image'
+            guest_os_type = env[:azure_vm_service].send(:get_os_type, env[:machine].provider_config.vm_image)
+            env[:machine].config.vm.guest = guest_os_type && guest_os_type.downcase.to_sym
+            if env[:machine].config.vm.guest == :windows && env[:machine].config.vm.communicator.nil?
+              env[:machine].config.vm.communicator = :winrm
+            end
+            env[:ui].info "OS Type is #{guest_os_type}"
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-azure/action/powershell_run.rb

@@ -0,0 +1,28 @@
+module VagrantPlugins
+  module WinAzure
+    module Action
+      class PowerShellRun
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new('vagrant_azure::action::powershell_run_command')
+        end
+
+        def call(env)
+
+          if env[:machine].communicate.ready?
+            env[:machine].ui.detail("PowerShell Executing: #{env[:powershell_command]}")
+            env[:powershell_command_exit_status] = env[:machine].communicate.execute(env[:powershell_command]) do |type, stream|
+              if type == :stdout
+                env[:machine].ui.success(stream) unless (stream || '').chomp.empty?
+              else
+                env[:machine].ui.error(stream) unless (stream || '').chomp.empty?
+              end
+            end
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-azure/action/provision.rb

@@ -1,49 +1,42 @@
-#---------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the Apache 2.0 License.
-#---------------------------------------------------------------------------
-
-module VagrantPlugins
-  module WinAzure
-    module Action
-      class Provision < Vagrant::Action::Builtin::Provision
-        # Override the core vagrant method and branch out for windows
-        def run_provisioner(env)
-          env[:ui].info "Provisioner: #{env[:provisioner].class.to_s}"
-
-          env[:machine].id =~ /@/
-          vm = env[:azure_vm_service].get_virtual_machine($`, $')
-          env[:ui].info "VM OS: #{vm.os_type.to_sym}"
-
-          if vm.os_type.to_sym == :Windows
-            # Raise an error if we're not on a Windows Host.
-            # Non-Windows OS will be supported once we move to WinRb/WinRm
-            env[:ui].info "Is Host OS Windows?: #{Vagrant::Util::Platform.windows?}"
-            raise 'Unsupported OS for Windows Provisioning' unless \
-              Vagrant::Util::Platform.windows?
-            env[:ui].info "Provisioning for Windows"
-
-            # TODO: Add Shell, Chef-solo and other provisioners
-            case env[:provisioner].class.to_s
-            when "VagrantPlugins::Shell::Provisioner"
-              VagrantPlugins::WinAzure::Provisioner::Shell.new(
-                env
-              ).provision_for_windows
-            when "VagrantPlugins::Puppet::Provisioner::Puppet"
-              VagrantPlugins::WinAzure::Provisioner::Puppet.new(
-                env
-              ).provision_for_windows
-            when "VagrantPlugins::Chef::Provisioner::ChefSolo"
-              VagrantPlugins::WinAzure::Provisioner::ChefSolo.new(
-                env
-              ).provision_for_windows
-            end
-          else
-            env[:ui].info "Provisioning using SSH"
-            env[:provisioner].provision
-          end
-        end
-      end
-    end
-  end
-end
+#---------------------------------------------------------------------------
+# Copyright (c) Microsoft Open Technologies, Inc.
+# All Rights Reserved.  Licensed under the Apache License, Version 2.0.
+# See License.txt in the project root for license information.
+#---------------------------------------------------------------------------
+
+module VagrantPlugins
+  module WinAzure
+    module Action
+      class Provision < Vagrant::Action::Builtin::Provision
+        # Override the core vagrant method and branch out for windows
+        def run_provisioner(env)
+          env[:machine].id =~ /@/
+          vm = env[:azure_vm_service].get_virtual_machine($`, $')
+          env[:ui].info "VM OS: #{vm.os_type.to_sym}"
+
+          if vm.os_type.to_sym == :Windows
+            env[:ui].info 'Provisioning for Windows'
+
+            case env[:provisioner].class.to_s
+              when 'VagrantPlugins::Shell::Provisioner'
+                env[:provisioner].provision
+              when 'VagrantPlugins::Puppet::Provisioner::Puppet'
+                VagrantPlugins::WinAzure::Provisioner::Puppet.new(
+                    env
+                ).provision_for_windows
+              when 'VagrantPlugins::Chef::Provisioner::ChefSolo'
+                VagrantPlugins::WinAzure::Provisioner::ChefSolo.new(
+                    env
+                ).provision_for_windows
+              else
+                env[:provisioner].provision
+            end
+          else
+            env[:ui].info 'Provisioning using SSH'
+            env[:provisioner].provision
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-azure/action/rdp.rb

@@ -1,62 +1,63 @@
-#--------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the Apache 2.0 License.
-#--------------------------------------------------------------------------
-require 'log4r'
-require 'pathname'
-require 'vagrant/util/subprocess'
-require 'vagrant/util/platform'
-
-module VagrantPlugins
-  module WinAzure
-    module Action
-      class Rdp
-        def initialize(app, env)
-          @app = app
-          @logger = Log4r::Logger.new('vagrant_azure::action::rdp')
-          @rdp_file = 'machine.rdp'
-        end
-
-        def call(env)
-          if Vagrant::Util::Platform.windows?
-            generate_rdp_file env[:machine]
-            command = ['mstsc', @rdp_file]
-            Vagrant::Util::Subprocess.execute(*command)
-          elsif Vagrant::Util::Platform.darwin?
-            generate_rdp_file env[:machine]
-            command = ['open', @rdp_file]
-            result = Vagrant::Util::Subprocess.execute(*command)
-
-            if result.exit_code == 1
-              raise result.stderr
-            end
-          else
-            # TODO: Add support for RDP on *Nix systems
-            raise 'Unsupported operating system for RDP operation.'
-          end
-
-          @app.call(env)
-        end
-
-        def generate_rdp_file(machine)
-          File.delete(@rdp_file) if File.exists?(@rdp_file)
-
-          info = machine.provider.rdp_info
-
-          rdp_options = {
-            'drivestoredirect:s' => '*',
-            'username:s' => machine.provider_config.vm_user,
-            'prompt for credentials:i' => '1',
-            'full address:s' => "#{info[:host]}:#{info[:port]}"
-          }
-
-          file = File.open(@rdp_file, 'w')
-          rdp_options.each do |key, value|
-            file.puts "#{key}:#{value}"
-          end
-          file.close
-        end
-      end
-    end
-  end
-end
+#--------------------------------------------------------------------------
+# Copyright (c) Microsoft Open Technologies, Inc.
+# All Rights Reserved.  Licensed under the Apache License, Version 2.0.
+# See License.txt in the project root for license information.
+#--------------------------------------------------------------------------
+require 'log4r'
+require 'pathname'
+require 'vagrant/util/subprocess'
+require 'vagrant/util/platform'
+
+module VagrantPlugins
+  module WinAzure
+    module Action
+      class Rdp
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new('vagrant_azure::action::rdp')
+          @rdp_file = 'machine.rdp'
+        end
+
+        def call(env)
+          if Vagrant::Util::Platform.windows?
+            generate_rdp_file env[:machine]
+            command = ['mstsc', @rdp_file]
+            Vagrant::Util::Subprocess.execute(*command)
+          elsif Vagrant::Util::Platform.darwin?
+            generate_rdp_file env[:machine]
+            command = ['open', @rdp_file]
+            result = Vagrant::Util::Subprocess.execute(*command)
+
+            if result.exit_code == 1
+              raise result.stderr
+            end
+          else
+            # TODO: Add support for RDP on *Nix systems
+            raise 'Unsupported operating system for RDP operation.'
+          end
+
+          @app.call(env)
+        end
+
+        def generate_rdp_file(machine)
+          File.delete(@rdp_file) if File.exists?(@rdp_file)
+
+          info = machine.provider.rdp_info
+
+          rdp_options = {
+            'drivestoredirect:s' => '*',
+            'username:s' => machine.provider_config.vm_user,
+            'prompt for credentials:i' => '1',
+            'full address:s' => "#{info[:host]}:#{info[:port]}"
+          }
+
+          file = File.open(@rdp_file, 'w')
+          rdp_options.each do |key, value|
+            file.puts "#{key}:#{value}"
+          end
+          file.close
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-azure/action/read_ssh_info.rb

@@ -1,51 +1,54 @@
-#--------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the Apache 2.0 License.
-#--------------------------------------------------------------------------
-require 'log4r'
-
-module VagrantPlugins
-  module WinAzure
-    module Action
-      class ReadSSHInfo
-        def initialize(app, env, port = 22)
-          @app = app
-          @port = port
-          @logger = Log4r::Logger.new('vagrant_azure::action::read_ssh_info')
-        end
-
-        def call(env)
-          env[:ui].info "Looking for #{@port}"
-
-          env[:machine_ssh_info] = read_ssh_info(
-            env[:azure_vm_service],
-            env[:machine]
-          )
-
-          @app.call(env)
-        end
-
-        def read_ssh_info(azure, machine)
-          return nil if machine.id.nil?
-          machine.id =~ /@/
-          vm = azure.get_virtual_machine($`, $')
-
-          if vm.nil? || !vm.instance_of?(Azure::VirtualMachineManagement::VirtualMachine)
-            # Machine cannot be found
-            @logger.info 'Machine not found. Assuming it was destroyed'
-            machine.id = nil
-            return nil
-          end
-
-          vm.tcp_endpoints.each do |endpoint|
-            if endpoint[:local_port] == "#{@port}"
-              return { :host => "#{vm.cloud_service_name}.cloudapp.net", :port => endpoint[:public_port] }
-            end
-          end
-
-          return nil
-        end
-      end
-    end
-  end
-end
+#--------------------------------------------------------------------------
+# Copyright (c) Microsoft Open Technologies, Inc.
+# All Rights Reserved.  Licensed under the Apache License, Version 2.0.
+# See License.txt in the project root for license information.
+#--------------------------------------------------------------------------
+require 'log4r'
+
+module VagrantPlugins
+  module WinAzure
+    module Action
+      class ReadSSHInfo
+        def initialize(app, env, port = 22)
+          @app = app
+          @port = port
+          @logger = Log4r::Logger.new('vagrant_azure::action::read_ssh_info')
+        end
+
+        def call(env)
+          env[:ui].info "Looking for local port #{@port}"
+
+          env[:machine_ssh_info] = read_ssh_info(
+            env[:azure_vm_service],
+            env[:machine]
+          )
+
+          env[:ui].info "Found port mapping #{env[:machine_ssh_info][:port]} --> #{@port}"
+
+          @app.call(env)
+        end
+
+        def read_ssh_info(azure, machine)
+          return nil if machine.id.nil?
+          machine.id =~ /@/
+          vm = azure.get_virtual_machine($`, $')
+
+          if vm.nil? || !vm.instance_of?(Azure::VirtualMachineManagement::VirtualMachine)
+            # Machine cannot be found
+            @logger.info 'Machine not found. Assuming it was destroyed'
+            machine.id = nil
+            return nil
+          end
+
+          vm.tcp_endpoints.each do |endpoint|
+            if endpoint[:local_port] == "#{@port}"
+              return { :host => "#{vm.cloud_service_name}.cloudapp.net", :port => endpoint[:public_port] }
+            end
+          end
+
+          return nil
+        end
+      end
+    end
+  end
+end