vagrant-azure 1.3.0 → 2.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3018a28257bdcc80821fc0dc9b6e290fe2b0d79d
-  data.tar.gz: 60f16bba7743198062f51d3bb03a570f81e5eb4a
+  metadata.gz: f5597d47adf91f7395f8b3bec4ab45ca51218f47
+  data.tar.gz: cb149fbf31e95c1657581e0e213e31bf65c2a63f
 SHA512:
-  metadata.gz: 44b0eafc536da864f46dfb2dd75d9e6bd56348c672b30e2fbbbeaab1ed55f93ecf438c555b7de31873233b912179f5d0735bde5fcdc8003bb0c751551be9ed6a
-  data.tar.gz: bb14c60621a2608026f32ab19f6fe99b5cd5b48f70af961a37ebd1fe672f23fad979ce57d9a9767527d686a0bf1ad4d75318d0f795465eec9dfcc00a39591c62
+  metadata.gz: 1429363e9a70658d9960c7ba9689e8be3fea33ae6a5d4d21731c31d84af5f8d278f7617be87ebab4cd40ec1502a7db32d120dc9b40de32fd766d92bd30376d1b
+  data.tar.gz: 7d32bd43eed9cedd13938d10f4fe0665330cf03b3698cadbda007c9e0e615f9953d3a1e15bb67b7250f51baa53aae464b4f8a6c3939a01b174e9983e2bd922ab

data/.gitignore

@@ -17,3 +17,4 @@ modules/
 *.pem
 .ruby-version
 *.ps1
+.env

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/Gemfile

@@ -1,8 +1,6 @@
-#--------------------------------------------------------------------------
-# 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.
-#--------------------------------------------------------------------------
+# encoding: utf-8
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License in the project root for license information.
 
 source 'https://rubygems.org'
 
@@ -12,7 +10,8 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.7.3'
+  gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.7.4'
+  gem 'dotenv'
 end
 
 group :plugins do

data/LICENSE

@@ -1,4 +1,21 @@
-       Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use these files except in compliance with the License. You may obtain a copy of the License at
-                                 http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+The MIT License (MIT)
+
+Copyright (c) 2015 Microsoft
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -12,7 +12,7 @@ Install Vagrant 1.7.3 or higher - [Download Vagrant](http://www.vagrantup.com/do
 Install the vagrant-azure plugin using the standard Vagrant 1.1+ installation methods. After installing the plugin, you can ```vagrant up``` and use ```azure``` provider. For example:
 
 ```
-C:\> vagrant plugin install vagrant-azure
+C:\> vagrant plugin install vagrant-azure 2.0.0.pre1
 ...
 C:\> vagrant up --provider=azure
 ...
@@ -25,7 +25,7 @@ You'll need an ```azure``` box before you can do ```vagrant up``` though.
 You can use the dummy box and specify all the required details manually in the ```config.vm.provider``` block in your ```Vagrantfile```. Add the dummy box with the name you want:
 
 ```
-C:\> vagrant box add azure https://github.com/msopentech/vagrant-azure/raw/master/dummy.box
+C:\> vagrant box add azure https://github.com/azure/vagrant-azure/raw/v2.0/dummy.box
 ...
 ```
 
@@ -33,37 +33,22 @@ Now edit your ```Vagrantfile``` as shown below and provide all the values as exp
 
 ```ruby
 Vagrant.configure('2') do |config|
-	config.vm.box = 'azure'
-	
-	config.vm.provider :azure do |azure, override|
-		# Mandatory Settings 
-		azure.mgmt_certificate = 'YOUR AZURE MANAGEMENT CERTIFICATE'
-		azure.mgmt_endpoint = 'https://management.core.windows.net'
-		azure.subscription_id = 'YOUR AZURE SUBSCRIPTION ID'
-		azure.vm_image = 'NAME OF THE IMAGE TO USE'
-		azure.vm_name = 'PROVIDE A NAME FOR YOUR VIRTUAL MACHINE' # max 15 characters. contains letters, number and hyphens. can start with letters and can end with letters and numbers
-		
-		# vm_password is optional when specifying the private_key_file with Linux VMs
-		# When building a Windows VM and using WinRM this setting is used to authenticate via WinRM (PowerShell Remoting)
-		azure.vm_password = 'PROVIDE A VALID PASSWORD' # min 8 characters. should contain a lower case letter, an uppercase letter, a number and a special character
-		
-		# Optional Settings
-		azure.storage_acct_name = 'NAME OF YOUR STORAGE ACCOUNT' # optional. A new one will be generated if not provided.
-		azure.vm_user = 'PROVIDE A USERNAME' # defaults to 'vagrant' if not provided
-		azure.cloud_service_name = 'PROVIDE A NAME FOR YOUR CLOUD SERVICE' # same as vm_name. leave blank to auto-generate
-		azure.deployment_name = 'PROVIDE A NAME FOR YOUR DEPLOYMENT' # defaults to cloud_service_name
-	    azure.vm_location = 'PROVIDE A LOCATION FOR VM' # e.g., West US
-		
-		# Optional *Nix Settings
-		azure.ssh_port = 'A VALID PUBLIC PORT' # defaults to 22
-		azure.private_key_file = 'Path to your ssh private key file (~/.ssh/id_rsa) to use for passwordless auth. If the id_rsa file is password protected, you will be prompted for the password.'
-	
-		# Optional Windows Settings
-		azure.winrm_transport = [ 'http', 'https' ] # this will open up winrm ports on both http (5985) and http (5986) ports
-		azure.winrm_https_port = 'A VALID PUBLIC PORT' # customize the winrm https port, instead of 5986
-		azure.winrm_http_port = 'A VALID PUBLIC PORT' # customize the winrm http port, insted of 5985
-		azure.tcp_endpoints = '3389:53389' # opens the Remote Desktop internal port that listens on public port 53389. Without this, you cannot RDP to a Windows VM.
-	end
+  config.vm.box = 'azure'
+
+  # use local ssh key to connect to remote vagrant box
+  config.ssh.private_key_path = '~/.ssh/id_rsa'
+  config.vm.provider :azure do |azure, override|
+
+    # use Azure Active Directory Application / Service Principal to connect to Azure
+    # see: https://azure.microsoft.com/en-us/documentation/articles/resource-group-create-service-principal-portal/
+
+    # each of the below values will default to use the env vars named as below if not specified explicitly
+    azure.tenant_id = ENV['AZURE_TENANT_ID']
+    azure.client_id = ENV['AZURE_CLIENT_ID']
+    azure.client_secret = ENV['AZURE_CLIENT_SECRET']
+    azure.subscription_id = ENV['AZURE_SUBSCRIPTION_ID']
+  end
+
 end
 ```
 
@@ -77,11 +62,11 @@ This will bring up an Azure VM as per the configuration options set above.
 
 You can now either SSH (if its a *Nix VM) using ```vagrant ssh```, RDP (if its a Windows VM) using ```vagrant rdp``` or PowerShell ```vagrant powershell```.
 
-Normally, a lot of this options, e.g., ```vm_image```, will be embedded in a box file and you just have to provide minimal options in the ```Vagrantfile```. Since, we're using a dummy box, there are no pre-configured defaults.
+Normally, a lot of this options, e.g., ```vm_image_urn```, will be embedded in a box file and you just have to provide minimal options in the ```Vagrantfile```. Since, we're using a dummy box, there are no pre-configured defaults.
 
 ## Azure Boxes
 
-The vagrant-azure plugin provides the ability to use ```Azure``` boxes with Vagrant. Please see the example box provided in [example_box/ directory](https://github.com/msopentech/vagrant-azure/tree/master/example_box) and follow the instructions there to build an ```azure``` box.
+The vagrant-azure plugin provides the ability to use ```Azure``` boxes with Vagrant. Please see the example box provided in [example_box/ directory](https://github.com/azure/vagrant-azure/tree/v2.0/example_box) and follow the instructions there to build an ```azure``` box.
 
 Please see [Vagrant Docs](http://docs.vagrantup.com/v2/) for more details.
 
@@ -91,148 +76,21 @@ The vagrant-azure provide exposes a few Azure specific configuration options:
 
 ### Mandatory
 
-* `mgmt_certificate` - Your Azure Management certificate which has been uploaded to the Azure portal for your account. Provide [PEM file path](#pem-generation), PFX file path or raw string.
-* `mgmt_endpoint` - Azure Management endpoint. `https://management.core.windows.net`
-* `subscription_id` - Your Azure Subscription ID.
-* `storage_acct_name` - The Storage account to use when creating VMs.
-* `vm_name` - The name of the created VM.
+For instructions on how to setup an Azure Active Directory Application see: https://azure.microsoft.com/en-us/documentation/articles/resource-group-create-service-principal-portal/
+* `tenant_id`: Your Azure Active Directory Tenant Id.
+* `client_id`: Your Azure Active Directory application client id.
+* `client_secret`: Your Azure Active Directory application client secret.
+* `subscription_id`: The Azure subscription Id you'd like to use.
 
 ### Optional
-
-* `vm_user` - The username to create the VM with. Defaults to `vagrant`.
-* `vm_password` - The password to set for the user created with the VM. This will override the private_key_file setting.
-* `vm_image` - The name of the image to be used when creating the VM.
-* `vm_size` - The size of the created VM. Use an of the Azure VM Sizes.
-* `vm_virtual_network_name` - The name of a virtual network to connect to
-* `cloud_service_name` - The name of the cloud service under which to create the VM.
-* `deployment_name` - The name to give the deployment in the cloud service and add the VM to.
-* `vm_location` - The location to create the cloud service, storage account.
-* `private_key_file` - The private key file to use for SSH (~/.ssh/id_rsa) or a [PEM file](#pem-generation).
-* `ssh_port` - To map the internal SSH port 22 to a different public port.
-* `winrm_transport` - Enables or disables WinRm. Allowed values are `http` and `https`.
-* `winrm_https_port` To map the internal WinRM https port 5986 to a different public port. Must be non-empty.
-* `winrm_http_port` To map the internal WinRM http port 5985 to a different public port. Must be non-empty.
-* `tcp_endpoints` - To open any additional ports. E.g., `80` opens port `80` and `80,3389:53389` opens port `80` and `3389`. Also maps the interal port `3389` to public port `53389`
-
-### Certificate Generation on Windows
-We will use `makecert.exe` distributed as part of the in the Windows 7 SDK.  The following commands will create the required certificate and insert it into the current user’s personal store.
-
-```
-makecert.exe -r -pe -a sha1 -n "CN=AzCert" -ss My -sr CurrentUser -len 2048 -sky exchange -sp "Microsoft Enhanced RSA and AES Cryptographic Provider" -sy 24
-```
-
-(In order to have more details with images in Windows)[http://blogs.msdn.com/b/cclayton/archive/2012/03/21/windows-azure-and-x509-certificates.aspx]
-
-### Get Started with Publish Settings
-
-To create a pfx from the publishsettings, simply download the publishsettings file for your subscription 
-[https://manage.windowsazure.com/publishsettings](https://manage.windowsazure.com/publishsettings/index?client=powershell). Make sure you have the [Ruby Azure](https://rubygems.org/gems/azure/versions/0.7.0) gem installed and run `pfxer --in [path to your .publishsettings file]`. This will create a .pfx from your publish settings file which can be supplied as a cert parameter for Service Management Commands.
-
-### Get Started with OpenSSL
-
-* Using the following openssl commands to create a cert and upload to Azure Management
-  * Generate public and private `openssl req -x509 -nodes -days 365 -newkey rsa:1024 -keyout cert.pem -out cert.pem`
-  * Generate public .cer for Azure upload `openssl x509 -inform pem -in cert.pem -outform der -out mgmt.cer`
-  * Upload the `mgmt.cer` to Azure Management through [https://management.azure.com](https://management.azure.com)
-  * Use cert.pem as your cert parameter for Service Management Commands.
-
-### Using your .pem certificate
-
-Vagrant-Azure expects you to use a .pem management certificate as shown below:
-
-```ruby
-Vagrant.configure('2') do |config|
-	config.vm.box = 'azure'
-
-	config.vm.provider :azure do |azure|
-		azure.mgmt_certificate = "#{file_location_of_your_dot_pem}"
-```
-
-## Create Virtual Network
-
-In order to use vagrant-azure's `vm_virtual_network_name` support, create virtual networks using
-[Azure's Command Line Interface](http://azure.microsoft.com/en-us/documentation/articles/virtual-machines-command-line-tools/):
-
-    azure account download
-    azure network vnet create --vnet "vnet-name" --location "West US" --create-new-affinity-group
-
-
-## New Commands for `azure` provider
-
-The `azure` provider introduces the following new `vagrant` commands.
-
-* `rdp` - To connect to a Windows VM using RDP. E.g.,
-* `powershell` - To execute remote powershell commands on a Windows VM using WinRM. 
-```
-> vagrant up --provider=azure
-...
-> vagrant rdp
-...
-> vagrant powershell
-```
-
-
-## Multi Machine
-The options for multi machines are similar to Vagrant, please refer to the vagrant doc at http://docs.vagrantup.com/v2/multi-machine/index.html
-
-Example Multi Machine Vagrantfile (for building out 3 Windows Virtual Machines)
-
-```ruby
-
-Vagrant.configure('2') do |config|
-  config.vm.boot_timeout = 1000
-
-  do_common_azure_stuff = Proc.new do |azure, override|
-		override.config.vm.box = 'azure'
-
-		azure.mgmt_certificate = 'YOUR AZURE MANAGEMENT CERTIFICATE'
-		azure.mgmt_endpoint = 'https://management.core.windows.net'
-		azure.subscription_id = 'YOUR AZURE SUBSCRIPTION ID'
-		azure.storage_acct_name = 'NAME OF YOUR STORAGE ACCOUNT' # optional. A new one will be generated if not provided.
-
-		azure.vm_image = 'NAME OF THE IMAGE TO USE'
-		azure.vm_user = 'PROVIDE A USERNAME' # defaults to 'vagrant' if not provided
-		azure.vm_password = 'PROVIDE A VALID PASSWORD' # min 8 characters. should contain a lower case letter, an uppercase letter, a number and a special character
-
-		azure.vm_name = 'PROVIDE A NAME FOR YOUR VIRTUAL MACHINE' # max 15 characters. contains letters, number and hyphens. can start with letters and can end with letters and numbers
-		azure.cloud_service_name = 'PROVIDE A NAME FOR YOUR CLOUD SERVICE' # same as vm_name. leave blank to auto-generate
-		azure.deployment_name = 'PROVIDE A NAME FOR YOUR DEPLOYMENT' # defaults to cloud_service_name
-		azure.vm_location = 'PROVIDE A LOCATION FOR VM' # e.g., West US
-
-		azure.winrm_transport = %w(https)
-  end
-
-  config.vm.define 'first' do |cfg|
-    cfg.vm.provider :azure do |azure, override|
-      do_common_azure_stuff.call azure, override
-      azure.vm_name = 'PROVIDE A NAME FOR YOUR VIRTUAL MACHINE'
-      azure.tcp_endpoints = '3389:53389' # opens the Remote Desktop internal port that listens on public port 53389. Without this, you cannot RDP to a Windows VM.
-      azure.winrm_https_port = 5986
-    end
-  end
-
-  config.vm.define 'second' do |cfg|
-    cfg.vm.provider :azure do |azure, override|
-      do_common_azure_stuff.call azure, override
-      azure.vm_name = 'PROVIDE A NAME FOR YOUR VIRTUAL MACHINE'
-      azure.tcp_endpoints = '3389:53390'
-      azure.winrm_https_port = 5987
-    end
-  end
-
-  config.vm.define 'third' do |cfg|
-    cfg.vm.provider :azure do |azure, override|
-      do_common_azure_stuff.call azure, override
-      azure.vm_name = 'PROVIDE A NAME FOR YOUR VIRTUAL MACHINE'
-      azure.tcp_endpoints = '3389:53391'
-      azure.winrm_https_port = 5988
-    end
-  end
-
-  # Executes powershell on the remote machine and returns the hostname
-  config.vm.provision 'shell', inline: 'hostname'
-
-end
-
-```
-
+* `resource_group_name`: (Optional) Name of the resource group to use.
+* `location`: (Optional) Azure location to build the VM -- defaults to 'westus'
+* `vm_name`: (Optional) Name of the virtual machine
+* `vm_password`: (Optional for *nix) Password for the VM -- This is not recommended for *nix deployments
+* `vm_size`: (Optional) VM size to be used -- defaults to 'Standard_D1'. See: https://azure.microsoft.com/en-us/documentation/articles/virtual-machines-linux-sizes/
+* `vm_image_urn`: (Optional) Name of the virtual machine image urn to use -- defaults to 'canonical:ubuntuserver:16.04.0-DAILY-LTS:latest'. See: https://azure.microsoft.com/en-us/documentation/articles/virtual-machines-linux-cli-ps-findimage/
+* `virtual_network_name`: (Optional) Name of the virtual network resource
+* `subnet_name`: (Optional) Name of the virtual network subnet resource
+* `instance_ready_timeout`: (Optional) The timeout to wait for an instance to become ready -- default 120 seconds.
+* `instance_check_interval`: (Optional) The interval to wait for checking an instance's state -- default 2 seconds.
+* `endpoint`: (Optional) The Azure Management API endpoint -- default 'https://management.azure.com' seconds -- ENV['AZURE_MANAGEMENT_ENDPOINT'].

data/Rakefile

@@ -1,8 +1,6 @@
-#--------------------------------------------------------------------------
-# 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.
-#--------------------------------------------------------------------------
+# encoding: utf-8
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License in the project root for license information.
 
 require 'rubygems'
 require 'bundler/setup'

data/example_box/Vagrantfile

@@ -1,15 +1,14 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = '2'
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
 
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  # All Vagrant configuration is done here. The most common configuration
-  # options are documented and commented below. For a complete reference,
-  # please see the online documentation at vagrantup.com.
+Vagrant.configure('2') do |config|
+  config.vm.box = 'azure'
 
-  config.vm.provider :azure do |azure|
-    azure.vm_size = 'Small'
+  config.vm.provider :azure do |azure, override|
   end
 end

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

@@ -1,44 +1,23 @@
-#---------------------------------------------------------------------------
-# 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'
+# encoding: utf-8
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License in the project root for license information.
+require_relative '../services/azure_resource_manager'
 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 Azure
     module Action
       class ConnectAzure
         def initialize(app, env)
           @app = app
-          @logger = Log4r::Logger.new('vagrant_azure::action::connect_aws')
+          @logger = Log4r::Logger.new('vagrant_azure::action::connect_azure')
         end
 
         def call (env)
-          if env[:azure_vm_service].nil?
+          if env[:azure_arm_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)
+            provider = MsRestAzure::ApplicationTokenProvider.new(config.tenant_id, config.client_id, config.client_secret)
+            env[:azure_arm_service] = VagrantPlugins::Azure::Services::AzureResourceManager.new(provider, config.subscription_id)
           end
 
           @app.call(env)

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

@@ -0,0 +1,19 @@
+# encoding: utf-8
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License in the project root for license information.
+module VagrantPlugins
+  module Azure
+    module Action
+      class IsCreated
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:result] = env[:machine].state.id != :not_created
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# encoding: utf-8
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License in the project root for license information.
+module VagrantPlugins
+  module Azure
+    module Action
+      class IsStopped
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:result] = env[:machine].state.id == :stopped
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# encoding: utf-8
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License in the project root for license information.
+module VagrantPlugins
+  module Azure
+    module Action
+      class MessageAlreadyCreated
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:ui].info(I18n.t('vagrant_azure.already_status', :status => 'created'))
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# encoding: utf-8
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License in the project root for license information.
+module VagrantPlugins
+  module Azure
+    module Action
+      class MessageNotCreated
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:ui].info(I18n.t('vagrant_azure.not_created'))
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# encoding: utf-8
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License in the project root for license information.
+module VagrantPlugins
+  module Azure
+    module Action
+      class MessageWillNotDestroy
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:ui].info(I18n.t('vagrant_azure.will_not_destroy', name: env[:machine].name))
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -1,14 +1,15 @@
-#--------------------------------------------------------------------------
-# 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.
-#--------------------------------------------------------------------------
+# encoding: utf-8
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License in the project root for license information.
 require 'log4r'
+require 'vagrant-azure/util/machine_id_helper'
 
 module VagrantPlugins
-  module WinAzure
+  module Azure
     module Action
       class ReadSSHInfo
+        include VagrantPlugins::Azure::Util::MachineIdHelper
+
         def initialize(app, env, port = 22)
           @app = app
           @port = port
@@ -16,37 +17,16 @@ module VagrantPlugins
         end
 
         def call(env)
-          env[:ui].detail "Looking for local port #{@port}"
-
-          env[:machine_ssh_info] = read_ssh_info(
-            env[:azure_vm_service],
-            env[:machine]
-          )
-
-          env[:ui].detail "Found port mapping #{env[:machine_ssh_info][:port]} --> #{@port}"
-
+          env[:machine_ssh_info] = read_ssh_info(env[:azure_arm_service], env)
           @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
+        def read_ssh_info(azure, env)
+          return nil if env[:machine].id.nil?
+          parsed = parse_machine_id(env[:machine].id)
+          public_ip = azure.network.public_ipaddresses.get(parsed[:group], "#{parsed[:name]}-vagrantPublicIP").value!.body
 
-          return nil
+          {:host => public_ip.properties.dns_settings.fqdn, :port => 22}
         end
       end
     end