fog-azure-rm 0.0.4 → 0.0.5

data/lib/fog/azurerm/requests/storage/create_container.rb

@@ -1,17 +1,18 @@
 module Fog
   module Storage
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def create_container(name, options = {})
-          Fog::Logger.debug "Creating container: #{name}."
+          msg = "Creating container: #{name}."
+          Fog::Logger.debug msg
           begin
             container = @blob_client.create_container(name, options)
-            Fog::Logger.debug "Container #{name} created successfully."
-            container
           rescue Azure::Core::Http::HTTPError => ex
-            raise "Exception in creating the container #{name}: #{ex.inspect}"
+            raise_azure_exception(ex, msg)
           end
+          Fog::Logger.debug "Container #{name} created successfully."
+          container
         end
       end
 

data/lib/fog/azurerm/requests/storage/create_storage_account.rb

@@ -1,37 +1,51 @@
 module Fog
   module Storage
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
-        def create_storage_account(resource_group, name, params)
-          Fog::Logger.debug "Creating Storage Account: #{name}."
+        def create_storage_account(storage_account_hash)
+          msg = "Creating Storage Account: #{storage_account_hash[:name]} in Resource Group #{storage_account_hash[:resource_group]}."
+          Fog::Logger.debug msg
+          storage_account_params = get_storage_account_params(storage_account_hash[:sku_name],
+                                                              storage_account_hash[:location],
+                                                              storage_account_hash[:replication])
           begin
-            promise = @storage_mgmt_client.storage_accounts.create(resource_group, name, params)
-            response = promise.value!
-            Fog::Logger.debug 'Storage Account created successfully.'
-            body = response.body
-            body.properties.last_geo_failover_time = DateTime.parse(Time.now.to_s)
-            body.properties.creation_time = DateTime.parse(Time.now.to_s)
-            result = Azure::ARM::Storage::Models::StorageAccount.serialize_object(response.body)
-            result
+            storage_account = @storage_mgmt_client.storage_accounts.create(storage_account_hash[:resource_group],
+                                                                           storage_account_hash[:name],
+                                                                           storage_account_params)
           rescue MsRestAzure::AzureOperationError => e
-            msg = "Exception creating Storage Account #{name} in Resource Group #{resource_group}. #{e.body['error']['message']}"
-            raise msg
+            raise_azure_exception(e, msg)
           end
+          Fog::Logger.debug 'Storage Account created successfully.'
+          storage_account
+        end
+
+        private
+
+        def get_storage_account_params(sku_name, location, replication)
+          params = Azure::ARM::Storage::Models::StorageAccountCreateParameters.new
+          sku = Azure::ARM::Storage::Models::Sku.new
+          sku.name = "#{sku_name}_#{replication}"
+          params.sku = sku
+          params.kind = Azure::ARM::Storage::Models::Kind::Storage
+          params.location = location
+          params
         end
       end
       # This class provides the mock implementation for unit tests.
       class Mock
-        def create_storage_account(_resource_group, _name, params)
-          {
-            'location' => params.location,
-            'properties' =>
-            {
-              'accountType' => params.properties.account_type,
-              'lastGeoFailoverTime' => DateTime.parse(Time.now.to_s).strftime('%FT%TZ'),
-              'creationTime' => DateTime.parse(Time.now.to_s).strftime('%FT%TZ')
-            }
+        def create_storage_account(*)
+          storage_account_hash = {
+            'id' => '/subscriptions/67f2116d-4ea2-4c6c-b20a-f92183dbe3cb/resourceGroups/fog_test_rg/providers/Microsoft.Storage/storageAccounts/fogtestsasecond',
+            'name' => 'fog-test-storage-account',
+            'location' => 'west us',
+            'sku' =>
+              {
+                'name' => 'Standard_LRS'
+              }
           }
+          storage_account_mapper = Azure::ARM::Storage::Models::StorageAccount.mapper
+          storage_mgmt_client.deserialize(storage_account_mapper, storage_account_hash, 'hash')
         end
       end
     end

data/lib/fog/azurerm/requests/storage/delete_container.rb

@@ -1,17 +1,18 @@
 module Fog
   module Storage
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def delete_container(name, options = {})
-          Fog::Logger.debug "Deleting container: #{name}."
+          msg = "Deleting container: #{name}."
+          Fog::Logger.debug msg
           begin
             @blob_client.delete_container(name, options)
-            Fog::Logger.debug "Container #{name} deleted successfully."
-            true
           rescue Azure::Core::Http::HTTPError => ex
-            raise "Exception in deleting the container #{name}: #{ex.inspect}"
+            raise_azure_exception(ex, msg)
           end
+          Fog::Logger.debug "Container #{name} deleted successfully."
+          true
         end
       end
 

data/lib/fog/azurerm/requests/storage/delete_disk.rb

@@ -1,25 +1,26 @@
 module Fog
   module Storage
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def delete_disk(resource_group, storage_account_name, blob_name)
-          Fog::Logger.debug "Deleting Disk: #{blob_name}."
-          access_key = get_storage_access_keys(resource_group, storage_account_name)['key2']
+          msg = "Deleting Disk: #{blob_name}."
+          Fog::Logger.debug msg
+          keys = get_storage_access_keys(resource_group, storage_account_name)
+          access_key = keys[1].value
           client = Azure::Storage::Client.new(storage_account_name: storage_account_name, storage_access_key: access_key)
           blob_service = Azure::Storage::Blob::BlobService.new(client: client)
           begin
             result = blob_service.delete_blob('vhds', "#{blob_name}.vhd")
-            if result.nil?
-              Fog::Logger.debug "Successfully deleted Disk: #{blob_name}."
-              true
-            else
-              Fog::Logger.debug 'Error deleting Disk.'
-              false
-            end
           rescue Azure::Core::Http::HTTPError => e
-            msg = "Error deleting Disk. #{e.description}"
-            raise msg
+            raise_azure_exception(e, msg)
+          end
+          if result.nil?
+            Fog::Logger.debug "Successfully deleted Disk: #{blob_name}."
+            true
+          else
+            Fog::Logger.debug 'Error deleting Disk.'
+            false
           end
         end
       end

data/lib/fog/azurerm/requests/storage/delete_storage_account.rb

@@ -1,19 +1,18 @@
 module Fog
   module Storage
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def delete_storage_account(resource_group, name)
-          Fog::Logger.debug "Deleting Storage Account: #{name}."
+          msg = "Deleting Storage Account: #{name} in Resource Group #{resource_group}."
+          Fog::Logger.debug msg
           begin
-            promise = @storage_mgmt_client.storage_accounts.delete(resource_group, name)
-            promise.value!
-            Fog::Logger.debug "Storage Account #{name} deleted successfully."
-            true
-          rescue  MsRestAzure::AzureOperationError => e
-            msg = "Exception deleting Storage Account #{name} in Resource Group #{resource_group}. #{e.body['error']['message']}"
-            raise msg
+            @storage_mgmt_client.storage_accounts.delete(resource_group, name)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
           end
+          Fog::Logger.debug "Storage Account #{name} deleted successfully."
+          true
         end
       end
       # This class provides the mock implementation for unit tests.

data/lib/fog/azurerm/requests/storage/get_blob_metadata.rb

@@ -1,25 +1,26 @@
 module Fog
   module Storage
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def get_blob_metadata(container_name, name)
-          Fog::Logger.debug "Get Blob #{name} metadata in container #{container_name}."
+          msg = "Getting Blob #{name} metadata in container #{container_name}."
+          Fog::Logger.debug msg
           begin
               blob = @blob_client.get_blob_metadata(container_name, name)
-              Fog::Logger.debug "Getting metadata of blob #{name} successfully."
-              blob.metadata
             rescue Azure::Core::Http::HTTPError => ex
-              raise "Exception in getting metadata of Blob #{name}: #{ex.inspect}"
-            end
+              raise_azure_exception(ex, msg)
+          end
+          Fog::Logger.debug "Getting metadata of blob #{name} successfully."
+          blob.metadata
         end
       end
       # This class provides the mock implementation for unit tests.
       class Mock
-        def get_blob_metadata(container_name, name)
+        def get_blob_metadata(*)
           {
-            'container-name' => container_name,
-            'blob-name' => name,
+            'container-name' => 'testcontainer1',
+            'blob-name' => 'testblob',
             'category' => 'Images',
             'resolution' => 'High'
           }

data/lib/fog/azurerm/requests/storage/get_container_access_control_list.rb

@@ -1,17 +1,18 @@
 module Fog
   module Storage
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def get_container_access_control_list(name, options = {})
-          Fog::Logger.debug "Get container ACL: #{name}."
+          msg = "Get container ACL: #{name}."
+          Fog::Logger.debug msg
           begin
             container_acl = @blob_client.get_container_acl(name, options)
-            Fog::Logger.debug "Getting ACL of container #{name} successfully."
-            container_acl
           rescue Azure::Core::Http::HTTPError => ex
-            raise "Exception in getting ACL of container #{name}: #{ex.inspect}"
+            raise_azure_exception(ex, msg)
           end
+          Fog::Logger.debug "Getting ACL of container #{name} successfully."
+          container_acl
         end
       end
 

data/lib/fog/azurerm/requests/storage/get_container_metadata.rb

@@ -1,24 +1,25 @@
 module Fog
   module Storage
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def get_container_metadata(name)
-          Fog::Logger.debug "Get Container #{name} metadata."
+          msg = "Getting Container #{name} metadata."
+          Fog::Logger.debug msg
           begin
             container = @blob_client.get_container_metadata(name)
-            Fog::Logger.debug "Getting metadata of container #{name} successfully."
-            container.metadata
           rescue Azure::Core::Http::HTTPError => ex
-            raise "Exception in getting metadata of Container #{name}: #{ex.inspect}"
+            raise_azure_exception(ex, msg)
           end
+          Fog::Logger.debug "Getting metadata of container #{name} successfully."
+          container.metadata
         end
       end
       # This class provides the mock implementation for unit tests.
       class Mock
-        def get_container_metadata(name)
+        def get_container_metadata(*)
           {
-            'container-name' => name,
+            'container-name' => 'testcontainer1',
             'created-by' => 'User',
             'source-machine' => 'Test-machine',
             'category' => 'guidance',

data/lib/fog/azurerm/requests/storage/get_container_properties.rb

@@ -1,17 +1,18 @@
 module Fog
   module Storage
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def get_container_properties(name, options = {})
-          Fog::Logger.debug "Get container properties: #{name}."
+          msg = "Getting container properties: #{name}."
+          Fog::Logger.debug msg
           begin
             container_properties = @blob_client.get_container_properties(name, options)
-            Fog::Logger.debug "Getting properties of container #{name} successfully."
-            container_properties
           rescue Azure::Core::Http::HTTPError => ex
-            raise "Exception in getting properties of container #{name}: #{ex.inspect}"
+            raise_azure_exception(ex, msg)
           end
+          Fog::Logger.debug "Getting properties of container #{name} successfully."
+          container_properties
         end
       end
 

data/lib/fog/azurerm/requests/storage/get_storage_access_keys.rb

@@ -1,18 +1,18 @@
 module Fog
   module Storage
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def get_storage_access_keys(resource_group, storage_account_name, options = {})
-          Fog::Logger.debug "Getting storage access keys for storage account: #{storage_account_name}."
+          msg = "Getting storage access keys for storage account: #{storage_account_name}."
+          Fog::Logger.debug msg
           begin
-            storage_account_keys = @storage_mgmt_client.storage_accounts.list_keys(resource_group, storage_account_name, options).value!
-            Fog::Logger.debug "Storage access keys for storage account: #{storage_account_name} listed successfully."
-            Azure::ARM::Storage::Models::StorageAccountKeys.serialize_object(storage_account_keys.body)
+            storage_account_keys = @storage_mgmt_client.storage_accounts.list_keys(resource_group, storage_account_name, options)
           rescue MsRestAzure::AzureOperationError => e
-            msg = "Error getting storage access keys. #{e.body['error']['message']}"
-            raise msg
+            raise_azure_exception(e, msg)
           end
+          Fog::Logger.debug "Storage access keys for storage account: #{storage_account_name} listed successfully."
+          storage_account_keys.keys
         end
       end
       # This class provides the mock implementation.

data/lib/fog/azurerm/requests/storage/list_containers.rb

@@ -1,17 +1,18 @@
 module Fog
   module Storage
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def list_containers(options = {})
-          Fog::Logger.debug "Listing containers."
+          msg = "Listing containers."
+          Fog::Logger.debug msg
           begin
             containers = @blob_client.list_containers(options)
-            Fog::Logger.debug 'Listing containers successfully.'
-            containers
           rescue Azure::Core::Http::HTTPError => ex
-            raise "Exception in listing containers: #{ex.inspect}"
+            raise_azure_exception(ex, msg)
           end
+          Fog::Logger.debug 'Listing containers successfully.'
+          containers
         end
       end
 

data/lib/fog/azurerm/requests/storage/list_storage_account_for_rg.rb

@@ -1,22 +1,17 @@
 module Fog
   module Storage
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def list_storage_account_for_rg(resource_group)
+          msg = "Listing Storage Accounts in Resource Group #{resource_group}."
+          Fog::Logger.debug msg
           begin
-            promise = @storage_mgmt_client.storage_accounts.list_by_resource_group(resource_group)
-            response = promise.value!
-            body = response.body.value
-            body.each do |obj|
-              obj.properties.last_geo_failover_time = DateTime.parse(Time.now.to_s)
-            end
-            result = Azure::ARM::Storage::Models::StorageAccountListResult.serialize_object(response.body)['value']
-            result
-          rescue  MsRestAzure::AzureOperationError => e
-            msg = "Exception listing Storage Accounts in Resource Group #{resource_group}. #{e.body['error']['message']}"
-            raise msg
+            result = @storage_mgmt_client.storage_accounts.list_by_resource_group(resource_group)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
           end
+          result.value
         end
       end
       # This class provides the mock implementation for unit tests.

data/lib/fog/azurerm/requests/storage/list_storage_accounts.rb

@@ -1,23 +1,17 @@
 module Fog
   module Storage
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def list_storage_accounts
+          msg = 'Listing Storage Accounts.'
+          Fog::Logger.debug msg
           begin
-            promise = @storage_mgmt_client.storage_accounts.list
-            response = promise.value!
-            body = response.body.value
-            body.each do |obj|
-              obj.properties.last_geo_failover_time = DateTime.parse(Time.now.to_s)
-            end
-            result = Azure::ARM::Storage::Models::StorageAccountListResult.serialize_object(response.body)['value']
-            puts "Result: #{result}"
-            result
-          rescue  MsRestAzure::AzureOperationError => e
-            msg = "Exception listing Storage Accounts. #{e.body['error']['message']}"
-            raise msg
+            result = @storage_mgmt_client.storage_accounts.list
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
           end
+          result.value
         end
       end
       # This class provides the mock implementation for unit tests.

data/lib/fog/azurerm/requests/storage/set_blob_metadata.rb

@@ -1,23 +1,24 @@
 module Fog
   module Storage
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def set_blob_metadata(container_name, name, metadata)
-          Fog::Logger.debug "Set Blob #{name} metadata in a container #{container_name}."
+          msg = "Setting Blob #{name} metadata in a container #{container_name}."
+          Fog::Logger.debug msg
           begin
             @blob_client.set_blob_metadata(container_name, name, metadata)
-            Fog::Logger.debug "Setting metadata of blob #{name} successfully."
-            true
           rescue Azure::Core::Http::HTTPError => ex
-            raise "Exception in setting metadata of Blob #{name}: #{ex.inspect}"
+            raise_azure_exception(ex, msg)
           end
+          Fog::Logger.debug "Setting metadata of blob #{name} successfully."
+          true
         end
       end
       # This class provides the mock implementation for unit tests.
       class Mock
-        def set_blob_metadata(container_name, name, metadata)
-          Fog::Logger.debug "Set Blob #{name} metadata #{metadata} in a container #{container_name} successfully."
+        def set_blob_metadata(*)
+          Fog::Logger.debug "Set Blob metadata in a container successfully."
           true
         end
       end