fog-azure-rm 0.1.0 → 0.1.1

data/lib/fog/azurerm/models/storage/recovery_vault.rb

@@ -25,7 +25,7 @@ module Fog
         def save
           requires :name, :location, :resource_group
           recovery_vault = service.create_or_update_recovery_vault(resource_group, location, name)
-          merge_attributes(RecoveryVault.parse(recovery_vault))
+          merge_attributes(Fog::Storage::AzureRM::RecoveryVault.parse(recovery_vault))
         end
 
         def enable_backup_protection(vm_name, vm_resource_group)

data/lib/fog/azurerm/models/storage/recovery_vaults.rb

@@ -3,7 +3,7 @@ module Fog
     class AzureRM
       # This class is giving implementation of all/get for Recovery Vaults
       class RecoveryVaults < Fog::Collection
-        model RecoveryVault
+        model Fog::Storage::AzureRM::RecoveryVault
         attribute :resource_group
         attribute :name
 
@@ -11,15 +11,15 @@ module Fog
           requires :resource_group
           recovery_vaults = []
           service.list_recovery_vaults(resource_group).each do |recovery_vault|
-            recovery_vaults << RecoveryVault.parse(recovery_vault)
+            recovery_vaults << Fog::Storage::AzureRM::RecoveryVault.parse(recovery_vault)
           end
           load(recovery_vaults)
         end
 
         def get(resource_group, name)
           recovery_vault = service.get_recovery_vault(resource_group, name)
-          recovery_vault_obj = RecoveryVault.new(service: service)
-          recovery_vault_obj.merge_attributes(RecoveryVault.parse(recovery_vault))
+          recovery_vault_fog = Fog::Storage::AzureRM::RecoveryVault.new(service: service)
+          recovery_vault_fog.merge_attributes(Fog::Storage::AzureRM::RecoveryVault.parse(recovery_vault))
         end
       end
     end

data/lib/fog/azurerm/models/storage/storage_account.rb

@@ -32,11 +32,11 @@ module Fog
           self.sku_name = STANDARD_STORAGE if sku_name.nil?
           self.replication = ALLOWED_STANDARD_REPLICATION.first if replication.nil?
           validate_sku_name!
-          storage_account = service.create_storage_account(get_storage_account_arguments)
-          merge_attributes(StorageAccount.parse(storage_account))
+          storage_account = service.create_storage_account(storage_account_params)
+          merge_attributes(Fog::Storage::AzureRM::StorageAccount.parse(storage_account))
         end
 
-        def get_storage_account_arguments
+        def storage_account_params
           {
             resource_group: resource_group,
             name: name,
@@ -52,7 +52,7 @@ module Fog
           storage_account_params = merge_attributes(storage_account_params).all_attributes
 
           storage_account = service.update_storage_account(storage_account_params)
-          merge_attributes(StorageAccount.parse(storage_account))
+          merge_attributes(Fog::Storage::AzureRM::StorageAccount.parse(storage_account))
         end
 
         def validate_sku_name!
@@ -82,7 +82,7 @@ module Fog
           raise 'Cannot modify the given attribute' unless result.empty?
         end
 
-        private :get_storage_account_arguments, :validate_sku_name!
+        private :storage_account_params, :validate_sku_name!
       end
     end
   end

data/lib/fog/azurerm/models/storage/storage_accounts.rb

@@ -4,7 +4,7 @@ module Fog
       # This class is giving implementation of all/list, get and
       # check name availability for storage account.
       class StorageAccounts < Fog::Collection
-        model StorageAccount
+        model Fog::Storage::AzureRM::StorageAccount
         attribute :resource_group
 
         def all
@@ -16,15 +16,15 @@ module Fog
             hash_of_storage_accounts = service.list_storage_accounts
           end
           hash_of_storage_accounts.each do |account|
-            accounts << StorageAccount.parse(account)
+            accounts << Fog::Storage::AzureRM::StorageAccount.parse(account)
           end
           load(accounts)
         end
 
         def get(resource_group_name, storage_account_name)
           storage_account = service.get_storage_account(resource_group_name, storage_account_name)
-          storage_account_object = StorageAccount.new(service: service)
-          storage_account_object.merge_attributes(StorageAccount.parse(storage_account))
+          storage_account_fog = Fog::Storage::AzureRM::StorageAccount.new(service: service)
+          storage_account_fog.merge_attributes(Fog::Storage::AzureRM::StorageAccount.parse(storage_account))
         end
 
         def check_name_availability(name)

data/lib/fog/azurerm/models/traffic_manager/traffic_manager_end_point.rb

@@ -50,7 +50,7 @@ module Fog
         def create_or_update
           if %w(azureEndpoints externalEndpoints nestedEndpoints).select { |type| type if type.eql?(type) }.any?
             traffic_manager_endpoint = service.create_or_update_traffic_manager_endpoint(traffic_manager_endpoint_hash)
-            merge_attributes(TrafficManagerEndPoint.parse(traffic_manager_endpoint))
+            merge_attributes(Fog::TrafficManager::AzureRM::TrafficManagerEndPoint.parse(traffic_manager_endpoint))
           else
             raise(ArgumentError, ":type should be '#{AZURE_ENDPOINTS}', '#{EXTERNAL_ENDPOINTS}' or '#{NESTED_ENDPOINTS}'")
           end

data/lib/fog/azurerm/models/traffic_manager/traffic_manager_end_points.rb

@@ -5,20 +5,20 @@ module Fog
       class TrafficManagerEndPoints < Fog::Collection
         attribute :resource_group
         attribute :traffic_manager_profile_name
-        model TrafficManagerEndPoint
+        model Fog::TrafficManager::AzureRM::TrafficManagerEndPoint
 
         def all
           requires :resource_group, :traffic_manager_profile_name
 
           end_points = service.get_traffic_manager_profile(resource_group, traffic_manager_profile_name).endpoints
-          traffic_manager_endpoints = end_points.map { |endpoint| TrafficManagerEndPoint.parse(endpoint) }
+          traffic_manager_endpoints = end_points.map { |endpoint| Fog::TrafficManager::AzureRM::TrafficManagerEndPoint.parse(endpoint) }
           load(traffic_manager_endpoints)
         end
 
         def get(resource_group, traffic_manager_profile_name, end_point_name, type)
           endpoint = service.get_traffic_manager_end_point(resource_group, traffic_manager_profile_name, end_point_name, type)
-          endpoint_obj = TrafficManagerEndPoint.new(service: service)
-          endpoint_obj.merge_attributes(TrafficManagerEndPoint.parse(endpoint))
+          endpoint_fog = Fog::TrafficManager::AzureRM::TrafficManagerEndPoint.new(service: service)
+          endpoint_fog.merge_attributes(Fog::TrafficManager::AzureRM::TrafficManagerEndPoint.parse(endpoint))
         end
       end
     end

data/lib/fog/azurerm/models/traffic_manager/traffic_manager_profile.rb

@@ -36,8 +36,8 @@ module Fog
           traffic_manager_profile['resource_group'] = get_resource_group_from_id(profile.id)
           traffic_manager_profile['endpoints'] = []
           profile.endpoints.each do |endpoint|
-            end_point = TrafficManagerEndPoint.new
-            traffic_manager_profile['endpoints'] << end_point.merge_attributes(TrafficManagerEndPoint.parse(endpoint))
+            end_point = Fog::TrafficManager::AzureRM::TrafficManagerEndPoint.new
+            traffic_manager_profile['endpoints'] << end_point.merge_attributes(Fog::TrafficManager::AzureRM::TrafficManagerEndPoint.parse(endpoint))
           end
           traffic_manager_profile
         end
@@ -46,7 +46,7 @@ module Fog
           requires :name, :resource_group, :traffic_routing_method, :relative_name, :ttl,
                    :protocol, :port, :path
           traffic_manager_profile = service.create_or_update_traffic_manager_profile(traffic_manager_profile_hash)
-          merge_attributes(TrafficManagerProfile.parse(traffic_manager_profile))
+          merge_attributes(Fog::TrafficManager::AzureRM::TrafficManagerProfile.parse(traffic_manager_profile))
         end
 
         def destroy
@@ -57,7 +57,7 @@ module Fog
           validate_input(profile_params)
           merge_attributes(profile_params)
           profile = service.create_or_update_traffic_manager_profile(traffic_manager_profile_hash)
-          merge_attributes(TrafficManagerProfile.parse(profile))
+          merge_attributes(Fog::TrafficManager::AzureRM::TrafficManagerProfile.parse(profile))
         end
 
         private

data/lib/fog/azurerm/models/traffic_manager/traffic_manager_profiles.rb

@@ -4,18 +4,18 @@ module Fog
       # Traffic Manager Profile Collection for TrafficManager Service
       class TrafficManagerProfiles < Fog::Collection
         attribute :resource_group
-        model TrafficManagerProfile
+        model Fog::TrafficManager::AzureRM::TrafficManagerProfile
 
         def all
           requires :resource_group
-          traffic_manager_profiles = service.list_traffic_manager_profiles(resource_group).map { |profile| TrafficManagerProfile.parse(profile) }
+          traffic_manager_profiles = service.list_traffic_manager_profiles(resource_group).map { |profile| Fog::TrafficManager::AzureRM::TrafficManagerProfile.parse(profile) }
           load(traffic_manager_profiles)
         end
 
         def get(resource_group, traffic_manager_profile_name)
           profile = service.get_traffic_manager_profile(resource_group, traffic_manager_profile_name)
-          profile_obj = TrafficManagerProfile.new(service: service)
-          profile_obj.merge_attributes(TrafficManagerProfile.parse(profile))
+          profile_fog = Fog::TrafficManager::AzureRM::TrafficManagerProfile.new(service: service)
+          profile_fog.merge_attributes(Fog::TrafficManager::AzureRM::TrafficManagerProfile.parse(profile))
         end
       end
     end

data/lib/fog/azurerm/network.rb

@@ -145,7 +145,7 @@ module Fog
           end
 
           credentials = Fog::Credentials::AzureRM.get_credentials(options[:tenant_id], options[:client_id], options[:client_secret])
-          @network_client = ::Azure::ARM::Network::NetworkManagementClient.new(credentials)
+          @network_client = ::Azure::ARM::Network::NetworkManagementClient.new(credentials, resource_manager_endpoint_url)
           @network_client.subscription_id = options[:subscription_id]
           @tenant_id = options[:tenant_id]
           @client_id = options[:client_id]

data/lib/fog/azurerm/requests/compute/create_virtual_machine.rb

@@ -66,30 +66,34 @@ module Fog
           hw_profile
         end
 
+        def image_reference(publisher, offer, sku, version)
+          image_reference = Azure::ARM::Compute::Models::ImageReference.new
+          image_reference.publisher = publisher
+          image_reference.offer = offer
+          image_reference.sku = sku
+          image_reference.version = version
+          image_reference
+        end
+
         def define_storage_profile(vm_name, storage_account_name, publisher, offer, sku, version, vhd_path, platform, resource_group)
           storage_profile = Azure::ARM::Compute::Models::StorageProfile.new
           os_disk = Azure::ARM::Compute::Models::OSDisk.new
           vhd = Azure::ARM::Compute::Models::VirtualHardDisk.new
 
-          vhd.uri = "http://#{storage_account_name}.blob.core.windows.net/vhds/#{vm_name}_os_disk.vhd"
+          vhd.uri = get_blob_link(storage_account_name) + "/vhds/#{vm_name}_os_disk.vhd"
 
           if vhd_path.nil?
-            image_reference = Azure::ARM::Compute::Models::ImageReference.new
-            image_reference.publisher = publisher
-            image_reference.offer = offer
-            image_reference.sku = sku
-            image_reference.version = version
-            storage_profile.image_reference = image_reference
+            storage_profile.image_reference = image_reference(publisher, offer, sku, version)
           else
             # Copy if VHD does not exist belongs to same storage account.
             vhd_storage_account = (vhd_path.split('/')[2]).split('.')[0]
             if storage_account_name != vhd_storage_account
               storage_account = @storage_service.storage_accounts.get(resource_group, storage_account_name)
-              access_key = storage_account.get_access_keys[0].value
-              storage_data = Fog::Storage.new(provider: 'AzureRM', azure_storage_account_name: storage_account_name, azure_storage_access_key: access_key)
-
-              container_name = 'customimagevhd'
-              blob_name = 'vhd_image.vhd'
+              access_key = storage_account.get_access_keys.first.value
+              storage_data = Fog::Storage::AzureRM.new(provider: 'AzureRM', azure_storage_account_name: storage_account_name, azure_storage_access_key: access_key)
+              new_time = get_time
+              container_name = "customvhd#{new_time}"
+              blob_name = "vhd_image#{new_time}.vhd"
               storage_data.directories.create(
                 key: container_name
               )
@@ -99,7 +103,7 @@ module Fog
                 Fog::Logger.debug 'Waiting disk to ready'
                 sleep(10)
               end
-              new_vhd_path = "http://#{storage_account_name}.blob.core.windows.net/customimagevhd/vhd_image.vhd"
+              new_vhd_path = get_blob_link(storage_account_name) + "/#{container_name}/#{blob_name}"
               Fog::Logger.debug "Path:#{new_vhd_path}. | Copy done"
             else
               new_vhd_path = vhd_path

data/lib/fog/azurerm/requests/network/list_virtual_networks.rb

@@ -1,7 +1,7 @@
 module Fog
   module Network
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def list_virtual_networks(resource_group)
           msg = "Listing Virtual Networks in Resource Group #{resource_group}"

data/lib/fog/azurerm/requests/resources/create_deployment.rb

@@ -1,7 +1,7 @@
 module Fog
   module Resources
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def create_deployment(resource_group, deployment_name, template_link, parameters_link)
           msg = "Creating Deployment: #{deployment_name} in Resource Group: #{resource_group}"

data/lib/fog/azurerm/requests/resources/create_resource_group.rb

@@ -1,7 +1,7 @@
 module Fog
   module Resources
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def create_resource_group(name, location)
           msg = "Creating Resource Group: #{name}."

data/lib/fog/azurerm/requests/resources/delete_deployment.rb

@@ -1,7 +1,7 @@
 module Fog
   module Resources
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def delete_deployment(resource_group, deployment_name)
           msg = "Deleting Deployment: #{deployment_name} in Resource Group: #{resource_group}"

data/lib/fog/azurerm/requests/resources/delete_resource_group.rb

@@ -1,7 +1,7 @@
 module Fog
   module Resources
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def delete_resource_group(name)
           msg = "Deleting Resource Group: #{name}."

data/lib/fog/azurerm/requests/resources/get_deployment.rb

@@ -1,7 +1,7 @@
 module Fog
   module Resources
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def get_deployment(resource_group, deployment_name)
           msg = "Getting Deployment #{deployment_name} in Resource Group: #{resource_group}"

data/lib/fog/azurerm/requests/resources/get_resource_group.rb

@@ -1,7 +1,7 @@
 module Fog
   module Resources
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def get_resource_group(resource_group_name)
           msg = "Getting Resource Group #{resource_group_name}"

data/lib/fog/azurerm/requests/resources/list_deployments.rb

@@ -1,7 +1,7 @@
 module Fog
   module Resources
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def list_deployments(resource_group)
           msg = "Listing Deployments in Resource Group: #{resource_group}"

data/lib/fog/azurerm/requests/resources/list_resource_groups.rb

@@ -1,7 +1,7 @@
 module Fog
   module Resources
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def list_resource_groups
           msg = 'Listing Resource Groups'

data/lib/fog/azurerm/requests/resources/list_tagged_resources.rb

@@ -1,7 +1,7 @@
 module Fog
   module Resources
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def list_tagged_resources(tag_name, tag_value = nil)
           msg = "Listing Resources with tagname: #{tag_name}"

data/lib/fog/azurerm/requests/resources/tag_resource.rb

@@ -1,7 +1,7 @@
 module Fog
   module Resources
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def tag_resource(resource_id, tag_name, tag_value)
           split_resource = resource_id.split('/') unless resource_id.nil?

data/lib/fog/azurerm/requests/sql/create_or_update_database.rb

@@ -6,7 +6,7 @@ module Fog
         def create_or_update_database(database_hash)
           msg = "Creating SQL Database: #{database_hash[:name]}."
           Fog::Logger.debug msg
-          resource_url = "#{AZURE_RESOURCE}/subscriptions/#{@subscription_id}/resourceGroups/#{database_hash[:resource_group]}/providers/Microsoft.Sql/servers/#{database_hash[:server_name]}/databases/#{database_hash[:name]}?api-version=2014-04-01-preview"
+          resource_url = "#{resource_manager_endpoint_url}/subscriptions/#{@subscription_id}/resourceGroups/#{database_hash[:resource_group]}/providers/Microsoft.Sql/servers/#{database_hash[:server_name]}/databases/#{database_hash[:name]}?api-version=2014-04-01-preview"
           request_parameters = get_database_parameters(database_hash[:location], database_hash[:create_mode], database_hash[:edition], database_hash[:source_database_id], database_hash[:collation], database_hash[:max_size_bytes], database_hash[:requested_service_objective_name], database_hash[:restore_point_in_time], database_hash[:source_database_deletion_date], database_hash[:elastic_pool_name], database_hash[:requested_service_objective_id])
           begin
             token = Fog::Credentials::AzureRM.get_token(@tenant_id, @client_id, @client_secret)
@@ -18,10 +18,10 @@ module Fog
               authorization: token
             )
           rescue RestClient::Exception => e
-            raise JSON.parse(e.response)['message']
+            raise_azure_exception(e, msg)
           end
           Fog::Logger.debug "SQL Database: #{database_hash[:name]} created successfully."
-          JSON.parse(response)
+          Fog::JSON.decode(response)
         end
 
         private

data/lib/fog/azurerm/requests/sql/create_or_update_firewall_rule.rb

@@ -7,7 +7,7 @@ module Fog
           msg = "Creating SQL Firewall Rule : #{firewall_hash[:name]}."
           Fog::Logger.debug msg
 
-          resource_url = "#{AZURE_RESOURCE}/subscriptions/#{@subscription_id}/resourceGroups/#{firewall_hash[:resource_group]}/providers/Microsoft.Sql/servers/#{firewall_hash[:server_name]}/firewallRules/#{firewall_hash[:name]}?api-version=2014-04-01-preview"
+          resource_url = "#{resource_manager_endpoint_url}/subscriptions/#{@subscription_id}/resourceGroups/#{firewall_hash[:resource_group]}/providers/Microsoft.Sql/servers/#{firewall_hash[:server_name]}/firewallRules/#{firewall_hash[:name]}?api-version=2014-04-01-preview"
           request_parameters = get_server_firewall_parameters(firewall_hash[:start_ip], firewall_hash[:end_ip])
           begin
             token = Fog::Credentials::AzureRM.get_token(@tenant_id, @client_id, @client_secret)
@@ -19,10 +19,10 @@ module Fog
               authorization: token
             )
           rescue RestClient::Exception => e
-            raise JSON.parse(e.response)['message']
+            raise_azure_exception(e, msg)
           end
           Fog::Logger.debug "SQL Firewall Rule : #{firewall_hash[:name]} created successfully."
-          JSON.parse(response)
+          Fog::JSON.decode(response)
         end
 
         private

data/lib/fog/azurerm/requests/sql/create_or_update_sql_server.rb

@@ -6,7 +6,7 @@ module Fog
         def create_or_update_sql_server(server_hash)
           msg = "Creating SQL Server: #{server_hash[:name]}."
           Fog::Logger.debug msg
-          resource_url = "#{AZURE_RESOURCE}/subscriptions/#{@subscription_id}/resourceGroups/#{server_hash[:resource_group]}/providers/Microsoft.Sql/servers/#{server_hash[:name]}?api-version=2014-04-01-preview"
+          resource_url = "#{resource_manager_endpoint_url}/subscriptions/#{@subscription_id}/resourceGroups/#{server_hash[:resource_group]}/providers/Microsoft.Sql/servers/#{server_hash[:name]}?api-version=2014-04-01-preview"
           request_parameters = get_server_parameters(server_hash[:location], server_hash[:version], server_hash[:administrator_login], server_hash[:administrator_login_password])
           begin
             token = Fog::Credentials::AzureRM.get_token(@tenant_id, @client_id, @client_secret)
@@ -18,10 +18,10 @@ module Fog
               authorization: token
             )
           rescue RestClient::Exception => e
-            raise JSON.parse(e.response)['message']
+            raise_azure_exception(e, msg)
           end
           Fog::Logger.debug "SQL Server: #{server_hash[:name]} created successfully."
-          JSON.parse(response)
+          Fog::JSON.decode(response)
         end
 
         private

data/lib/fog/azurerm/requests/sql/delete_database.rb

@@ -6,7 +6,7 @@ module Fog
         def delete_database(resource_group, server_name, name)
           msg = "Deleting SQL Database: #{name}."
           Fog::Logger.debug msg
-          resource_url = "#{AZURE_RESOURCE}/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Sql/servers/#{server_name}/databases/#{name}?api-version=2014-04-01-preview"
+          resource_url = "#{resource_manager_endpoint_url}/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Sql/servers/#{server_name}/databases/#{name}?api-version=2014-04-01-preview"
           begin
             token = Fog::Credentials::AzureRM.get_token(@tenant_id, @client_id, @client_secret)
             RestClient.delete(
@@ -16,7 +16,7 @@ module Fog
               authorization: token
             )
           rescue RestClient::Exception => e
-            raise JSON.parse(e.response)['message']
+            raise_azure_exception(e, msg)
           end
           Fog::Logger.debug "SQL Database: #{name} deleted successfully."
           true