Skip to content
This repository has been archived by the owner on Jan 11, 2023. It is now read-only.

[AutoPR compute/resource-manager] [Disk swagger] Removing resourceUpdate, adding contents to diskupdate and snapshotupdate #1334

Merged
merged 1 commit into from
May 31, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion azure_sdk/lib/azure_sdk.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.

require 'latest/latest_profile_client'
require 'v2017_03_09/v2017_03_09_profile_client'
require 'latest/latest_profile_client'
68 changes: 32 additions & 36 deletions azure_sdk/lib/latest/modules/compute_profile_module.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,23 +27,22 @@ module Mgmt
VirtualMachineRunCommands = Azure::Compute::Mgmt::V2017_12_01::VirtualMachineRunCommands

module Models
EncryptionSettings = Azure::Compute::Mgmt::V2018_04_01::Models::EncryptionSettings
DiskSku = Azure::Compute::Mgmt::V2018_04_01::Models::DiskSku
DiskUpdate = Azure::Compute::Mgmt::V2018_04_01::Models::DiskUpdate
CreationData = Azure::Compute::Mgmt::V2018_04_01::Models::CreationData
DiskList = Azure::Compute::Mgmt::V2018_04_01::Models::DiskList
KeyVaultAndSecretReference = Azure::Compute::Mgmt::V2018_04_01::Models::KeyVaultAndSecretReference
SnapshotSku = Azure::Compute::Mgmt::V2018_04_01::Models::SnapshotSku
ResourceUpdate = Azure::Compute::Mgmt::V2018_04_01::Models::ResourceUpdate
GrantAccessData = Azure::Compute::Mgmt::V2018_04_01::Models::GrantAccessData
CreationData = Azure::Compute::Mgmt::V2018_04_01::Models::CreationData
AccessUri = Azure::Compute::Mgmt::V2018_04_01::Models::AccessUri
KeyVaultAndSecretReference = Azure::Compute::Mgmt::V2018_04_01::Models::KeyVaultAndSecretReference
KeyVaultAndKeyReference = Azure::Compute::Mgmt::V2018_04_01::Models::KeyVaultAndKeyReference
EncryptionSettings = Azure::Compute::Mgmt::V2018_04_01::Models::EncryptionSettings
DiskSku = Azure::Compute::Mgmt::V2018_04_01::Models::DiskSku
SourceVault = Azure::Compute::Mgmt::V2018_04_01::Models::SourceVault
SnapshotList = Azure::Compute::Mgmt::V2018_04_01::Models::SnapshotList
AccessUri = Azure::Compute::Mgmt::V2018_04_01::Models::AccessUri
ImageDiskReference = Azure::Compute::Mgmt::V2018_04_01::Models::ImageDiskReference
SnapshotList = Azure::Compute::Mgmt::V2018_04_01::Models::SnapshotList
KeyVaultAndKeyReference = Azure::Compute::Mgmt::V2018_04_01::Models::KeyVaultAndKeyReference
SnapshotUpdate = Azure::Compute::Mgmt::V2018_04_01::Models::SnapshotUpdate
Disk = Azure::Compute::Mgmt::V2018_04_01::Models::Disk
DiskUpdate = Azure::Compute::Mgmt::V2018_04_01::Models::DiskUpdate
Snapshot = Azure::Compute::Mgmt::V2018_04_01::Models::Snapshot
SnapshotUpdate = Azure::Compute::Mgmt::V2018_04_01::Models::SnapshotUpdate
DiskCreateOption = Azure::Compute::Mgmt::V2018_04_01::Models::DiskCreateOption
SnapshotStorageAccountTypes = Azure::Compute::Mgmt::V2018_04_01::Models::SnapshotStorageAccountTypes
AccessLevel = Azure::Compute::Mgmt::V2018_04_01::Models::AccessLevel
Expand Down Expand Up @@ -287,57 +286,54 @@ def method_missing(method, *args)
end

class ModelClasses
def disk_list
Azure::Compute::Mgmt::V2018_04_01::Models::DiskList
end
def snapshot_sku
Azure::Compute::Mgmt::V2018_04_01::Models::SnapshotSku
def encryption_settings
Azure::Compute::Mgmt::V2018_04_01::Models::EncryptionSettings
end
def resource_update
Azure::Compute::Mgmt::V2018_04_01::Models::ResourceUpdate
def disk_sku
Azure::Compute::Mgmt::V2018_04_01::Models::DiskSku
end
def grant_access_data
Azure::Compute::Mgmt::V2018_04_01::Models::GrantAccessData
def disk_update
Azure::Compute::Mgmt::V2018_04_01::Models::DiskUpdate
end
def creation_data
Azure::Compute::Mgmt::V2018_04_01::Models::CreationData
end
def access_uri
Azure::Compute::Mgmt::V2018_04_01::Models::AccessUri
def disk_list
Azure::Compute::Mgmt::V2018_04_01::Models::DiskList
end
def key_vault_and_secret_reference
Azure::Compute::Mgmt::V2018_04_01::Models::KeyVaultAndSecretReference
end
def key_vault_and_key_reference
Azure::Compute::Mgmt::V2018_04_01::Models::KeyVaultAndKeyReference
end
def encryption_settings
Azure::Compute::Mgmt::V2018_04_01::Models::EncryptionSettings
def snapshot_sku
Azure::Compute::Mgmt::V2018_04_01::Models::SnapshotSku
end
def disk_sku
Azure::Compute::Mgmt::V2018_04_01::Models::DiskSku
def grant_access_data
Azure::Compute::Mgmt::V2018_04_01::Models::GrantAccessData
end
def source_vault
Azure::Compute::Mgmt::V2018_04_01::Models::SourceVault
end
def snapshot_list
Azure::Compute::Mgmt::V2018_04_01::Models::SnapshotList
def access_uri
Azure::Compute::Mgmt::V2018_04_01::Models::AccessUri
end
def image_disk_reference
Azure::Compute::Mgmt::V2018_04_01::Models::ImageDiskReference
end
def snapshot_list
Azure::Compute::Mgmt::V2018_04_01::Models::SnapshotList
end
def key_vault_and_key_reference
Azure::Compute::Mgmt::V2018_04_01::Models::KeyVaultAndKeyReference
end
def snapshot_update
Azure::Compute::Mgmt::V2018_04_01::Models::SnapshotUpdate
end
def disk
Azure::Compute::Mgmt::V2018_04_01::Models::Disk
end
def disk_update
Azure::Compute::Mgmt::V2018_04_01::Models::DiskUpdate
end
def snapshot
Azure::Compute::Mgmt::V2018_04_01::Models::Snapshot
end
def snapshot_update
Azure::Compute::Mgmt::V2018_04_01::Models::SnapshotUpdate
end
def disk_create_option
Azure::Compute::Mgmt::V2018_04_01::Models::DiskCreateOption
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ def initialize(client)
#
# @return [AvailabilitySet] operation results.
#
def create_or_update(resource_group_name, name, parameters, custom_headers:nil)
response = create_or_update_async(resource_group_name, name, parameters, custom_headers:custom_headers).value!
def create_or_update(resource_group_name, name, parameters, custom_headers = nil)
response = create_or_update_async(resource_group_name, name, parameters, custom_headers).value!
response.body unless response.nil?
end

Expand All @@ -50,8 +50,8 @@ def create_or_update(resource_group_name, name, parameters, custom_headers:nil)
#
# @return [MsRestAzure::AzureOperationResponse] HTTP response information.
#
def create_or_update_with_http_info(resource_group_name, name, parameters, custom_headers:nil)
create_or_update_async(resource_group_name, name, parameters, custom_headers:custom_headers).value!
def create_or_update_with_http_info(resource_group_name, name, parameters, custom_headers = nil)
create_or_update_async(resource_group_name, name, parameters, custom_headers).value!
end

#
Expand All @@ -66,7 +66,7 @@ def create_or_update_with_http_info(resource_group_name, name, parameters, custo
#
# @return [Concurrent::Promise] Promise object which holds the HTTP response.
#
def create_or_update_async(resource_group_name, name, parameters, custom_headers:nil)
def create_or_update_async(resource_group_name, name, parameters, custom_headers = nil)
fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
fail ArgumentError, 'name is nil' if name.nil?
fail ArgumentError, 'parameters is nil' if parameters.nil?
Expand All @@ -75,12 +75,13 @@ def create_or_update_async(resource_group_name, name, parameters, custom_headers


request_headers = {}
request_headers['Content-Type'] = 'application/json; charset=utf-8'

# Set Headers
request_headers['x-ms-client-request-id'] = SecureRandom.uuid
request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?

request_headers['Content-Type'] = 'application/json; charset=utf-8'

# Serialize Request
request_mapper = Azure::Compute::Mgmt::V2015_06_15::Models::AvailabilitySet.mapper()
request_content = @client.serialize(request_mapper, parameters)
Expand Down Expand Up @@ -137,8 +138,8 @@ def create_or_update_async(resource_group_name, name, parameters, custom_headers
#
# @return [OperationStatusResponse] operation results.
#
def delete(resource_group_name, availability_set_name, custom_headers:nil)
response = delete_async(resource_group_name, availability_set_name, custom_headers:custom_headers).value!
def delete(resource_group_name, availability_set_name, custom_headers = nil)
response = delete_async(resource_group_name, availability_set_name, custom_headers).value!
response.body unless response.nil?
end

Expand All @@ -152,8 +153,8 @@ def delete(resource_group_name, availability_set_name, custom_headers:nil)
#
# @return [MsRestAzure::AzureOperationResponse] HTTP response information.
#
def delete_with_http_info(resource_group_name, availability_set_name, custom_headers:nil)
delete_async(resource_group_name, availability_set_name, custom_headers:custom_headers).value!
def delete_with_http_info(resource_group_name, availability_set_name, custom_headers = nil)
delete_async(resource_group_name, availability_set_name, custom_headers).value!
end

#
Expand All @@ -166,15 +167,14 @@ def delete_with_http_info(resource_group_name, availability_set_name, custom_hea
#
# @return [Concurrent::Promise] Promise object which holds the HTTP response.
#
def delete_async(resource_group_name, availability_set_name, custom_headers:nil)
def delete_async(resource_group_name, availability_set_name, custom_headers = nil)
fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
fail ArgumentError, 'availability_set_name is nil' if availability_set_name.nil?
fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?


request_headers = {}
request_headers['Content-Type'] = 'application/json; charset=utf-8'

# Set Headers
request_headers['x-ms-client-request-id'] = SecureRandom.uuid
Expand Down Expand Up @@ -229,8 +229,8 @@ def delete_async(resource_group_name, availability_set_name, custom_headers:nil)
#
# @return [AvailabilitySet] operation results.
#
def get(resource_group_name, availability_set_name, custom_headers:nil)
response = get_async(resource_group_name, availability_set_name, custom_headers:custom_headers).value!
def get(resource_group_name, availability_set_name, custom_headers = nil)
response = get_async(resource_group_name, availability_set_name, custom_headers).value!
response.body unless response.nil?
end

Expand All @@ -244,8 +244,8 @@ def get(resource_group_name, availability_set_name, custom_headers:nil)
#
# @return [MsRestAzure::AzureOperationResponse] HTTP response information.
#
def get_with_http_info(resource_group_name, availability_set_name, custom_headers:nil)
get_async(resource_group_name, availability_set_name, custom_headers:custom_headers).value!
def get_with_http_info(resource_group_name, availability_set_name, custom_headers = nil)
get_async(resource_group_name, availability_set_name, custom_headers).value!
end

#
Expand All @@ -258,15 +258,14 @@ def get_with_http_info(resource_group_name, availability_set_name, custom_header
#
# @return [Concurrent::Promise] Promise object which holds the HTTP response.
#
def get_async(resource_group_name, availability_set_name, custom_headers:nil)
def get_async(resource_group_name, availability_set_name, custom_headers = nil)
fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
fail ArgumentError, 'availability_set_name is nil' if availability_set_name.nil?
fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?


request_headers = {}
request_headers['Content-Type'] = 'application/json; charset=utf-8'

# Set Headers
request_headers['x-ms-client-request-id'] = SecureRandom.uuid
Expand Down Expand Up @@ -320,8 +319,8 @@ def get_async(resource_group_name, availability_set_name, custom_headers:nil)
#
# @return [AvailabilitySetListResult] operation results.
#
def list(resource_group_name, custom_headers:nil)
response = list_async(resource_group_name, custom_headers:custom_headers).value!
def list(resource_group_name, custom_headers = nil)
response = list_async(resource_group_name, custom_headers).value!
response.body unless response.nil?
end

Expand All @@ -334,8 +333,8 @@ def list(resource_group_name, custom_headers:nil)
#
# @return [MsRestAzure::AzureOperationResponse] HTTP response information.
#
def list_with_http_info(resource_group_name, custom_headers:nil)
list_async(resource_group_name, custom_headers:custom_headers).value!
def list_with_http_info(resource_group_name, custom_headers = nil)
list_async(resource_group_name, custom_headers).value!
end

#
Expand All @@ -347,14 +346,13 @@ def list_with_http_info(resource_group_name, custom_headers:nil)
#
# @return [Concurrent::Promise] Promise object which holds the HTTP response.
#
def list_async(resource_group_name, custom_headers:nil)
def list_async(resource_group_name, custom_headers = nil)
fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?


request_headers = {}
request_headers['Content-Type'] = 'application/json; charset=utf-8'

# Set Headers
request_headers['x-ms-client-request-id'] = SecureRandom.uuid
Expand Down Expand Up @@ -410,8 +408,8 @@ def list_async(resource_group_name, custom_headers:nil)
#
# @return [VirtualMachineSizeListResult] operation results.
#
def list_available_sizes(resource_group_name, availability_set_name, custom_headers:nil)
response = list_available_sizes_async(resource_group_name, availability_set_name, custom_headers:custom_headers).value!
def list_available_sizes(resource_group_name, availability_set_name, custom_headers = nil)
response = list_available_sizes_async(resource_group_name, availability_set_name, custom_headers).value!
response.body unless response.nil?
end

Expand All @@ -426,8 +424,8 @@ def list_available_sizes(resource_group_name, availability_set_name, custom_head
#
# @return [MsRestAzure::AzureOperationResponse] HTTP response information.
#
def list_available_sizes_with_http_info(resource_group_name, availability_set_name, custom_headers:nil)
list_available_sizes_async(resource_group_name, availability_set_name, custom_headers:custom_headers).value!
def list_available_sizes_with_http_info(resource_group_name, availability_set_name, custom_headers = nil)
list_available_sizes_async(resource_group_name, availability_set_name, custom_headers).value!
end

#
Expand All @@ -441,15 +439,14 @@ def list_available_sizes_with_http_info(resource_group_name, availability_set_na
#
# @return [Concurrent::Promise] Promise object which holds the HTTP response.
#
def list_available_sizes_async(resource_group_name, availability_set_name, custom_headers:nil)
def list_available_sizes_async(resource_group_name, availability_set_name, custom_headers = nil)
fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
fail ArgumentError, 'availability_set_name is nil' if availability_set_name.nil?
fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?


request_headers = {}
request_headers['Content-Type'] = 'application/json; charset=utf-8'

# Set Headers
request_headers['x-ms-client-request-id'] = SecureRandom.uuid
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,6 @@ def make_request_async(method, path, options = {})
fail ArgumentError, 'path is nil' if path.nil?

request_url = options[:base_url] || @base_url
if(!options[:headers].nil? && !options[:headers]['Content-Type'].nil?)
@request_headers['Content-Type'] = options[:headers]['Content-Type']
end

request_headers = @request_headers
request_headers.merge!({'accept-language' => @accept_language}) unless @accept_language.nil?
Expand All @@ -157,7 +154,9 @@ def make_request_async(method, path, options = {})
#
def add_telemetry
sdk_information = 'azure_mgmt_compute'
sdk_information = "#{sdk_information}/0.17.0"
if defined? Azure::Compute::Mgmt::V2015_06_15::VERSION
sdk_information = "#{sdk_information}/#{Azure::Compute::Mgmt::V2015_06_15::VERSION}"
end
add_user_agent_information(sdk_information)
end
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,13 @@ class AdditionalUnattendContent
#
def self.mapper()
{
client_side_validation: true,
required: false,
serialized_name: 'AdditionalUnattendContent',
type: {
name: 'Composite',
class_name: 'AdditionalUnattendContent',
model_properties: {
pass_name: {
client_side_validation: true,
required: false,
serialized_name: 'passName',
type: {
Expand All @@ -59,7 +57,6 @@ def self.mapper()
}
},
component_name: {
client_side_validation: true,
required: false,
serialized_name: 'componentName',
type: {
Expand All @@ -68,7 +65,6 @@ def self.mapper()
}
},
setting_name: {
client_side_validation: true,
required: false,
serialized_name: 'settingName',
type: {
Expand All @@ -77,7 +73,6 @@ def self.mapper()
}
},
content: {
client_side_validation: true,
required: false,
serialized_name: 'content',
type: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,13 @@ class ApiEntityReference
#
def self.mapper()
{
client_side_validation: true,
required: false,
serialized_name: 'ApiEntityReference',
type: {
name: 'Composite',
class_name: 'ApiEntityReference',
model_properties: {
id: {
client_side_validation: true,
required: false,
serialized_name: 'id',
type: {
Expand Down
Loading