azurex 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c96ccd80aafb20085d1e9b30e35c0546542f1ef1
-  data.tar.gz: c383e6867d9e57d804bdb2d2134fad00a56b4250
+  metadata.gz: 97ea989a0ffca5af37573d3c744b46a0f104d820
+  data.tar.gz: fc1a69389027cb0816ddcce59acdbcdebc797f3a
 SHA512:
-  metadata.gz: 6c8d74bd5d0fa9754e3b30071a5c4e984235418cbd365d99537670b75c2ed091b62e9bd29112b92fc8abb9e076f1f6973657adddb56efa16d38b034775a07c44
-  data.tar.gz: 48b7d6a731e96eacf0eb477e9b7d334a157e17176da345450de705d2e4425e2d4c57381c7265499b9023171bcff579f0cc3d60f052414553c40f327d9230c7df
+  metadata.gz: b205dad74df5dd56dae98fcc09dfea3026cfa050681d8719f935296e09a4d538c50d04b35b792927b631cd6f8bb47bb33b5b72161fd5bb72d53e097e2c0947e3
+  data.tar.gz: d6156443d72df0cb806a23d57a82eb8f7fea63d7ed9f7b47d97bd5d4fa0e2b363ebffffe561f56bb3b83bd9783b98a5c371e2ea8b3ce700e43a0e2e6192a65f9

data/.gitignore

@@ -10,4 +10,6 @@ nbproject/*
 *.orig
 
 
-.DS_Store
+.DS_Store
+.ruby-version
+.ruby-gemset

data/Gemfile

@@ -13,4 +13,4 @@
 # limitations under the License.
 #--------------------------------------------------------------------------
 source 'https://rubygems.org'
-gemspec
+gemspec

data/README.md

@@ -9,6 +9,8 @@ This repo has the following enhancements over the original:
 * Provision VMs from custom images
 * More webhooks for cloud services
 * Access more attributes from virtual machines
+* CustomData for virtual machines
+* Support for the A8, A9 and 'D' series VM sizes
 
 There are three goals for this repo:
 

data/lib/azure.rb

@@ -14,6 +14,7 @@
 #--------------------------------------------------------------------------
 module Azure; end
 
+# The order that files are required in is important...
 require 'azure/core'
 require 'azure/blob/blob_service'
 require 'azure/queue/queue_service'
@@ -37,6 +38,8 @@ require 'azure/cloud_service_management/cloud_service_management_service'
 require 'azure/base_management/location'
 require 'azure/sql_database_management/sql_database_management_service'
 require 'azure/virtual_network_management/virtual_network_management_service'
+require 'core_ext/string'
+require 'core_ext/ip_addr'
 
 # add some aliases for convenience
 Azure::BlobService = Azure::Blob::BlobService

data/lib/azure/base_management/management_http_request.rb

@@ -35,7 +35,7 @@ module Azure
         @warn = false
         content_length = body ? body.bytesize.to_s : '0'
         @headers = {
-          'x-ms-version' => '2014-05-01',
+          'x-ms-version' => '2014-06-01',
           'Content-Type' => 'application/xml',
           'Content-Length' => content_length
         }
@@ -156,7 +156,7 @@ module Azure
       #
       # * +request_id+       - String.  x-ms-request-id response header of request
       #
-      # See: http://msdn.microsoft.com/en-us/library/windowsazure/ee460783.aspx
+      # See: http://msdn.microsoft.com/en-us/library/azure/ee460783.aspx
       #
       # Print Error or Success of Operation.
       def check_completion(request_id)
@@ -241,4 +241,4 @@ module Azure
         end
     end
   end
-end
+end

data/lib/azure/cloud_service_management/cloud_service_management_service.rb

@@ -297,15 +297,7 @@ module Azure
       # If true, the cloud service is available. If false, the cloud service
       # does not exist.
       def get_cloud_service(name)
-        return false if name.nil?
-        flag = false
-        list_cloud_services.each do |cloud_service|
-          if cloud_service.name == name
-            flag = true
-            break
-          end
-        end
-        flag
+        list_cloud_services.select { |x| x.name.casecmp(name) == 0 }.first
       end
 
       def get_cloud_service_properties(name)

data/lib/azure/core/utility.rb

@@ -117,74 +117,3 @@ module Azure
   end
 end
 
-class String
-  { reset:  0,
-    bold:  1,
-    dark:  2,
-    underline:  4,
-    blink:  5,
-    orange:  6,
-    negative:  7,
-    black: 30,
-    red: 31,
-    green: 32,
-    yellow: 33,
-    blue: 34,
-    magenta: 35,
-    cyan: 36,
-    white: 37,
-  }.each do |key, value|
-    define_method key do
-      "\e[#{value}m" + self + "\e[0m"
-    end
-  end
-end
-
-# Code validate private/public IP acceptable ranges.
-class IPAddr
-  PRIVATE_RANGES = [
-    IPAddr.new('10.0.0.0/8'),
-    IPAddr.new('172.16.0.0/12'),
-    IPAddr.new('192.168.0.0/16')
-  ]
-
-  def private?
-    return false unless self.ipv4?
-    PRIVATE_RANGES.each do |ipr|
-      return true if ipr.include?(self)
-    end
-    false
-  end
-
-  def public?
-    !private?
-  end
-
-  class << self
-    def validate_ip_and_prefix(ip, cidr)
-      if cidr.to_s.empty?
-        raise "Cidr is missing for IP '#{ip}'."
-      elsif valid?(ip)
-        raise "Ip address '#{ip}' is invalid."
-      elsif !IPAddr.new(ip).private?
-        raise "Ip Address #{ip} must be private."
-      end
-    end
-
-    def validate_address_space(ip)
-      if ip.split('/').size != 2
-        raise "Cidr is invalid for IP #{ip}."
-      elsif valid?(ip)
-        raise "Address space '#{ip}' is invalid."
-      end
-    end
-
-    def address_prefix(ip, cidr)
-      ip + '/' + cidr.to_s
-    end
-
-    def valid?(ip)
-      (IPAddr.new(ip) rescue nil).nil?
-    end
-  end
-end

data/lib/azure/storage_management/serialization.rb

@@ -51,11 +51,9 @@ module Azure
           storage_account.name = xml_content(
             storage_service_xml, 'ServiceName'
           )
-
           storage_service_properties = storage_service_xml.css(
             'StorageServiceProperties'
           )
-
           storage_account.description = xml_content(
             storage_service_properties, 'Description'
           )
@@ -77,6 +75,9 @@ module Azure
           storage_account.geo_replication_enabled = xml_content(
             storage_service_properties, 'GeoReplicationEnabled'
           )
+          storage_account.account_type = xml_content(
+            storage_service_properties, 'AccountType'
+          )
           storage_account.geo_primary_region = xml_content(
             storage_service_properties, 'GeoPrimaryRegion'
           )
@@ -112,7 +113,7 @@ module Azure
 
       def self.storage_update_to_xml(options)
         # Cannot update if options is nil or empty
-        fail 'No options specified' if options.nil? || options.empty?
+        fail 'No options specified' if options.empty?
 
         # Either one of Label, or Description is required.
         if (options[:label].nil? || options[:label].empty?) &&
@@ -129,15 +130,13 @@ module Azure
           when :description, :label
             is_empty = value.nil? || value.empty?
           when :geo_replication_enabled
-            is_empty = !(value.kind_of?(TrueClass)\
-                || value.kind_of?(FalseClass))
+            is_empty = !(value.is_a?(TrueClass) || value.is_a?(FalseClass))
           when :extended_properties
             value.each do |p, v|
               is_empty = ((p.nil? || p.empty?) || (v.nil? || v.empty?))
               break unless is_empty
             end
           end
-
           break unless is_empty
         end
 
@@ -166,18 +165,16 @@ module Azure
         gre = options[:geo_replication_enabled]
         xml.GeoReplicationEnabled(
           gre
-        ) unless gre.nil?\
-          || !(gre.kind_of?(TrueClass) || gre.kind_of?(FalseClass))
+        ) unless gre.nil? || !(gre.is_a?(TrueClass) || gre.is_a?(FalseClass))
         xml.ExtendedProperties do
           options[:extended_properties].each do |name, value|
             xml.ExtendedProperty do
               xml.Name name
               xml.Value value
-            end unless (name.nil? || name.empty?)\
-              || (value.nil? || value.empty?)
+            end unless (name.to_s.empty?) || (value.to_s.empty?)
           end
-        end unless options[:extended_properties].nil?\
-          || options[:extended_properties].empty?
+        end unless options[:extended_properties].to_s.empty?
+        xml.AccountType options[:account_type] if options[:account_type]
       end
 
       def self.storage_account_keys_from_xml(storage_xml)

data/lib/azure/storage_management/storage_account.rb

@@ -35,6 +35,7 @@ module Azure
       attr_accessor :status_of_secondary
       attr_accessor :creation_time
       attr_accessor :extended_properties
+      attr_accessor :account_type
     end
 
     # Represents Windows Azure storage account keys

data/lib/azure/storage_management/storage_management_service.rb

@@ -38,20 +38,9 @@ module Azure
       #
       # * +name+       - String. Storage account name.
       #
-      # Returns: A boolean value indicating whether the storage account exists.
-      # If true, the storage account exists. If false, the storage account
-      # does not exist.
+      # Returns an Azure::StorageManagement::StorageAccount instance
       def get_storage_account(name)
-        return false if name.nil?
-        flag = false
-        storage_accounts = list_storage_accounts
-        storage_accounts.each do |storage|
-          if storage.name == name
-            flag = true
-            break
-          end
-        end
-        flag
+        list_storage_accounts.select { |x| x.name.casecmp(name) == 0 }.first
       end
 
       # Public: Gets the properties of the storage account specified.
@@ -94,10 +83,14 @@ module Azure
       # * +:extended_properties+      - Hash. Key/Value pairs of extended
       # properties to add to the storage account. The key is used as the
       # property name and the value as its value. (optional)
+      # * +:account_type+  - String.  Specifies the type of storage account
       #
+      # See http://msdn.microsoft.com/en-us/library/azure/hh264518.aspx
+      # 
       # Returns None
       def create_storage_account(name, options = {})
         raise 'Name not specified' if !name || name.class != String || name.empty?
+        options[:account_type] ||= 'Standard_GRS'
         if get_storage_account(name)
           Loggerx.warn "Storage Account #{name} already exists. Skipped..."
         else
@@ -114,7 +107,7 @@ module Azure
       # ==== Attributes
       #
       # * +name+          - String. The name of the storage service.
-      # * +options+       - Hash. Optional parameters.
+      # * +options+       - Hash.  parameters.
       #
       # ==== Options
       #
@@ -126,14 +119,17 @@ module Azure
       # Required if no label is provided. If both label and description are
       # provided, only the label will get updated.
       # * +:geo_replication_enabled+ - Boolean (TrueClass/FalseClass). Boolean
-      # flag indicating wheter to turn Geo replication on or off. (optional)
+      # flag indicating whether to turn Geo replication on or off. (optional)
       # * +:extended_properties+      - Hash. Key/Value pairs of extended
       # properties to add to the storage account. The key is used as the
       # property name and the value as its value. (optional)
+      # * +:account_type+  - String.  Specifies the type of storage account
+      #
+      # See http://msdn.microsoft.com/en-us/library/azure/hh264516.aspx
       #
       # Returns None
       # Fails with RuntimeError if invalid options specified
-      def update_storage_account(name, options = {})
+      def update_storage_account(name, options)
         if get_storage_account name
           Loggerx.info "Account '#{name}' exists, updating..."
           body = Serialization.storage_update_to_xml options
@@ -152,13 +148,15 @@ module Azure
       #
       # * +name+       - String. Storage account name.
       #
+      # See http://msdn.microsoft.com/en-us/library/azure/hh264517.aspx
+      # 
       # Returns:  None
       def delete_storage_account(name)
         Loggerx.info "Deleting Storage Account #{name}."
         request_path = "/services/storageservices/#{name}"
         request = ManagementHttpRequest.new(:delete, request_path)
         request.call
-      rescue Exception => e
+      rescue => e
         e.message
       end
 
@@ -205,7 +203,6 @@ module Azure
           Loggerx.warn "Storage Account '#{name}' does not exist."
         end
       end
-
     end
   end
 end

data/lib/azure/version.rb

@@ -17,7 +17,7 @@ module Azure
   class Version
     MAJOR = 0 unless defined? MAJOR
     MINOR = 6 unless defined? MINOR
-    UPDATE = 6 unless defined? UPDATE
+    UPDATE = 7 unless defined? UPDATE
     PRE = nil unless defined? PRE
 
     class << self

data/lib/azure/virtual_machine_image_management/serialization.rb

@@ -33,13 +33,27 @@ module Azure
         os_images
       end
 
+      def self.virtual_machine_vmimages_from_xml(imageXML)
+        os_images = []
+        virtual_machine_images = imageXML.css('VMImages VMImage')
+        virtual_machine_images.each do |image_node|
+          image = VirtualMachineImage.new
+          image.os_type = xml_content(image_node, 'OS')
+          image.name = xml_content(image_node, 'Name')
+          image.category = xml_content(image_node, 'Category')
+          image.locations = xml_content(image_node, 'Location')
+          os_images << image
+        end
+        os_images
+      end
+
       def self.disks_from_xml(diskXML)
         os_disks = []
         disks = diskXML.css('Disks Disk')
         disks.each do |disk_node|
           disk = VirtualMachineDisk.new
           disk.name = xml_content(disk_node, 'Name')
-          disk.os_type = xml_content(disk_node, 'OS')
+          disk.os_type = xml_content(disk_node, 'OSDiskConfiguration OS')
           disk.attached = !xml_content(disk_node, 'AttachedTo').empty?
           disk.image = xml_content(disk_node, 'SourceImageName')
           disk.size = xml_content(disk_node, 'LogicalDiskSizeInGB')

data/lib/azure/virtual_machine_image_management/virtual_machine_image_management_service.rb

@@ -21,15 +21,44 @@ module Azure
         super()
       end
 
-      # Public: Gets a list of virtual machine images from the server
+      # Public: Gets a list of all virtual machine images from the server both user created images and public images
+      # @param imageType = :public (public images), :private (user generated images). :all (both types)
+      # Returns an array of Azure::VirtualMachineImageManagementService objects
+      def list_virtual_machine_images(imageType=:all)
+        images = Array.new
+        if imageType == :public or imageType == :all
+          public_images = list_public_virtual_machine_images
+          images.concat public_images
+        end
+
+        if imageType == :private or imageType == :all
+          private_images = list_private_virtual_machine_images
+          images.concat private_images
+        end
+
+        images
+      end
+
+      # Public: Gets a list of virtual machine images from the server returns both user generated and public images by default
       #
       # Returns an array of Azure::VirtualMachineImageManagementService objects
-      def list_virtual_machine_images
+      def list_public_virtual_machine_images
         request_path = '/services/images'
         request = ManagementHttpRequest.new(:get, request_path, nil)
         response = request.call
         Serialization.virtual_machine_images_from_xml(response)
       end
+
+      # Public: Gets a list of private virtual machine images from the server
+      #
+      # Returns an array of Azure::VirtualMachineImageManagementService objects
+      def list_private_virtual_machine_images
+        request_path = '/services/vmimages'
+        request = ManagementHttpRequest.new(:get, request_path, nil)
+        response = request.call
+        Serialization.virtual_machine_vmimages_from_xml(response)
+      end
+
     end
 
     class VirtualMachineDiskManagementService < BaseManagementService

data/lib/azure/virtual_machine_management/serialization.rb

@@ -183,7 +183,7 @@ module Azure
       def self.add_custom_data(xml, options)
         if options[:custom_data]
           custom_data = options[:custom_data]
-          unless custom_data.chomp[/==$/]
+          unless custom_data.resembles_base64?
             custom_data = Base64.encode64(custom_data) 
           end
           xml.CustomData custom_data

data/lib/azure/virtual_machine_management/virtual_machine_management_service.rb

@@ -112,7 +112,7 @@ module Azure
         validate_deployment_params(params, options)
         options[:deployment_name] ||= options[:cloud_service_name]
         Loggerx.info 'Creating deploymnent...'
-        options[:cloud_service_name] ||= generate_cloud_service_name(params[:vm_name])        
+        options[:cloud_service_name] ||= generate_cloud_service_name(params[:vm_name])
         optionals = {}
         if options[:virtual_network_name]
           virtual_network_service = Azure::VirtualNetworkManagementService.new
@@ -122,7 +122,7 @@ module Azure
           else
             vnet = virtual_networks.first
             if !vnet.affinity_group.empty?
-              options[:affinity_group_name] = vnet.affinity_group
+              optionals[:affinity_group_name] = vnet.affinity_group
             else
               optionals[:location] = vnet.location
             end
@@ -543,9 +543,9 @@ module Azure
       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)
+        valid_role_sizes = %w(ExtraSmall Small Medium Large ExtraLarge A5 A6 A7 A8 A9 Basic_A0 Basic_A1 Basic_A2 Basic_A3 Basic_A4 Standard_D1 Standard_D2 Standard_D3 Standard_D4 Standard_D11 Standard_D12 Standard_D13 Standard_D14)
         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'"
+          Loggerx.error_with_exit "Value '#{vm_size}' specified for parameter 'vm_size' is invalid. Allowed values are 'ExtraSmall Small Medium Large ExtraLarge A5 A6 A7 A8 A9 Basic_A0 Basic_A1 Basic_A2 Basic_A3 Basic_A4 Standard_D1 Standard_D2 Standard_D3 Standard_D4 Standard_D11 Standard_D12 Standard_D13 Standard_D14'"
         end
       end