azure 0.6.4 → 0.7.0.pre

data/lib/azure/version.rb

@@ -16,9 +16,9 @@
 module Azure
   class Version
     MAJOR = 0 unless defined? MAJOR
-    MINOR = 6 unless defined? MINOR
-    UPDATE = 4 unless defined? UPDATE
-    PRE = nil unless defined? PRE
+    MINOR = 7 unless defined? MINOR
+    UPDATE = 0 unless defined? UPDATE
+    PRE = 'pre' unless defined? PRE
 
     class << self
 

data/lib/azure/virtual_machine_image_management/serialization.rb

@@ -18,6 +18,7 @@ require 'azure/virtual_machine_image_management/virtual_machine_disk'
 module Azure
   module VirtualMachineImageManagement
     module Serialization
+      extend Azure::Core::Utility
       def self.virtual_machine_images_from_xml(imageXML)
         os_images = []
         virtual_machine_images = imageXML.css('Images OSImage')
@@ -26,7 +27,25 @@ module Azure
           image.os_type = xml_content(image_node, 'OS')
           image.name = xml_content(image_node, 'Name')
           image.category = xml_content(image_node, 'Category')
+          image.media_link = xml_content(image_node, 'MediaLink')
           image.locations = xml_content(image_node, 'Location')
+          image.image_type = 'OS'
+          os_images << image
+        end
+        os_images
+      end
+
+      def self.virtual_machine_vm_images_from_xml(imageXML)
+        os_images = []
+        virtual_machine_images = imageXML.css('VMImages VMImage')
+        virtual_machine_images.each do |image_node|
+          image = VirtualMachineImage.new
+          image.name = xml_content(image_node, 'Name')
+          image.category = xml_content(image_node, 'Category')
+          image.locations = xml_content(image_node, 'Location')
+          image.os_type = xml_content(image_node, 'OSDiskConfiguration OS')
+          image.media_link = xml_content(image_node, 'OSDiskConfiguration MediaLink')
+          image.image_type = 'VM'
           os_images << image
         end
         os_images

data/lib/azure/virtual_machine_image_management/virtual_machine_image.rb

@@ -19,7 +19,7 @@ module Azure
         yield self if block_given?
       end
 
-      attr_accessor :os_type, :name, :category, :locations
+      attr_accessor :os_type, :name, :category, :locations, :media_link, :image_type
     end
   end
 end

data/lib/azure/virtual_machine_image_management/virtual_machine_image_management_service.rb

@@ -16,23 +16,46 @@ require 'azure/virtual_machine_image_management/serialization'
 
 module Azure
   module VirtualMachineImageManagement
-    class VirtualMachineImageManagementService < BaseManagementService
+    class VirtualMachineImageManagementService < BaseManagement::BaseManagementService
+
       def initialize
         super()
       end
 
       # Public: Gets a list of virtual machine images from the server
       #
-      # Returns an array of Azure::VirtualMachineImageManagementService objects
+      # Returns an array of Azure::VirtualMachineImageManagement::VirtualMachineImage objects
       def list_virtual_machine_images
+        list_os_images + list_vm_images
+      end
+
+      # Private: Gets a list of the operating system images that is associated with the specified subscription
+      #
+      # See http://msdn.microsoft.com/en-us/library/azure/jj157191.aspx
+      #
+      # Returns an array of Azure::VirtualMachineImageManagement::VirtualMachineImage objects
+      def list_os_images
         request_path = '/services/images'
-        request = ManagementHttpRequest.new(:get, request_path, nil)
+        request = BaseManagement::ManagementHttpRequest.new(:get, request_path, nil)
         response = request.call
         Serialization.virtual_machine_images_from_xml(response)
       end
+
+      # Private: Gets a list of the VM Images that is associated with the specified subscription
+      #
+      # See http://msdn.microsoft.com/en-us/library/azure/dn499770.aspx
+      #
+      # Returns an array of Azure::VirtualMachineImageManagement::VirtualMachineImage objects
+      def list_vm_images
+        request_path = '/services/vmimages'
+        request = Azure::BaseManagement::ManagementHttpRequest.new(:get, request_path, nil)
+        response = request.call
+        Serialization.virtual_machine_vm_images_from_xml(response)
+      end
     end
 
-    class VirtualMachineDiskManagementService < BaseManagementService
+    class VirtualMachineDiskManagementService < BaseManagement::BaseManagementService
+
       def initialize
         super()
       end
@@ -42,7 +65,7 @@ module Azure
       # Returns an array of Azure::VirtualMachineDiskManagementService objects
       def list_virtual_machine_disks
         request_path = '/services/disks'
-        request = ManagementHttpRequest.new(:get, request_path, nil)
+        request = Azure::BaseManagement::ManagementHttpRequest.new(:get, request_path, nil)
         response = request.call
         Serialization.disks_from_xml(response)
       end
@@ -56,9 +79,9 @@ module Azure
       #
       # Returns None
       def delete_virtual_machine_disk(disk_name)
-        Loggerx.info "Deleting Disk \"#{disk_name}\". "
+        Azure::Loggerx.info "Deleting Disk \"#{disk_name}\". "
         path = "/services/disks/#{disk_name}"
-        request = ManagementHttpRequest.new(:delete, path)
+        request = BaseManagement::ManagementHttpRequest.new(:delete, path)
         request.call
       end
     end

data/lib/azure/virtual_machine_management/serialization.rb

@@ -18,6 +18,7 @@ require 'base64'
 module Azure
   module VirtualMachineManagement
     module Serialization
+      extend Azure::Core::Utility
       def self.shutdown_virtual_machine_to_xml
         builder = Nokogiri::XML::Builder.new do |xml|
           xml.ShutdownRoleOperation(
@@ -55,7 +56,7 @@ module Azure
         builder.doc.to_xml
       end
 
-      def self.deployment_to_xml(params, options)
+      def self.deployment_to_xml(params, image, options)
         options[:deployment_name] ||= options[:cloud_service_name]
         builder = Nokogiri::XML::Builder.new do |xml|
           xml.Deployment(
@@ -69,13 +70,16 @@ module Azure
             if options[:virtual_network_name]
               xml.VirtualNetworkName options[:virtual_network_name]
             end
+            if options[:reserved_ip_name]
+              xml.ReservedIPName options[:reserved_ip_name]
+            end
           end
         end
-        builder.doc.at_css('Role') << role_to_xml(params, options).at_css('PersistentVMRole').children.to_s
+        builder.doc.at_css('Role') << role_to_xml(params, image, options).at_css('PersistentVMRole').children.to_s
         builder.doc.to_xml
       end
 
-      def self.role_to_xml(params, options)
+      def self.role_to_xml(params, image, options)
         builder = Nokogiri::XML::Builder.new do |xml|
           xml.PersistentVMRole(
             'xmlns' => 'http://schemas.microsoft.com/windowsazure',
@@ -84,9 +88,8 @@ module Azure
             xml.RoleName { xml.text params[:vm_name] }
             xml.OsVersion('i:nil' => 'true')
             xml.RoleType 'PersistentVMRole'
-
             xml.ConfigurationSets do
-              provisioning_configuration_to_xml(xml, params, options)
+              provisioning_configuration_to_xml(xml, params, options) if image.image_type == 'OS'
               xml.ConfigurationSet('i:type' => 'NetworkConfigurationSet') do
                 xml.ConfigurationSetType 'NetworkConfiguration'
                 xml.InputEndpoints do
@@ -101,14 +104,23 @@ module Azure
                   xml.SubnetNames do
                     xml.SubnetName options[:subnet_name]
                   end
+                  xml.StaticVirtualNetworkIPAddress options[:static_virtual_network_ipaddress] if options[:static_virtual_network_ipaddress]
                 end
               end
             end
+            xml.VMImageName image.name if image.image_type == 'VM'
             xml.AvailabilitySetName options[:availability_set_name]
             xml.Label Base64.encode64(params[:vm_name]).strip
-            xml.OSVirtualHardDisk do
-              xml.MediaLink 'http://' + options[:storage_account_name] + '.blob.core.windows.net/vhds/' + (Time.now.strftime('disk_%Y_%m_%d_%H_%M')) + '.vhd'
-              xml.SourceImageName params[:image]
+            if image.category == 'User'
+              storage_host = URI.parse( image.media_link ).host
+            else
+              storage_host = options[:storage_account_name] + '.blob.core.windows.net'
+            end
+            if image.image_type == 'OS'
+              xml.OSVirtualHardDisk do
+                xml.MediaLink 'http://' + storage_host + '/vhds/' + (Time.now.strftime('disk_%Y_%m_%d_%H_%M_%S_%L')) + '.vhd'
+                xml.SourceImageName params[:image]
+              end
             end
             xml.RoleSize options[:vm_size]
           end
@@ -143,6 +155,7 @@ module Azure
                 end
               end
             end
+            xml.CustomData params[:custom_data] if params[:custom_data]
           end
         elsif options[:os_type] == 'Windows'
           xml.ConfigurationSet('i:type' => 'WindowsProvisioningConfigurationSet') do
@@ -248,11 +261,11 @@ module Azure
             vm = VirtualMachine.new
             role_name = xml_content(instance, 'RoleName')
             vm.status = xml_content(instance, 'InstanceStatus')
-            vm.vm_name = role_name.downcase
+            vm.vm_name = role_name
             vm.ipaddress = xml_content(ip, 'Address')
             vm.role_size = xml_content(instance, 'InstanceSize')
             vm.hostname = xml_content(instance, 'HostName')
-            vm.cloud_service_name = cloud_service_name.downcase
+            vm.cloud_service_name = cloud_service_name
             vm.deployment_name = xml_content(deployXML, 'Deployment Name')
             vm.deployment_status = xml_content(deployXML, 'Deployment Status')
             vm.virtual_network_name = xml_content(
@@ -264,6 +277,10 @@ module Azure
                 vm.availability_set_name = xml_content(role, 'AvailabilitySetName')
                 endpoints_from_xml(role, vm)
                 vm.data_disks = data_disks_from_xml(role)
+                subnet = xml_content(role,
+                  'ConfigurationSets ConfigurationSet SubnetNames SubnetName'
+                )
+                vm.subnet = subnet unless subnet.empty?
                 vm.os_type = xml_content(role, 'OSVirtualHardDisk OS')
                 vm.disk_name = xml_content(role, 'OSVirtualHardDisk DiskName')
                 vm.media_link = xml_content(role, 'OSVirtualHardDisk MediaLink')
@@ -347,6 +364,9 @@ module Azure
                 xml.InputEndpoints do
                   endpoints_to_xml(xml, endpoints)
                 end
+                xml.SubnetNames do
+                  xml.SubnetName vm.subnet if vm.subnet
+                end
               end
             end
             xml.OSVirtualHardDisk do
@@ -387,7 +407,7 @@ module Azure
 
       def self.add_data_disk_to_xml(vm, options)
         if options[:import] && options[:disk_name].nil?
-          Loggerx.error_with_exit "The data disk name is not valid."
+          Azure::Loggerx.error_with_exit "The data disk name is not valid."
         end
         media_link = vm.media_link
         builder = Nokogiri::XML::Builder.new do |xml|
@@ -401,7 +421,7 @@ module Azure
             xml.LogicalDiskSizeInGB options[:disk_size] || 100
             unless options[:import]
               disk_name = media_link[/([^\/]+)$/]
-              media_link = media_link.gsub(/#{disk_name}/, (Time.now.strftime('disk_%Y_%m_%d_%H_%M')) + '.vhd')
+              media_link = media_link.gsub(/#{disk_name}/, (Time.now.strftime('disk_%Y_%m_%d_%H_%M_%S')) + '.vhd')
               xml.MediaLink media_link
             end
           end

data/lib/azure/virtual_machine_management/virtual_machine.rb

@@ -37,6 +37,7 @@ module Azure
       attr_accessor :availability_set_name
       attr_accessor :media_link
       attr_accessor :data_disks
+      attr_accessor :subnet
     end
   end
 end

data/lib/azure/virtual_machine_management/virtual_machine_management_service.rb

@@ -17,7 +17,9 @@ include Azure::VirtualMachineImageManagement
 
 module Azure
   module VirtualMachineManagement
-    class VirtualMachineManagementService < BaseManagementService
+    class VirtualMachineManagementService < BaseManagement::BaseManagementService
+      include  Azure::Core::Utility
+
       def initialize
         super()
       end
@@ -34,7 +36,7 @@ module Azure
         end
         cloud_service_names.each do |cloud_service_name|
           request_path = "/services/hostedservices/#{cloud_service_name}/deploymentslots/production"
-          request = ManagementHttpRequest.new(:get, request_path)
+          request = BaseManagement::ManagementHttpRequest.new(:get, request_path)
           request.warn = true
           response = request.call
           roles << Serialization.virtual_machines_from_xml(response, cloud_service_name)
@@ -51,7 +53,7 @@ module Azure
       #
       # Returns an  Azure::VirtualMachineManagement::VirtualMachine instance.
       def get_virtual_machine(name, cloud_service_name)
-        server = list_virtual_machines(cloud_service_name).select { |x| x.vm_name == name.downcase }
+        server = list_virtual_machines(cloud_service_name).select { |x| x.vm_name.casecmp(name) == 0 }
         server.first
       end
 
@@ -61,7 +63,6 @@ module Azure
       #
       # * +params+    - Hash.  parameters.
       # * +options+   - Hash.  Optional parameters.
-      # * +add_role+  - true/false. Optional Parameter. Default is false
       #
       #  ==== Params
       #
@@ -83,31 +84,25 @@ module Azure
       # * +:tcp_endpoints+            - String. Specifies the internal port and external/public port separated by a colon.
       #   You can map multiple internal and external ports by separating them with a comma.
       # * +:ssh_private_key_file+     - String. Path of private key file.
-      # * +:ssh_certificate_file+     - String. Path of certificate file.
       # * +:ssh_port+                 - Integer. Specifies the SSH port number.
       # * +:winrm_http_port           - Integer. Specifies the WinRM HTTP port number.
       # * +:winrm_https_port          - Integer. Specifies the WinRM HTTPS port number.
       # * +:vm_size+                  - String. Specifies the size of the virtual machine instance.
       # * +:winrm_transport+          - Array. Specifies WINRM transport protocol.
       # * +:availability_set_name+    - String. Specifies the availability set name.
-      #
-      #  ==== add_role
-      #
-      # Accepted values are:
-      # * +false+   - Will add a new deployment in a cloud service.
-      # * +true+    - Will add a new role to a cloud service. Atleast one
-      # deployment should exist before you can add a role.
+      # * +:reserved_ip_name+         - String. Specifies the reserved IP name.
       #
       # Returns Azure::VirtualMachineManagement::VirtualMachine objects of newly created instance.
       #
       # See:
-      # http://msdn.microsoft.com/en-us/library/windowsazure/jj157194.aspx
-      # http://msdn.microsoft.com/en-us/library/windowsazure/jj157186.aspx
+      # http://msdn.microsoft.com/en-us/library/azure/jj157194.aspx
       def create_virtual_machine(params, options = {})
-        options[:os_type] = get_os_type(params[:image])
+        image = get_image(params[:image])
+        options[:os_type] = image.os_type
         validate_deployment_params(params, options)
         options[:deployment_name] ||= options[:cloud_service_name]
-        Loggerx.info 'Creating deploymnent...'
+        Azure::Loggerx.info 'Creating deployment...'
+
         options[:cloud_service_name] ||= generate_cloud_service_name(params[:vm_name])
         options[:storage_account_name] ||= generate_storage_account_name(params[:vm_name])
         optionals = {}
@@ -115,9 +110,14 @@ module Azure
           virtual_network_service = Azure::VirtualNetworkManagementService.new
           virtual_networks = virtual_network_service.list_virtual_networks.select { |x| x.name == options[:virtual_network_name] }
           if virtual_networks.empty?
-            Loggerx.error_with_exit "Virtual network #{options[:virtual_network_name]} doesn't exists"
+            Azure::Loggerx.error_with_exit "Virtual network #{options[:virtual_network_name]} doesn't exists"
           else
-            optionals[:affinity_group_name] = virtual_networks.first.affinity_group
+            vnet = virtual_networks.first
+            if !vnet.affinity_group.empty?
+              options[:affinity_group_name] = vnet.affinity_group
+            else
+              optionals[:location] = vnet.location
+            end
           end
         elsif options[:affinity_group_name]
           optionals[:affinity_group_name] = options[:affinity_group_name]
@@ -127,11 +127,14 @@ module Azure
         cloud_service = Azure::CloudServiceManagementService.new
         cloud_service.create_cloud_service(options[:cloud_service_name], optionals)
         cloud_service.upload_certificate(options[:cloud_service_name], params[:certificate]) unless params[:certificate].empty?
-        Azure::StorageManagementService.new.create_storage_account(options[:storage_account_name], optionals)
-        body = Serialization.deployment_to_xml(params, options)
+        unless image.category == 'User'
+          options[:storage_account_name] ||= generate_storage_account_name(params[:vm_name])
+          Azure::StorageManagementService.new.create_storage_account(options[:storage_account_name], optionals)
+        end
+        body = Serialization.deployment_to_xml(params, image, options)
         path = "/services/hostedservices/#{options[:cloud_service_name]}/deployments"
-        Loggerx.info 'Deployment in progress...'
-        request = ManagementHttpRequest.new(:post, path, body)
+        Azure::Loggerx.info 'Deployment in progress...'
+        request = BaseManagement::ManagementHttpRequest.new(:post, path, body)
         request.call
         get_virtual_machine(params[:vm_name], options[:cloud_service_name])
       rescue Exception => e
@@ -161,7 +164,6 @@ module Azure
       # * +:tcp_endpoints+         - String. Specifies the internal port and external/public port separated by a colon.
       #   You can map multiple internal and external ports by separating them with a comma.
       # * +:ssh_private_key_file+  - String. Path of private key file.
-      # * +:ssh_certificate_file+  - String. Path of certificate file.
       # * +:ssh_port+              - Integer. Specifies the SSH port number.
       # * +:winrm_http_port        - Integer. Specifies the WinRM HTTP port number.
       # * +:winrm_https_port       - Integer. Specifies the WinRM HTTPS port number.
@@ -171,23 +173,26 @@ module Azure
       # Returns Azure::VirtualMachineManagement::VirtualMachine objects of newly created instance.
       #
       # See:
-      # http://msdn.microsoft.com/en-us/library/windowsazure/jj157186.aspx
+      # http://msdn.microsoft.com/en-us/library/azure/jj157186.aspx
       def add_role(params, options = {})
-        options[:os_type] = get_os_type(params[:image])
+        image = get_image(params[:image])
+        options[:os_type] = image.os_type
         validate_deployment_params(params, options, true)
         cloud_service = Azure::CloudServiceManagementService.new
         cloud_service = cloud_service.get_cloud_service_properties(params[:cloud_service_name])
         deployment_name = cloud_service.deployment_name
-        Loggerx.error_with_exit "Deployment doesn't exists." if cloud_service && deployment_name.empty?
+        Azure::Loggerx.error_with_exit "Deployment doesn't exists." if cloud_service && deployment_name.empty?
         others = {}
         if cloud_service.location
           others[:location] = cloud_service.location
         elsif cloud_service.affinity_group
           others[:affinity_group_name] = cloud_service.affinity_group
         end
-        options[:storage_account_name] ||= generate_storage_account_name(params[:vm_name])
-        Azure::StorageManagementService.new.create_storage_account(options[:storage_account_name], others)
-        Loggerx.info 'Deployment exists, adding role...'
+        unless image.category == 'User'
+          options[:storage_account_name] ||= generate_storage_account_name(params[:vm_name])
+          Azure::StorageManagementService.new.create_storage_account(options[:storage_account_name], others)
+        end
+        Azure::Loggerx.info 'Deployment exists, adding role...'
         existing_ports = []
         cloud_service.virtual_machines[deployment_name.to_sym].each do |vm|
           vm.tcp_endpoints.each do |endpoint|
@@ -195,10 +200,10 @@ module Azure
           end
         end
         options[:existing_ports] = existing_ports
-        body = Serialization.role_to_xml(params, options).to_xml
+        body = Serialization.role_to_xml(params, image, options).to_xml
         path = "/services/hostedservices/#{cloud_service.name}/deployments/#{deployment_name}/roles"
-        Loggerx.info 'Deployment in progress...'
-        request = ManagementHttpRequest.new(:post, path, body)
+        Azure::Loggerx.info 'Deployment in progress...'
+        request = BaseManagement::ManagementHttpRequest.new(:post, path, body)
         request.call
         get_virtual_machine(params[:vm_name], cloud_service.name)
       end
@@ -210,8 +215,8 @@ module Azure
       # * +vm_name+  - String. Virtual machine name.
       # * +cloud_service_name+  - String. Cloud service name.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/gg441305.aspx
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/jj157179.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/gg441305.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/jj157179.aspx
       #
       # Returns NONE
       def delete_virtual_machine(vm_name, cloud_service_name)
@@ -224,11 +229,11 @@ module Azure
             cloud_service.delete_cloud_service(cloud_service_name)
           else
             path = "/services/hostedservices/#{vm.cloud_service_name}/deployments/#{vm.deployment_name}/roles/#{vm.vm_name}"
-            Loggerx.info "Deleting virtual machine #{vm_name}. \n"
-            request = ManagementHttpRequest.new(:delete, path)
+            Azure::Loggerx.info "Deleting virtual machine #{vm_name}. \n"
+            request = BaseManagement::ManagementHttpRequest.new(:delete, path)
             request.call
           end
-          Loggerx.info "Waiting for disk to be released.\n"
+          Azure::Loggerx.info "Waiting for disk to be released.\n"
           disk_name = vm.disk_name
           disk_management_service = VirtualMachineDiskManagementService.new
           # Wait for 180s for disk to be released.
@@ -243,12 +248,12 @@ module Azure
             sleep 10
           end
           if disk.attached
-            Loggerx.error "\nCannot delete disk #{disk_name}."
+            Azure::Loggerx.error "\nCannot delete disk #{disk_name}."
           else
             disk_management_service.delete_virtual_machine_disk(disk_name)
           end
         else
-          Loggerx.error "Cannot find virtual machine #{vm_name} under cloud service #{cloud_service_name}"
+          Azure::Loggerx.error "Cannot find virtual machine #{vm_name} under cloud service #{cloud_service_name}"
         end
       rescue
       end
@@ -260,25 +265,25 @@ module Azure
       # * +name+                - String. Virtual machine name.
       # * +cloud_service_name+  - String. Cloud service name.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/jj157195.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/jj157195.aspx
       #
       # Returns NONE
       def shutdown_virtual_machine(vm_name, cloud_service_name)
         vm = get_virtual_machine(vm_name, cloud_service_name)
         if vm
           if %w(StoppedVM StoppedDeallocated).include?(vm.status)
-            Loggerx.error 'Cannot perform the shutdown operation on a stopped virtual machine.'
+            Azure::Loggerx.error 'Cannot perform the shutdown operation on a stopped virtual machine.'
           elsif vm.deployment_status == 'Running'
             path = "/services/hostedservices/#{vm.cloud_service_name}/deployments/#{vm.deployment_name}/roleinstances/#{vm.vm_name}/Operations"
             body = Serialization.shutdown_virtual_machine_to_xml
-            Loggerx.info "Shutting down virtual machine \"#{vm.vm_name}\" ..."
-            request = ManagementHttpRequest.new(:post, path, body)
+            Azure::Loggerx.info "Shutting down virtual machine \"#{vm.vm_name}\" ..."
+            request = BaseManagement::ManagementHttpRequest.new(:post, path, body)
             request.call
           else
-            Loggerx.error 'Cannot perform the shutdown operation on a stopped deployment.'
+            Azure::Loggerx.error 'Cannot perform the shutdown operation on a stopped deployment.'
           end
         else
-          Loggerx.error "Cannot find virtual machine \"#{vm_name}\" under cloud service \"#{cloud_service_name}\". "
+          Azure::Loggerx.error "Cannot find virtual machine \"#{vm_name}\" under cloud service \"#{cloud_service_name}\". "
         end
       end
 
@@ -289,23 +294,23 @@ module Azure
       # * +name+                - String. Virtual machine name.
       # * +cloud_service_name+  - String. Cloud service name.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/jj157189.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/jj157189.aspx
       #
       # Returns NONE
       def start_virtual_machine(vm_name, cloud_service_name)
         vm = get_virtual_machine(vm_name, cloud_service_name)
         if vm
           if vm.status == 'ReadyRole'
-            Loggerx.error 'Cannot perform the start operation on started virtual machine.'
+            Azure::Loggerx.error 'Cannot perform the start operation on started virtual machine.'
           else
             path = "/services/hostedservices/#{vm.cloud_service_name}/deployments/#{vm.deployment_name}/roleinstances/#{vm.vm_name}/Operations"
             body = Serialization.start_virtual_machine_to_xml
-            Loggerx.info "Starting virtual machine \"#{vm.vm_name}\" ..."
-            request = ManagementHttpRequest.new(:post, path, body)
+            Azure::Loggerx.info "Starting virtual machine \"#{vm.vm_name}\" ..."
+            request = BaseManagement::ManagementHttpRequest.new(:post, path, body)
             request.call
           end
         else
-          Loggerx.error "Cannot find virtual machine \"#{vm_name}\" under cloud service \"#{cloud_service_name}\"."
+          Azure::Loggerx.error "Cannot find virtual machine \"#{vm_name}\" under cloud service \"#{cloud_service_name}\"."
         end
       end
 
@@ -316,7 +321,7 @@ module Azure
       # * +name+                - String. Virtual machine name.
       # * +cloud_service_name+  - String. Cloud service name.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/jj157197.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/jj157197.aspx
       #
       # Returns NONE
       def restart_virtual_machine(vm_name, cloud_service_name)
@@ -324,11 +329,11 @@ module Azure
         if vm
           path = "/services/hostedservices/#{vm.cloud_service_name}/deployments/#{vm.deployment_name}/roleinstances/#{vm.vm_name}/Operations"
           body = Serialization.restart_virtual_machine_to_xml
-          Loggerx.info "Restarting virtual machine \"#{vm.vm_name}\" ..."
-          request = ManagementHttpRequest.new(:post, path, body)
+          Azure::Loggerx.info "Restarting virtual machine \"#{vm.vm_name}\" ..."
+          request = BaseManagement::ManagementHttpRequest.new(:post, path, body)
           request.call
         else
-          Loggerx.error "Cannot find virtual machine \"#{vm_name}\" under cloud service \"#{cloud_service_name}\"."
+          Azure::Loggerx.error "Cannot find virtual machine \"#{vm_name}\" under cloud service \"#{cloud_service_name}\"."
         end
       end
 
@@ -372,7 +377,7 @@ module Azure
       # * +:path+      - String. Specifies the relative path to inspect to
       #   determine the availability status of the Virtual Machine. (optional)
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/jj157187.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/jj157187.aspx
       #
       # Returns NONE
       def update_endpoints(vm_name, cloud_service_name, *input_endpoints)
@@ -386,11 +391,11 @@ module Azure
           end
           endpoints += input_endpoints
           body = Serialization.update_role_to_xml(endpoints, vm)
-          request = ManagementHttpRequest.new(:put, path, body)
-          Loggerx.info "Updating endpoints of virtual machine #{vm.vm_name} ..."
+          request = BaseManagement::ManagementHttpRequest.new(:put, path, body)
+          Azure::Loggerx.info "Updating endpoints of virtual machine #{vm.vm_name} ..."
           request.call
         else
-          Loggerx.error "Cannot find virtual machine \"#{vm_name}\" under cloud service \"#{cloud_service_name}\"."
+          Azure::Loggerx.error "Cannot find virtual machine \"#{vm_name}\" under cloud service \"#{cloud_service_name}\"."
         end
       end
 
@@ -402,7 +407,7 @@ module Azure
       # * +cloud_service_name+  - String. Cloud service name.
       # * +endpoint_name+       - String. Name of endpoint.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/jj157187.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/jj157187.aspx
       #
       # Returns NONE
       def delete_endpoint(vm_name, cloud_service_name, endpoint_name)
@@ -412,11 +417,11 @@ module Azure
           endpoints = vm.tcp_endpoints + vm.udp_endpoints
           endpoints.delete_if { |ep| endpoint_name.downcase == ep[:name].downcase }
           body = Serialization.update_role_to_xml(endpoints, vm)
-          request = ManagementHttpRequest.new(:put, path, body)
-          Loggerx.info "Deleting virtual machine endpoint #{endpoint_name} ..."
+          request = BaseManagement::ManagementHttpRequest.new(:put, path, body)
+          Azure::Loggerx.info "Deleting virtual machine endpoint #{endpoint_name} ..."
           request.call
         else
-          Loggerx.error "Cannot find virtual machine \"#{vm_name}\" under cloud service \"#{cloud_service_name}\"."
+          Azure::Loggerx.error "Cannot find virtual machine \"#{vm_name}\" under cloud service \"#{cloud_service_name}\"."
         end
       end
 
@@ -440,7 +445,7 @@ module Azure
       # * +:disk_label+    - String. Specifies the description of the data disk.
       # * +:disk_size+     - String. Specifies the size of disk in GB
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/jj157199.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/jj157199.aspx
       #
       # Returns None
       def add_data_disk(vm_name, cloud_service_name, options = {})
@@ -449,11 +454,11 @@ module Azure
         if vm
           path = "/services/hostedservices/#{cloud_service_name}/deployments/#{vm.deployment_name}/roles/#{vm_name}/DataDisks"
           body = Serialization.add_data_disk_to_xml(vm, options)
-          Loggerx.info "Adding data disk to virtual machine #{vm_name} ..."
-          request = ManagementHttpRequest.new(:post, path, body)
+          Azure::Loggerx.info "Adding data disk to virtual machine #{vm_name} ..."
+          request = BaseManagement::ManagementHttpRequest.new(:post, path, body)
           request.call
         else
-          Loggerx.error "Cannot find virtual machine \"#{vm_name}\" under cloud service \"#{cloud_service_name}\"."
+          Azure::Loggerx.error "Cannot find virtual machine \"#{vm_name}\" under cloud service \"#{cloud_service_name}\"."
         end
       end
 
@@ -462,11 +467,11 @@ module Azure
       # Private: Gets the operating system type of an image.
       #
       # Returns Linux or Windows
-      def get_os_type(image_name)
+      def get_image(image_name)
         image_service = Azure::VirtualMachineImageManagementService.new
-        image = image_service.list_virtual_machine_images.select { |x| x.name == image_name }.first
-        Loggerx.error_with_exit 'The virtual machine image source is not valid.' unless image
-        image.os_type
+        image = image_service.list_virtual_machine_images.select { |x| x.name.casecmp(image_name.to_s) == 0 }.first
+        Azure::Loggerx.error_with_exit 'The virtual machine image source is not valid.' unless image
+        image
       end
 
       def generate_cloud_service_name(vm_name)
@@ -482,7 +487,7 @@ module Azure
         params_keys = %w(vm_name image vm_user)
         params_keys += ['password'] if options[:os_type] == 'Windows'
         options_keys = []
-        options_keys = %w(private_key_file certificate_file) if certificate_required?(params, options)
+        options_keys = %w(private_key_file) if certificate_required?(params, options)
         if add_role
           params_keys += ['cloud_service_name']
         else
@@ -503,20 +508,20 @@ module Azure
           if certificate_required?(params, options)
             begin
               params[:certificate][:key] = OpenSSL::PKey.read File.read(options[:private_key_file])
-              params[:certificate][:cert] = OpenSSL::X509::Certificate.new File.read(options[:certificate_file])
+              params[:certificate][:cert] = get_certificate(options[:private_key_file])
               params[:certificate][:fingerprint] = export_fingerprint(params[:certificate][:cert])
             rescue Exception => e
-              Loggerx.error_with_exit e.message
+              Azure::Loggerx.error_with_exit e.message
             end
           end
         else
-          Loggerx.error_with_exit "You did not provide a valid '#{errors.uniq.join(", ")}' value."
+          Azure::Loggerx.error_with_exit "You did not provide a valid '#{errors.uniq.join(", ")}' value."
         end
       end
 
       def certificate_required?(params, options)
         if options[:os_type] == 'Linux'
-          (params[:password].nil? or (!options[:certificate_file].nil? && !options[:private_key_file].nil?))
+          params[:password].nil?
         else
           winrm_with_https(options)
         end
@@ -524,14 +529,20 @@ module Azure
 
       def winrm_with_https(options)
         if options[:os_type] == 'Windows'
-          options[:winrm_transport] && options[:winrm_transport].include?('https') && options[:certificate_file] && options[:private_key_file]
+          options[:winrm_transport] && options[:winrm_transport].include?('https') && options[:private_key_file]
         end
       end
 
       def validate_role_size(vm_size)
-        valid_role_sizes = %w(ExtraSmall Small Medium Large ExtraLarge A5 A6 A7 Basic_A0 Basic_A1 Basic_A2 Basic_A3 Basic_A4)
-        if vm_size && !valid_role_sizes.include?(vm_size)
-          Loggerx.error_with_exit "Value '#{vm_size}' specified for parameter 'vm_size' is invalid. Allowed values are 'ExtraSmall,Small,Medium,Large,ExtraLarge,A6,A7'"
+        suggested_role_sizes = %w(
+          Basic_A0 Basic_A1 Basic_A2 Basic_A3 Basic_A4
+          ExtraSmall Small Medium Large ExtraLarge A5 A6 A7 A8 A9 A10 A11
+          Standard_D1 Standard_D2 Standard_D3 Standard_D4 Standard_D11 Standard_D12 Standard_D13 Standard_D14
+          Standard_DS1 Standard_DS2 Standard_DS3 Standard_DS4 Standard_DS11 Standard_DS12 Standard_DS13 Standard_DS14
+          Standard_G1 Standard_G2 Standard_G3 Standard_G4 Standard_G5
+        )
+        if vm_size && !suggested_role_sizes.include?(vm_size)
+          Azure::Loggerx.warn "Value '#{vm_size}' specified for parameter 'vm_size' is not in the list of valid VM role sizes. Suggested values are '#{suggested_role_sizes.join(',')}'"
         end
       end
 
@@ -539,9 +550,9 @@ module Azure
         locations = Azure::BaseManagementService.new.list_locations
         location = locations.select { |loc| loc.name.downcase == location_name.downcase }.first
         if location.nil?
-          Loggerx.error_with_exit "Value '#{location_name}' specified for parameter 'location' is invalid. Allowed values are #{locations.map(&:name).join(',')}"
+          Azure::Loggerx.error_with_exit "Value '#{location_name}' specified for parameter 'location' is invalid. Allowed values are #{locations.map(&:name).join(',')}"
         elsif !location.available_services.include?('PersistentVMRole')
-          Loggerx.error_with_exit "Persistentvmrole not enabled for \"#{location.name}\". Try different location"
+          Azure::Loggerx.error_with_exit "Persistentvmrole not enabled for \"#{location.name}\". Try different location"
         end
       end
     end