lib/fog/azurerm/compute.rb in fog-azure-rm-0.1.2 vs lib/fog/azurerm/compute.rb in fog-azure-rm-0.2.0

- old
+ new

@@ -4,16 +4,18 @@ class AzureRM < Fog::Service requires :tenant_id requires :client_id requires :client_secret requires :subscription_id + recognizes :environment request_path 'fog/azurerm/requests/compute' request :create_availability_set request :delete_availability_set request :list_availability_sets request :get_availability_set + request :check_availability_set_exists request :create_virtual_machine request :delete_virtual_machine request :get_virtual_machine request :list_virtual_machines request :list_available_sizes_for_virtual_machine @@ -22,15 +24,17 @@ request :power_off_virtual_machine request :redeploy_virtual_machine request :restart_virtual_machine request :start_virtual_machine request :check_vm_status + request :check_vm_exists request :attach_data_disk_to_vm request :detach_data_disk_from_vm request :create_or_update_vm_extension request :delete_vm_extension request :get_vm_extension + request :check_vm_extension_exists model_path 'fog/azurerm/models/compute' model :availability_set collection :availability_sets model :server @@ -59,15 +63,21 @@ rescue LoadError => e retry if require('rubygems') raise e.message end - credentials = Fog::Credentials::AzureRM.get_credentials(options[:tenant_id], options[:client_id], options[:client_secret]) - @compute_mgmt_client = ::Azure::ARM::Compute::ComputeManagementClient.new(credentials, resource_manager_endpoint_url) + + options[:environment] = 'AzureCloud' if options[:environment].nil? + + telemetry = "fog-azure-rm/#{Fog::AzureRM::VERSION}" + credentials = Fog::Credentials::AzureRM.get_credentials(options[:tenant_id], options[:client_id], options[:client_secret], options[:environment]) + @compute_mgmt_client = ::Azure::ARM::Compute::ComputeManagementClient.new(credentials, resource_manager_endpoint_url(options[:environment])) @compute_mgmt_client.subscription_id = options[:subscription_id] - @storage_mgmt_client = ::Azure::ARM::Storage::StorageManagementClient.new(credentials, resource_manager_endpoint_url) + @compute_mgmt_client.add_user_agent_information(telemetry) + @storage_mgmt_client = ::Azure::ARM::Storage::StorageManagementClient.new(credentials, resource_manager_endpoint_url(options[:environment])) @storage_mgmt_client.subscription_id = options[:subscription_id] - @storage_service = Fog::Storage::AzureRM.new(tenant_id: options[:tenant_id], client_id: options[:client_id], client_secret: options[:client_secret], subscription_id: options[:subscription_id]) + @storage_mgmt_client.add_user_agent_information(telemetry) + @storage_service = Fog::Storage::AzureRM.new(tenant_id: options[:tenant_id], client_id: options[:client_id], client_secret: options[:client_secret], subscription_id: options[:subscription_id], environment: options[:environment]) end end end end end