azure 0.6.4 → 0.7.0.pre

data/lib/azure/storage_management/serialization.rb

@@ -20,6 +20,7 @@ module Azure
     # Storage management serialization module is responsible for converting
     # the objects to XML and vice versa.
     module Serialization
+      extend Azure::Core::Utility
       def self.storage_services_to_xml(name, options = {})
         builder = Nokogiri::XML::Builder.new do |xml|
           xml.CreateStorageServiceInput(
@@ -51,11 +52,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 +76,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,13 +114,13 @@ 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?) &&
-           (options[:description].nil? || options[:description].empty?)
+            (options[:description].nil? || options[:description].empty?)
           fail 'Either one of Label or Description'\
-                ' has to be provided. Both cannot be empty'
+            ' has to be provided. Both cannot be empty'
         end
 
         # The input param may not be nil or empty, but the values inside may
@@ -129,15 +131,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 +166,38 @@ 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].to_s.empty?
+        xml.AccountType options[:account_type] if options[:account_type]
+      end
+
+      def self.storage_account_keys_from_xml(storage_xml)
+        storage_xml.css('StorageService')
+        storage_service_xml = storage_xml.css('StorageService').first
+        service_key_xml = storage_service_xml.css('StorageServiceKeys').first
+        storage_account_keys = StorageAccountKeys.new
+        storage_account_keys.url = xml_content(storage_service_xml, 'Url')
+        storage_account_keys.primary_key = xml_content(service_key_xml, 'Primary')
+        storage_account_keys.secondary_key = xml_content(service_key_xml, 'Secondary')
+        storage_account_keys
+      end
+
+      def self.regenerate_storage_account_keys_to_xml(key_type)
+        builder = Nokogiri::XML::Builder.new do |xml|
+          xml.RegenerateKeys(
+            'xmlns' => 'http://schemas.microsoft.com/windowsazure'
+          ) do
+            xml.KeyType(key_type)
           end
-        end unless options[:extended_properties].nil?\
-          || options[:extended_properties].empty?
+        end
+        builder.doc.to_xml
       end
     end
   end

data/lib/azure/storage_management/storage_account.rb

@@ -14,7 +14,7 @@
 #--------------------------------------------------------------------------
 module Azure
   module StorageManagement
-    # Represents a Windows Azure storage account
+    # Represents a Microsoft Azure storage account
     class StorageAccount
       def initialize
         yield self if block_given?
@@ -35,6 +35,14 @@ 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
+    class StorageAccountKeys
+      attr_accessor :url
+      attr_accessor :primary_key
+      attr_accessor :secondary_key
     end
   end
 end

data/lib/azure/storage_management/storage_management_service.rb

@@ -17,7 +17,7 @@ require 'azure/storage_management/serialization'
 module Azure
   module StorageManagement
     # Provides Storage Management API
-    class StorageManagementService < BaseManagementService
+    class StorageManagementService < BaseManagement::BaseManagementService
       def initialize
         super()
       end
@@ -27,7 +27,7 @@ module Azure
       # Returns an array of Azure::StorageManagement::StorageAccount objects
       def list_storage_accounts
         request_path = '/services/storageservices'
-        request = ManagementHttpRequest.new(:get, request_path, nil)
+        request = Azure::BaseManagement::ManagementHttpRequest.new(:get, request_path, nil)
         response = request.call
         Serialization.storage_services_from_xml(response)
       end
@@ -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.to_s) == 0 }.first
       end
 
       # Public: Gets the properties of the storage account specified.
@@ -60,17 +49,17 @@ module Azure
       #
       # * +name+  - String. The name of the storage account. Required.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee460802.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/ee460802.aspx
       #
       # Returns the storage account
       def get_storage_account_properties(name)
         request_path = "/services/storageservices/#{name}"
-        request = ManagementHttpRequest.new(:get, request_path, nil)
+        request = Azure::BaseManagement::ManagementHttpRequest.new(:get, request_path, nil)
         response = request.call
         Serialization.storage_services_from_xml(response).first
       end
 
-      # Public: Create a new storage account in Windows Azure.
+      # Public: Create a new storage account in Microsoft Azure.
       #
       # ==== Attributes
       #
@@ -94,27 +83,31 @@ 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..."
+          Azure::Loggerx.warn "Storage Account #{name} already exists. Skipped..."
         else
-          Loggerx.info "Creating Storage Account #{name}."
+          Azure::Loggerx.info "Creating Storage Account #{name}."
           body = Serialization.storage_services_to_xml(name, options)
           request_path = '/services/storageservices'
-          request = ManagementHttpRequest.new(:post, request_path, body)
+          request = Azure::BaseManagement::ManagementHttpRequest.new(:post, request_path, body)
           request.call
         end
       end
 
-      # Public: Updates an existing storage account in Windows Azure
+      # Public: Updates an existing storage account in Microsoft Azure
       #
       # ==== Attributes
       #
       # * +name+          - String. The name of the storage service.
-      # * +options+       - Hash. Optional parameters.
+      # * +options+       - Hash. parameters.
       #
       # ==== Options
       #
@@ -126,41 +119,90 @@ 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..."
+          Azure::Loggerx.info "Account '#{name}' exists, updating..."
           body = Serialization.storage_update_to_xml options
           request_path = "/services/storageservices/#{name}"
-          request = ManagementHttpRequest.new(:put, request_path, body)
+          request = Azure::BaseManagement::ManagementHttpRequest.new(:put, request_path, body)
           request.call
         else
-          Loggerx.warn "Storage Account '#{name}' does not exist. Skipped..."
+          Azure::Loggerx.warn "Storage Account '#{name}' does not exist. Skipped..."
         end
       end
 
       # Public: Deletes the specified storage account of given subscription id
-      # from Windows Azure.
+      # from Microsoft Azure.
       #
       # ==== Attributes
       #
       # * +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}."
+        Azure::Loggerx.info "Deleting Storage Account #{name}."
         request_path = "/services/storageservices/#{name}"
-        request = ManagementHttpRequest.new(:delete, request_path)
+        request = Azure::BaseManagement::ManagementHttpRequest.new(:delete, request_path)
         request.call
-      rescue Exception => e
+      rescue => e
         e.message
       end
+
+      # Public: Regenerates the primary or secondary access key for the specified storage account
+      #
+      # ==== Attributes
+      #
+      # * +name+       - String. Storage account name.
+      # * +key_type+   - String. Specifies which key(primary or secondary) to regenerate
+      #
+      # Returns an  Azure::StorageManagement::StorageAccountKeys instance.
+      #
+      # See:
+      # http://msdn.microsoft.com/en-us/library/azure/ee460795.aspx
+      def regenerate_storage_account_keys(name, key_type = 'primary')
+        if get_storage_account name
+          path = "/services/storageservices/#{name}/keys?action=regenerate"
+          body = Serialization.regenerate_storage_account_keys_to_xml key_type
+          request = Azure::BaseManagement::ManagementHttpRequest.new(:post, path, body)
+          response = request.call
+          Serialization.storage_account_keys_from_xml(response)
+        else
+          Azure::Loggerx.warn "Storage Account '#{name}' does not exist."
+        end
+      end
+
+      # Public: Gets the primary and secondary access keys for the specified storage account.
+      #
+      # ==== Attributes
+      #
+      # * +name+       - String. Storage account name.
+      #
+      # Returns an  Azure::StorageManagement::StorageAccountKeys instance.
+      #
+      # See:
+      # http://msdn.microsoft.com/en-us/library/azure/ee460785.aspx
+      def get_storage_account_keys(name)
+        if get_storage_account name
+          path = "/services/storageservices/#{name}/keys"
+          request = Azure::BaseManagement::ManagementHttpRequest.new(:get, path)
+          response = request.call
+          Serialization.storage_account_keys_from_xml(response)
+        else
+          Azure::Loggerx.warn "Storage Account '#{name}' does not exist."
+        end
+      end
     end
   end
 end

data/lib/azure/table/batch.rb

@@ -201,7 +201,7 @@ module Azure
       # * +row_key+       - String. The row key
       # * +entity_values+ - Hash. A hash of the name/value pairs for the entity. 
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179433
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179433
       public
       def insert(row_key, entity_values)
         check_entity_key(row_key)
@@ -231,7 +231,7 @@ module Azure
       # * :create_if_not_exists  - Boolean. If true, and partition_key and row_key do not reference and existing entity, 
       #   that entity will be inserted. If false, the operation will fail. (optional, Default=false)
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179427
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179427
       public
       def update(row_key, entity_values, options={})
         check_entity_key(row_key)
@@ -263,7 +263,7 @@ module Azure
       # * +create_if_not_exists+  - Boolean. If true, and partition_key and row_key do not reference and existing entity, 
       #   that entity will be inserted. If false, the operation will fail. (optional, Default=false)
       # 
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179392
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179392
       public
       def merge(row_key, entity_values, options={})
         check_entity_key(row_key)
@@ -286,7 +286,7 @@ module Azure
       # * +row_key+               - String. The row key
       # * +entity_values+         - Hash. A hash of the name/value pairs for the entity.
       # 
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/hh452241
+      # See http://msdn.microsoft.com/en-us/library/azure/hh452241
       public
       def insert_or_merge(row_key, entity_values)
         merge(row_key, entity_values, { :create_if_not_exists => true })
@@ -300,7 +300,7 @@ module Azure
       # * +row_key+               - String. The row key
       # * +entity_values+         - Hash. A hash of the name/value pairs for the entity. 
       # 
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/hh452242
+      # See http://msdn.microsoft.com/en-us/library/azure/hh452242
       public
       def insert_or_replace(row_key, entity_values)
         update(row_key, entity_values, { :create_if_not_exists => true })
@@ -319,7 +319,7 @@ module Azure
       # Accepted key/value pairs in options parameter are:
       # * +if_match+      - String. A matching condition which is required for update (optional, Default="*")
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd135727
+      # See http://msdn.microsoft.com/en-us/library/azure/dd135727
       public
       def delete(row_key, options={})
         add_operation(:delete, @table_service.entities_uri(table, partition, row_key), nil, {"If-Match"=> options[:if_match] || "*"})

data/lib/azure/table/table_service.rb

@@ -41,7 +41,7 @@ module Azure
       #
       # * +:timeout+   - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd135729
+      # See http://msdn.microsoft.com/en-us/library/azure/dd135729
       #
       # Returns nil on success
       def create_table(table_name, options={})
@@ -65,7 +65,7 @@ module Azure
       # Accepted key/value pairs in options parameter are:
       # * +:timeout+   - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179387
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179387
       #
       # Returns nil on success
       def delete_table(table_name, options={})
@@ -111,7 +111,7 @@ module Azure
       #   larger than a single operation can return at once. (optional)
       # * +:timeout+            - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179405
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179405
       #
       # Returns an array with an extra continuation_token property on success
       def query_tables(options={})
@@ -141,7 +141,7 @@ module Azure
       # Accepted key/value pairs in options parameter are:
       # * +:timeout+   - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/jj159100
+      # See http://msdn.microsoft.com/en-us/library/azure/jj159100
       #
       # Returns a list of Azure::Entity::SignedIdentifier instances
       def get_table_acl(table_name, options={})
@@ -168,7 +168,7 @@ module Azure
       # * +:signed_identifiers+  - Array. A list of Azure::Entity::SignedIdentifier instances
       # * +:timeout+             - Integer. A timeout in seconds.
       # 
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/jj159102
+      # See http://msdn.microsoft.com/en-us/library/azure/jj159102
       #
       # Returns nil on success
       def set_table_acl(table_name, options={})
@@ -197,7 +197,7 @@ module Azure
       # Accepted key/value pairs in options parameter are:
       # * +:timeout+      - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179433
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179433
       #
       # Returns a Azure::Entity::Table::Entity
       def insert_entity(table_name, entity_values, options={})
@@ -236,7 +236,7 @@ module Azure
       # * +:continuation_token+ - Hash. The continuation token.
       # * +:timeout+            - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179421
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179421
       #
       # Returns an array with an extra continuation_token property on success
       def query_entities(table_name, options={})
@@ -291,7 +291,7 @@ module Azure
       #   that entity will be inserted. If false, the operation will fail. (optional, Default=false)
       # * +:timeout+               - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179427
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179427
       #
       # Returns the ETag for the entity on success 
       def update_entity(table_name, entity_values, options={})
@@ -329,7 +329,7 @@ module Azure
       #   that entity will be inserted. If false, the operation will fail. (optional, Default=false)
       # * +:timeout+               - Integer. A timeout in seconds.
       # 
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179392
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179392
       # 
       # Returns the ETag for the entity on success 
       def merge_entity(table_name, entity_values, options={})
@@ -363,7 +363,7 @@ module Azure
       # Accepted key/value pairs in options parameter are:
       # * +:timeout+      - Integer. A timeout in seconds.
       # 
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/hh452241
+      # See http://msdn.microsoft.com/en-us/library/azure/hh452241
       # 
       # Returns the ETag for the entity on success 
       def insert_or_merge_entity(table_name, entity_values, options={})
@@ -384,7 +384,7 @@ module Azure
       # Accepted key/value pairs in options parameter are:
       # * +:timeout+      - Integer. A timeout in seconds.
       # 
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/hh452242
+      # See http://msdn.microsoft.com/en-us/library/azure/hh452242
       #
       # Returns the ETag for the entity on success 
       def insert_or_replace_entity(table_name, entity_values, options={})
@@ -407,7 +407,7 @@ module Azure
       # * +:if_match+     - String. A matching condition which is required for update (optional, Default="*")
       # * +:timeout+      - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd135727
+      # See http://msdn.microsoft.com/en-us/library/azure/dd135727
       #
       # Returns nil on success
       def delete_entity(table_name, partition_key, row_key, options={})
@@ -433,7 +433,7 @@ module Azure
       # Accepted key/value pairs in options parameter are:
       # * +:timeout+      - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd894038
+      # See http://msdn.microsoft.com/en-us/library/azure/dd894038
       #
       # Returns an array of results, one for each operation in the batch
       def execute_batch(batch, options={})