vagrant-azure 1.0.5 → 1.1.0

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

@@ -1,46 +1,47 @@
-#--------------------------------------------------------------------------
-# 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 ReadState
-        def initialize(app, env)
-          @app = app
-          @logger = Log4r::Logger.new('vagrant_azure::action::read_state')
-        end
-
-        def call(env)
-          env[:machine_state_id] = read_state(env)
-
-          @app.call(env)
-        end
-
-        def read_state(env)
-          env[:machine].id = "#{env[:machine].provider_config.vm_name}@#{env[:machine].provider_config.cloud_service_name}" unless env[:machine].id
-
-          env[:machine].id =~ /@/
-
-          env[:ui].info "Attempting to read state for #{$`} in #{$'}"
-
-          vm = env[:azure_vm_service].get_virtual_machine($`, $')
-
-          if vm.nil? || \
-            !vm.instance_of?(Azure::VirtualMachineManagement::VirtualMachine) || \
-            [ :DeletingVM ].include?(vm.status.to_sym)
-            # Machine can't be found
-            @logger.info 'Machine cannot be found'
-            env[:machine].id = nil
-            return :NotCreated
-          end
-
-          env[:ui].info "VM Status: #{vm.status.to_sym}"
-          return vm.status.to_sym
-        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 ReadState
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new('vagrant_azure::action::read_state')
+        end
+
+        def call(env)
+          env[:machine_state_id] = read_state(env)
+
+          @app.call(env)
+        end
+
+        def read_state(env)
+          env[:machine].id = "#{env[:machine].provider_config.vm_name}@#{env[:machine].provider_config.cloud_service_name}" unless env[:machine].id
+
+          env[:machine].id =~ /@/
+
+          env[:ui].info "Attempting to read state for #{$`} in #{$'}"
+
+          vm = env[:azure_vm_service].get_virtual_machine($`, $')
+
+          if vm.nil? || \
+            !vm.instance_of?(Azure::VirtualMachineManagement::VirtualMachine) || \
+            [ :DeletingVM ].include?(vm.status.to_sym)
+            # Machine can't be found
+            @logger.info 'Machine cannot be found'
+            env[:machine].id = nil
+            return :NotCreated
+          end
+
+          env[:ui].info "VM Status: #{vm.status.to_sym}"
+          return vm.status.to_sym
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,57 @@
+#--------------------------------------------------------------------------
+# 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 ReadWinrmInfo
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new('vagrant_azure::action::read_winrm_info')
+        end
+
+        def call(env)
+          if env[:machine].config.vm.guest == :windows
+            env[:ui].info 'Looking for WinRM'
+
+            env[:machine_winrm_info] = read_winrm_info(
+              env[:azure_vm_service],
+              env[:machine]
+            )
+
+            env[:ui].info "Found public port #{env[:machine_winrm_info][:port]}"
+          end
+
+          @app.call(env)
+        end
+
+        def read_winrm_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[:name] == 'PowerShell'
+              machine.config.winrm.host = "#{vm.cloud_service_name}.cloudapp.net"
+              machine.config.winrm.port = endpoint[:public_port]
+              return { :host => "#{vm.cloud_service_name}.cloudapp.net", :port => endpoint[:public_port] }
+            end
+          end
+
+          nil
+        end
+      end
+    end
+  end
+end

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

@@ -1,27 +1,28 @@
-#--------------------------------------------------------------------------
-# 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 RestartVM
-        def initialize(app, env)
-          @app = app
-          @logger = Log4r::Logger.new('vagrant_azure::action::restart_vm')
-        end
-
-        def call(env)
-          env[:machine].id =~ /@/
-
-          env[:ui].info "Restarting #{$`} in #{$'}"
-          env[:azure_vm_service].restart_virtual_machine($`, $')
-
-          @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 'log4r'
+
+module VagrantPlugins
+  module WinAzure
+    module Action
+      class RestartVM
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new('vagrant_azure::action::restart_vm')
+        end
+
+        def call(env)
+          env[:machine].id =~ /@/
+
+          env[:ui].info "Restarting #{$`} in #{$'}"
+          env[:azure_vm_service].restart_virtual_machine($`, $')
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -1,115 +1,123 @@
-#---------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the Apache 2.0 License.
-#--------------------------------------------------------------------------
-require 'log4r'
-require 'json'
-require 'azure'
-
-require 'vagrant/util/retryable'
-
-module VagrantPlugins
-  module WinAzure
-    module Action
-      class RunInstance
-        include Vagrant::Util::Retryable
-
-        def initialize(app, env)
-          @app = app
-          @logger = Log4r::Logger.new('vagrant_azure::action::run_instance')
-        end
-
-        def call(env)
-          config = env[:machine].provider_config
-
-          # Add the mandatory parameters and options
-          params = {
-            vm_name: config.vm_name,
-            vm_user: config.vm_user,
-            image: config.vm_image
-          }
-
-          options = {
-            cloud_service_name: config.cloud_service_name
-          }
-
-
-          # Add the optional parameters and options if not nil
-          params[:password] = config.vm_password unless config.vm_password.nil?
-          params[:location] = config.vm_location unless config.vm_location.nil?
-          params[:affinity_group] = config.vm_affinity_group unless \
-            config.vm_affinity_group.nil?
-
-          options[:storage_account_name] = config.storage_acct_name unless \
-            config.storage_acct_name.nil?
-          options[:deployment_name] = config.deployment_name unless \
-            config.deployment_name.nil?
-          options[:tcp_endpoints] = config.tcp_endpoints unless \
-            config.tcp_endpoints.nil?
-          options[:private_key_file] = config.ssh_private_key_file unless \
-            config.ssh_private_key_file.nil?
-          options[:certificate_file] = config.ssh_certificate_file unless \
-            config.ssh_certificate_file.nil?
-          options[:ssh_port] = config.ssh_port unless \
-            config.ssh_port.nil?
-          options[:vm_size] = config.vm_size unless \
-            config.vm_size.nil?
-          options[:winrm_transport] = config.winrm_transport unless \
-            config.winrm_transport.nil?
-          options[:winrm_http_port] = config.winrm_http_port unless \
-            config.winrm_http_port.nil?
-          options[:winrm_https_port] = config.winrm_https_port unless \
-            config.winrm_https_port.nil?
-          options[:availability_set_name] = config.availability_set_name unless \
-            config.availability_set_name.nil?
-
-          add_role = false
-
-          env[:ui].info(params.inspect)
-          env[:ui].info(options.inspect)
-
-          # Check if the cloud service exists and if yes, does it contain
-          # a deployment.
-          if config.cloud_service_name && !config.cloud_service_name.empty?
-            begin
-              cloud_service = ManagementHttpRequest.new(
-                :get,
-                "/services/hostedservices/#{config.cloud_service_name}?embed-detail=true"
-              ).call
-
-              deployments = cloud_service.css 'HostedService Deployments Deployment'
-
-              # Lets see if any deployments exist. Set add_role = true if yes.
-              # We're not worried about deployment slots, because the SDK has
-              # hard coded 'Production' as deployment slot and you can have only
-              # one deployment per deployment slot.
-              add_role = deployments.length == 1
-            rescue Exception => e
-              add_role = false
-            end
-          end
-          env[:ui].info("Add Role? - #{add_role}")
-
-          server = env[:azure_vm_service].create_virtual_machine(
-            params, options, add_role
-          )
-
-          if server.nil?
-            raise Errors::CreateVMFailure
-          end
-
-          # The Ruby SDK returns any exception encountered on create virtual
-          # machine as a string.
-
-          if server.instance_of? String
-            raise Errors::ServerNotCreated, message: server
-          end
-
-          env[:machine].id = "#{server.vm_name}@#{server.cloud_service_name}"
-
-          @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 'log4r'
+require 'json'
+require 'azure'
+
+require 'vagrant/util/retryable'
+
+module VagrantPlugins
+  module WinAzure
+    module Action
+      class RunInstance
+        include Vagrant::Util::Retryable
+
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new('vagrant_azure::action::run_instance')
+        end
+
+        def call(env)
+          config = env[:machine].provider_config
+
+          # Add the mandatory parameters and options
+          params = {
+            vm_name: config.vm_name,
+            vm_user: config.vm_user,
+            image: config.vm_image
+          }
+
+          options = {
+            cloud_service_name: config.cloud_service_name
+          }
+
+
+          # Add the optional parameters and options if not nil
+          params[:password] = config.vm_password unless config.vm_password.nil?
+          params[:location] = config.vm_location unless config.vm_location.nil?
+          params[:affinity_group] = config.vm_affinity_group unless \
+          config.vm_affinity_group.nil?
+
+          options[:storage_account_name] = config.storage_acct_name unless \
+          config.storage_acct_name.nil?
+          options[:deployment_name] = config.deployment_name unless \
+          config.deployment_name.nil?
+          options[:tcp_endpoints] = config.tcp_endpoints unless \
+            config.tcp_endpoints.nil?
+          options[:private_key_file] = config.private_key_file unless \
+            config.private_key_file.nil?
+          options[:certificate_file] = config.certificate_file unless \
+            config.certificate_file.nil?
+          options[:ssh_port] = config.ssh_port unless \
+          config.ssh_port.nil?
+          options[:vm_size] = config.vm_size unless \
+          config.vm_size.nil?
+          options[:winrm_transport] = config.winrm_transport unless \
+          config.winrm_transport.nil?
+          options[:winrm_http_port] = config.winrm_http_port unless \
+          config.winrm_http_port.nil?
+          options[:winrm_https_port] = config.winrm_https_port unless \
+          config.winrm_https_port.nil?
+          options[:availability_set_name] = config.availability_set_name unless \
+          config.availability_set_name.nil?
+          options[:vm_virtual_network_name] = config.vm_virtual_network_name unless \
+          config.vm_virtual_network_name.nil?
+
+          add_role = false
+
+          env[:ui].info(params.inspect)
+          env[:ui].info(options.inspect)
+
+          server = VagrantPlugins::WinAzure::CLOUD_SERVICE_SEMAPHORE.synchronize do
+            # Check if the cloud service exists and if yes, does it contain
+            # a deployment.
+            if config.cloud_service_name && !config.cloud_service_name.empty?
+              begin
+                cloud_service = ManagementHttpRequest.new(
+                  :get,
+                  "/services/hostedservices/#{config.cloud_service_name}?embed-detail=true"
+                ).call
+
+                deployments = cloud_service.css 'HostedService Deployments Deployment'
+
+                # Lets see if any deployments exist. Set add_role = true if yes.
+                # We're not worried about deployment slots, because the SDK has
+                # hard coded 'Production' as deployment slot and you can have only
+                # one deployment per deployment slot.
+                add_role = deployments.length == 1
+              rescue Exception => e
+                add_role = false
+              end
+            end
+
+            env[:ui].info("Add Role? - #{add_role}")
+
+            if add_role
+              env[:azure_vm_service].add_role(params.clone.merge(cloud_service_name: config.cloud_service_name), options)
+            else
+              env[:azure_vm_service].create_virtual_machine(params, options)
+            end
+          end
+
+          if server.nil?
+            raise Errors::CreateVMFailure
+          end
+
+          # The Ruby SDK returns any exception encountered on create virtual
+          # machine as a string.
+
+          if server.instance_of? String
+            raise Errors::ServerNotCreated, message: server
+          end
+
+          env[:machine].id = "#{server.vm_name}@#{server.cloud_service_name}"
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -1,35 +1,35 @@
-#--------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the Apache 2.0 License.
-#--------------------------------------------------------------------------
-require 'log4r'
-
-# require 'vagrant/util/retryable'
-
-# Barebones basic implemenation. This a work in progress in very early stages
-module VagrantPlugins
-  module WinAzure
-    module Action
-      # This starts a stopped instance
-      class StartInstance
-        # include Vagrant:Util::Retryable
-
-        def initialize(app, env)
-          @app = app
-          @logger = Log4r::Logger.new('vagrant_azure:action::start_instance')
-        end
-
-        def call(env)
-          env[:machine].id = "#{env[:machine].provider_config.vm_name}@#{env[:machine].provider_config.cloud_service_name}" unless env[:machine].id
-          env[:machine].id =~ /@/
-
-          env[:ui].info "Attempting to start '#{$`}' in '#{$'}'"
-
-          env[:azure_vm_service].start_virtual_machine($`, $')
-
-          @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 'log4r'
+
+# require 'vagrant/util/retryable'
+
+# Barebones basic implemenation. This a work in progress in very early stages
+module VagrantPlugins
+  module WinAzure
+    module Action
+      # This starts a stopped instance
+      class StartInstance
+
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new('vagrant_azure:action::start_instance')
+        end
+
+        def call(env)
+          env[:machine].id = "#{env[:machine].provider_config.vm_name}@#{env[:machine].provider_config.cloud_service_name}" unless env[:machine].id
+          env[:machine].id =~ /@/
+
+          VagrantPlugins::WinAzure::CLOUD_SERVICE_SEMAPHORE.synchronize do
+            env[:ui].info "Attempting to start '#{$`}' in '#{$'}'"
+            env[:azure_vm_service].start_virtual_machine($`, $')
+          end
+          @app.call(env)
+        end
+      end
+    end
+  end
+end