azure 0.7.0.pre → 0.7.0.pre2

data/lib/azure/table/auth/shared_key_lite.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #--------------------------------------------------------------------------
-require "azure/table/auth/shared_key"
+require 'azure/table/auth/shared_key'
 
 module Azure
   module Table
@@ -22,7 +22,7 @@ module Azure
         #
         # Returns a String.
         def name
-          "SharedKeyLite"
+          'SharedKeyLite'
         end
 
         # Generate the string to sign.
@@ -34,7 +34,7 @@ module Azure
         # Returns a plain text string.
         def signable_string(method, uri, headers)
           [
-            headers.fetch("Date") { headers.fetch("x-ms-date") },
+            headers.fetch('Date') { headers.fetch('x-ms-date') },
             canonicalized_resource(uri)
           ].join("\n")
         end

data/lib/azure/table/serialization.rb

@@ -17,19 +17,19 @@ require 'azure/service/serialization'
 require 'azure/table/guid'
 require 'azure/table/edmtype'
 
-require "time"
-require "date"
+require 'time'
+require 'date'
 
 module Azure
   module Table
     module Serialization
       include Azure::Service::Serialization
 
-      def self.hash_to_entry_xml(hash, id=nil, xml=Nokogiri::XML::Builder.new(:encoding => "UTF-8"))
+      def self.hash_to_entry_xml(hash, id=nil, xml=Nokogiri::XML::Builder.new(:encoding => 'UTF-8'))
         entry_namespaces = {
-          "xmlns"   => "http://www.w3.org/2005/Atom",
-          "xmlns:m" => "http://schemas.microsoft.com/ado/2007/08/dataservices/metadata",
-          "xmlns:d" => "http://schemas.microsoft.com/ado/2007/08/dataservices"
+          'xmlns' => 'http://www.w3.org/2005/Atom',
+          'xmlns:m' => 'http://schemas.microsoft.com/ado/2007/08/dataservices/metadata',
+          'xmlns:d' => 'http://schemas.microsoft.com/ado/2007/08/dataservices'
         }
 
         xml.entry entry_namespaces do |entry|
@@ -45,19 +45,19 @@ module Azure
         xml
       end
 
-      def self.hash_to_content_xml(hash, xml=Nokogiri::XML::Builder.new(:encoding => "UTF-8"))
-        xml.send("content", :type => "application/xml") do |content|
-          content.send("m:properties") do |properties|
+      def self.hash_to_content_xml(hash, xml=Nokogiri::XML::Builder.new(:encoding => 'UTF-8'))
+        xml.send('content', :type => 'application/xml') do |content|
+          content.send('m:properties') do |properties|
             hash.each do |key, val|
-              key = key.encode("UTF-8") if key.is_a? String and !key.encoding.names.include?("BINARY")
-              val = val.encode("UTF-8") if val.is_a? String and !val.encoding.names.include?("BINARY")
+              key = key.encode('UTF-8') if key.is_a? String and !key.encoding.names.include?('BINARY')
+              val = val.encode('UTF-8') if val.is_a? String and !val.encoding.names.include?('BINARY')
 
               type = Azure::Table::EdmType.property_type(val)
               attributes = {}
-              attributes["m:type"] = type unless type.nil? || type.empty?
+              attributes['m:type'] = type unless type.nil? || type.empty?
 
               if val.nil?
-                attributes["m:null"] = "true"
+                attributes['m:null'] = 'true'
                 properties.send("d:#{key}", attributes)
               else
                 properties.send("d:#{key}", Azure::Table::EdmType.serialize_value(type, val), attributes)
@@ -71,16 +71,16 @@ module Azure
 
       def self.entries_from_feed_xml(xml)
         xml = slopify(xml)
-        expect_node("feed", xml)
+        expect_node('feed', xml)
 
-        return nil unless (xml > "entry").any?
+        return nil unless (xml > 'entry').any?
         
         results = []
         
-        if (xml > "entry").count == 0
-          results.push hash_from_entry_xml((xml > "entry"))
+        if (xml > 'entry').count == 0
+          results.push hash_from_entry_xml((xml > 'entry'))
         else
-          (xml > "entry").each do |entry|
+          (xml > 'entry').each do |entry|
             results.push hash_from_entry_xml(entry)
           end
         end
@@ -90,14 +90,14 @@ module Azure
 
       def self.hash_from_entry_xml(xml)
         xml = slopify(xml)
-        expect_node("entry", xml)
+        expect_node('entry', xml)
         result = {}
-        result[:etag] = xml["etag"]
-        result[:updated] = Time.parse((xml > "updated").text) if (xml > "updated").any?
+        result[:etag] = xml['etag']
+        result[:updated] = Time.parse((xml > 'updated').text) if (xml > 'updated').any?
         properties = {} 
-        if (xml > "content").any?
-          (xml > "content").first.first_element_child.element_children.each do |prop|
-            properties[prop.name] = prop.text != "" ? Azure::Table::EdmType.unserialize_query_value(prop.text, prop["m:type"]) : prop["null"] ? nil : ""
+        if (xml > 'content').any?
+          (xml > 'content').first.first_element_child.element_children.each do |prop|
+            properties[prop.name] = prop.text != '' ? Azure::Table::EdmType.unserialize_query_value(prop.text, prop['m:type']) : prop['null'] ? nil : ''
           end
         end
         result[:properties] = properties

data/lib/azure/table/table_service.rb

@@ -15,7 +15,6 @@
 require 'azure/service/storage_service'
 
 require 'azure/table/auth/shared_key'
-
 require 'azure/table/serialization'
 require 'azure/table/entity'
 
@@ -23,9 +22,11 @@ module Azure
   module Table
     class TableService < Azure::Service::StorageService
 
-      def initialize
-        super(Azure::Table::Auth::SharedKey.new)
-        @host = Azure.config.storage_table_host
+      def initialize(options = {})
+        client_config = options[:client] || Azure
+        signer = options[:signer] || Auth::SharedKey.new(client_config.storage_account_name, client_config.storage_access_key)
+        super(signer, client_config.storage_account_name, options)
+        @host = client.storage_table_host
       end
 
       # Public: Creates new table in the storage account
@@ -43,10 +44,10 @@ module Azure
       #
       # See http://msdn.microsoft.com/en-us/library/azure/dd135729
       #
-      # Returns nil on success
+      # @return [nil] on success
       def create_table(table_name, options={})
         query = { }
-        query["timeout"] = options[:timeout].to_s if options[:timeout]
+        query['timeout'] = options[:timeout].to_s if options[:timeout]
 
         body = Azure::Table::Serialization.hash_to_entry_xml({"TableName" => table_name}).to_xml
         call(:post, collection_uri(query), body)
@@ -145,10 +146,10 @@ module Azure
       #
       # Returns a list of Azure::Entity::SignedIdentifier instances
       def get_table_acl(table_name, options={})
-        query = { "comp" => "acl" }
-        query["timeout"] = options[:timeout].to_s if options[:timeout]
+        query = { 'comp' => 'acl'}
+        query['timeout'] = options[:timeout].to_s if options[:timeout]
 
-        response = call(:get, generate_uri(table_name, query))
+        response = call(:get, generate_uri(table_name, query), nil, {'x-ms-version' => '2012-02-12'})
 
         signed_identifiers = []
         signed_identifiers = Azure::Table::Serialization.signed_identifiers_from_xml response.body unless response.body == nil or response.body.length < 1
@@ -172,14 +173,14 @@ module Azure
       #
       # Returns nil on success
       def set_table_acl(table_name, options={})
-        query = { "comp" => "acl" }
-        query["timeout"] = options[:timeout].to_s if options[:timeout]
+        query = { 'comp' => 'acl'}
+        query['timeout'] = options[:timeout].to_s if options[:timeout]
 
         uri = generate_uri(table_name, query)
         body = nil
         body = Azure::Table::Serialization.signed_identifiers_to_xml options[:signed_identifiers] if options[:signed_identifiers] && options[:signed_identifiers].length > 0
 
-        call(:put, uri, body, {})
+        call(:put, uri, body, {'x-ms-version' => '2012-02-12'})
         nil
       end
 
@@ -204,7 +205,7 @@ module Azure
         body = Azure::Table::Serialization.hash_to_entry_xml(entity_values).to_xml
 
         query = { }
-        query["timeout"] = options[:timeout].to_s if options[:timeout]
+        query['timeout'] = options[:timeout].to_s if options[:timeout]
 
         response = call(:post, entities_uri(table_name, nil, nil, query), body)
         
@@ -213,7 +214,7 @@ module Azure
         Entity.new do |entity|
           entity.table = table_name
           entity.updated = result[:updated]
-          entity.etag = response.headers["etag"] || result[:etag]
+          entity.etag = response.headers['etag'] || result[:etag]
           entity.properties = result[:properties]
         end
       end
@@ -438,8 +439,8 @@ module Azure
       # Returns an array of results, one for each operation in the batch
       def execute_batch(batch, options={})
         headers = {
-          "Content-Type"=> "multipart/mixed; boundary=#{batch.batch_id}",
-          "Accept"=> 'application/atom+xml,application/xml',
+          'Content-Type' => "multipart/mixed; boundary=#{batch.batch_id}",
+          'Accept' => 'application/atom+xml,application/xml',
           'Accept-Charset'=> 'UTF-8'
         }
 
@@ -447,7 +448,7 @@ module Azure
         query["timeout"] = options[:timeout].to_s if options[:timeout]
 
         body = batch.to_body
-        response = call(:post, generate_uri("/$batch", query), body, headers)
+        response = call(:post, generate_uri('/$batch', query), body, headers)
         batch.parse_response(response)
       end
 
@@ -557,4 +558,6 @@ module Azure
       end
     end
   end
-end
+end
+
+Azure::TableService = Azure::Table::TableService

data/lib/azure/version.rb

@@ -18,7 +18,7 @@ module Azure
     MAJOR = 0 unless defined? MAJOR
     MINOR = 7 unless defined? MINOR
     UPDATE = 0 unless defined? UPDATE
-    PRE = 'pre' unless defined? PRE
+    PRE = 'pre2' unless defined? PRE
 
     class << self
 

data/lib/azure/virtual_machine_image_management/virtual_machine_image_management_service.rb

@@ -18,10 +18,6 @@ module Azure
   module VirtualMachineImageManagement
     class VirtualMachineImageManagementService < BaseManagement::BaseManagementService
 
-      def initialize
-        super()
-      end
-
       # Public: Gets a list of virtual machine images from the server
       #
       # Returns an array of Azure::VirtualMachineImageManagement::VirtualMachineImage objects
@@ -36,7 +32,7 @@ module Azure
       # Returns an array of Azure::VirtualMachineImageManagement::VirtualMachineImage objects
       def list_os_images
         request_path = '/services/images'
-        request = BaseManagement::ManagementHttpRequest.new(:get, request_path, nil)
+        request = client.management_request(:get, request_path, nil)
         response = request.call
         Serialization.virtual_machine_images_from_xml(response)
       end
@@ -48,7 +44,7 @@ module Azure
       # 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)
+        request = client.management_request(:get, request_path)
         response = request.call
         Serialization.virtual_machine_vm_images_from_xml(response)
       end
@@ -56,16 +52,12 @@ module Azure
 
     class VirtualMachineDiskManagementService < BaseManagement::BaseManagementService
 
-      def initialize
-        super()
-      end
-
       # Public: Gets a list of Disks from the server.
       #
       # Returns an array of Azure::VirtualMachineDiskManagementService objects
       def list_virtual_machine_disks
         request_path = '/services/disks'
-        request = Azure::BaseManagement::ManagementHttpRequest.new(:get, request_path, nil)
+        request = client.management_request(:get, request_path)
         response = request.call
         Serialization.disks_from_xml(response)
       end
@@ -81,9 +73,11 @@ module Azure
       def delete_virtual_machine_disk(disk_name)
         Azure::Loggerx.info "Deleting Disk \"#{disk_name}\". "
         path = "/services/disks/#{disk_name}"
-        request = BaseManagement::ManagementHttpRequest.new(:delete, path)
+        request = client.management_request(:delete, path)
         request.call
       end
     end
   end
 end
+
+Azure::VirtualMachineImageManagementService = Azure::VirtualMachineImageManagement::VirtualMachineImageManagementService

data/lib/azure/virtual_machine_management/serialization.rb

@@ -89,7 +89,7 @@ module Azure
             xml.OsVersion('i:nil' => 'true')
             xml.RoleType 'PersistentVMRole'
             xml.ConfigurationSets do
-              provisioning_configuration_to_xml(xml, params, options) if image.image_type == 'OS'
+              provisioning_configuration_to_xml(xml, params, options) if image.image_type == 'OS' || image.image_type == 'VM'
               xml.ConfigurationSet('i:type' => 'NetworkConfigurationSet') do
                 xml.ConfigurationSetType 'NetworkConfiguration'
                 xml.InputEndpoints do
@@ -281,6 +281,8 @@ module Azure
                   'ConfigurationSets ConfigurationSet SubnetNames SubnetName'
                 )
                 vm.subnet = subnet unless subnet.empty?
+                static_virtual_network_ipaddress =  xml_content(role,'ConfigurationSets ConfigurationSet StaticVirtualNetworkIPAddress')
+                vm.static_virtual_network_ipaddress = static_virtual_network_ipaddress unless static_virtual_network_ipaddress.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')
@@ -367,6 +369,7 @@ module Azure
                 xml.SubnetNames do
                   xml.SubnetName vm.subnet if vm.subnet
                 end
+                xml.StaticVirtualNetworkIPAddress vm.static_virtual_network_ipaddress if vm.static_virtual_network_ipaddress
               end
             end
             xml.OSVirtualHardDisk do

data/lib/azure/virtual_machine_management/virtual_machine.rb

@@ -38,6 +38,7 @@ module Azure
       attr_accessor :media_link
       attr_accessor :data_disks
       attr_accessor :subnet
+      attr_accessor :static_virtual_network_ipaddress
     end
   end
 end

data/lib/azure/virtual_machine_management/virtual_machine_management_service.rb

@@ -20,10 +20,6 @@ module Azure
     class VirtualMachineManagementService < BaseManagement::BaseManagementService
       include  Azure::Core::Utility
 
-      def initialize
-        super()
-      end
-
       # Public: Get a lists of virtual machines available under the current subscription.
       #
       # Returns an list of Azure::VirtualMachineManagement::VirtualMachine instances.
@@ -31,12 +27,12 @@ module Azure
         roles = []
         cloud_service_names.flatten!
         if cloud_service_names.empty?
-          cloud_service = Azure::CloudServiceManagementService.new
+          cloud_service = client.cloud_service_management
           cloud_service_names = cloud_service.list_cloud_services.map(&:name)
         end
         cloud_service_names.each do |cloud_service_name|
           request_path = "/services/hostedservices/#{cloud_service_name}/deploymentslots/production"
-          request = BaseManagement::ManagementHttpRequest.new(:get, request_path)
+          request = client.management_request(:get, request_path)
           request.warn = true
           response = request.call
           roles << Serialization.virtual_machines_from_xml(response, cloud_service_name)
@@ -85,17 +81,17 @@ module Azure
       #   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_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.
+      # * +: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.
       # * +:reserved_ip_name+         - String. Specifies the reserved IP name.
       #
-      # Returns Azure::VirtualMachineManagement::VirtualMachine objects of newly created instance.
+      # @return [Azure::VirtualMachineManagement::VirtualMachine] objects of newly created instance.
       #
-      # See:
-      # http://msdn.microsoft.com/en-us/library/azure/jj157194.aspx
+      #
+      # @see http://msdn.microsoft.com/en-us/library/azure/jj157194.aspx
       def create_virtual_machine(params, options = {})
         image = get_image(params[:image])
         options[:os_type] = image.os_type
@@ -107,7 +103,7 @@ module Azure
         options[:storage_account_name] ||= generate_storage_account_name(params[:vm_name])
         optionals = {}
         if options[:virtual_network_name]
-          virtual_network_service = Azure::VirtualNetworkManagementService.new
+          virtual_network_service = client.network_management
           virtual_networks = virtual_network_service.list_virtual_networks.select { |x| x.name == options[:virtual_network_name] }
           if virtual_networks.empty?
             Azure::Loggerx.error_with_exit "Virtual network #{options[:virtual_network_name]} doesn't exists"
@@ -124,21 +120,21 @@ module Azure
         else
           optionals[:location] = params[:location]
         end
-        cloud_service = Azure::CloudServiceManagementService.new
+        cloud_service = client.cloud_service_management
         cloud_service.create_cloud_service(options[:cloud_service_name], optionals)
         cloud_service.upload_certificate(options[:cloud_service_name], params[:certificate]) unless params[:certificate].empty?
         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)
+          client.storage_management.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"
         Azure::Loggerx.info 'Deployment in progress...'
-        request = BaseManagement::ManagementHttpRequest.new(:post, path, body)
+        request = client.management_request(:post, path, body)
         request.call
         get_virtual_machine(params[:vm_name], options[:cloud_service_name])
       rescue Exception => e
-        e.message
+        Azure::Loggerx.error_with_exit "Failed to create virtual machine : "+e.message
       end
 
       # Public: Add a new role to a cloud service. Atleast one deployment should exist before you can add a role.
@@ -178,7 +174,7 @@ module Azure
         image = get_image(params[:image])
         options[:os_type] = image.os_type
         validate_deployment_params(params, options, true)
-        cloud_service = Azure::CloudServiceManagementService.new
+        cloud_service = client.cloud_service_management
         cloud_service = cloud_service.get_cloud_service_properties(params[:cloud_service_name])
         deployment_name = cloud_service.deployment_name
         Azure::Loggerx.error_with_exit "Deployment doesn't exists." if cloud_service && deployment_name.empty?
@@ -190,7 +186,7 @@ module Azure
         end
         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)
+          client.storage_management.create_storage_account(options[:storage_account_name], others)
         end
         Azure::Loggerx.info 'Deployment exists, adding role...'
         existing_ports = []
@@ -203,7 +199,7 @@ module Azure
         body = Serialization.role_to_xml(params, image, options).to_xml
         path = "/services/hostedservices/#{cloud_service.name}/deployments/#{deployment_name}/roles"
         Azure::Loggerx.info 'Deployment in progress...'
-        request = BaseManagement::ManagementHttpRequest.new(:post, path, body)
+        request = client.management_request(:post, path, body)
         request.call
         get_virtual_machine(params[:vm_name], cloud_service.name)
       end
@@ -224,18 +220,18 @@ module Azure
         vm = virtual_machines.select { |x| x.vm_name == vm_name }.first
         if vm
           if virtual_machines.size == 1
-            cloud_service = Azure::CloudServiceManagementService.new
+            cloud_service = client.cloud_service_management
             cloud_service.delete_cloud_service_deployment(cloud_service_name)
             cloud_service.delete_cloud_service(cloud_service_name)
           else
             path = "/services/hostedservices/#{vm.cloud_service_name}/deployments/#{vm.deployment_name}/roles/#{vm.vm_name}"
             Azure::Loggerx.info "Deleting virtual machine #{vm_name}. \n"
-            request = BaseManagement::ManagementHttpRequest.new(:delete, path)
+            request = client.management_request(:delete, path)
             request.call
           end
           Azure::Loggerx.info "Waiting for disk to be released.\n"
           disk_name = vm.disk_name
-          disk_management_service = VirtualMachineDiskManagementService.new
+          disk_management_service = client.vm_disk_management
           # Wait for 180s for disk to be released.
           disk = nil
           18.times do
@@ -277,7 +273,7 @@ module Azure
             path = "/services/hostedservices/#{vm.cloud_service_name}/deployments/#{vm.deployment_name}/roleinstances/#{vm.vm_name}/Operations"
             body = Serialization.shutdown_virtual_machine_to_xml
             Azure::Loggerx.info "Shutting down virtual machine \"#{vm.vm_name}\" ..."
-            request = BaseManagement::ManagementHttpRequest.new(:post, path, body)
+            request = client.management_request(:post, path, body)
             request.call
           else
             Azure::Loggerx.error 'Cannot perform the shutdown operation on a stopped deployment.'
@@ -306,7 +302,7 @@ module Azure
             path = "/services/hostedservices/#{vm.cloud_service_name}/deployments/#{vm.deployment_name}/roleinstances/#{vm.vm_name}/Operations"
             body = Serialization.start_virtual_machine_to_xml
             Azure::Loggerx.info "Starting virtual machine \"#{vm.vm_name}\" ..."
-            request = BaseManagement::ManagementHttpRequest.new(:post, path, body)
+            request = client.management_request(:post, path, body: body)
             request.call
           end
         else
@@ -330,7 +326,7 @@ module Azure
           path = "/services/hostedservices/#{vm.cloud_service_name}/deployments/#{vm.deployment_name}/roleinstances/#{vm.vm_name}/Operations"
           body = Serialization.restart_virtual_machine_to_xml
           Azure::Loggerx.info "Restarting virtual machine \"#{vm.vm_name}\" ..."
-          request = BaseManagement::ManagementHttpRequest.new(:post, path, body)
+          request = client.management_request(:post, path, body: body)
           request.call
         else
           Azure::Loggerx.error "Cannot find virtual machine \"#{vm_name}\" under cloud service \"#{cloud_service_name}\"."
@@ -391,7 +387,7 @@ module Azure
           end
           endpoints += input_endpoints
           body = Serialization.update_role_to_xml(endpoints, vm)
-          request = BaseManagement::ManagementHttpRequest.new(:put, path, body)
+          request = client.management_request(:put, path, body: body)
           Azure::Loggerx.info "Updating endpoints of virtual machine #{vm.vm_name} ..."
           request.call
         else
@@ -417,7 +413,7 @@ 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 = BaseManagement::ManagementHttpRequest.new(:put, path, body)
+          request = client.management_request(:put, path, body: body)
           Azure::Loggerx.info "Deleting virtual machine endpoint #{endpoint_name} ..."
           request.call
         else
@@ -455,7 +451,7 @@ module Azure
           path = "/services/hostedservices/#{cloud_service_name}/deployments/#{vm.deployment_name}/roles/#{vm_name}/DataDisks"
           body = Serialization.add_data_disk_to_xml(vm, options)
           Azure::Loggerx.info "Adding data disk to virtual machine #{vm_name} ..."
-          request = BaseManagement::ManagementHttpRequest.new(:post, path, body)
+          request = client.management_request(:post, path, body: body)
           request.call
         else
           Azure::Loggerx.error "Cannot find virtual machine \"#{vm_name}\" under cloud service \"#{cloud_service_name}\"."
@@ -468,7 +464,7 @@ module Azure
       #
       # Returns Linux or Windows
       def get_image(image_name)
-        image_service = Azure::VirtualMachineImageManagementService.new
+        image_service = client.vm_image_management
         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
@@ -534,20 +530,14 @@ module Azure
       end
 
       def validate_role_size(vm_size)
-        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
-        )
+        suggested_role_sizes = client.base_management.list_role_sizes
         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
 
       def validate_location(location_name)
-        locations = Azure::BaseManagementService.new.list_locations
+        locations = client.base_management.list_locations
         location = locations.select { |loc| loc.name.downcase == location_name.downcase }.first
         if location.nil?
           Azure::Loggerx.error_with_exit "Value '#{location_name}' specified for parameter 'location' is invalid. Allowed values are #{locations.map(&:name).join(',')}"
@@ -558,3 +548,5 @@ module Azure
     end
   end
 end
+
+Azure::VirtualMachineManagementService = Azure::VirtualMachineManagement::VirtualMachineManagementService