diff --git a/Rakefile b/Rakefile index 0563daf7a..6a8632b1a 100644 --- a/Rakefile +++ b/Rakefile @@ -330,7 +330,7 @@ REGEN_METADATA = { tag: 'arm_stor' }, azure_mgmt_subscriptions: { - spec_uri: 'https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/arm-resources/subscriptions/2015-11-01/swagger/subscriptions.json', + spec_uri: 'https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/arm-resources/subscriptions/2016-06-01/swagger/subscriptions.json', ns: 'Azure::ARM::Subscriptions', version: version, tag: 'arm_subs' diff --git a/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions.rb b/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions.rb index 5cf799b6d..1e3cacfce 100644 --- a/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions.rb +++ b/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions.rb @@ -32,5 +32,7 @@ module Azure::ARM::Subscriptions autoload :SubscriptionListResult, 'generated/azure_mgmt_subscriptions/models/subscription_list_result.rb' autoload :TenantIdDescription, 'generated/azure_mgmt_subscriptions/models/tenant_id_description.rb' autoload :TenantListResult, 'generated/azure_mgmt_subscriptions/models/tenant_list_result.rb' + autoload :SubscriptionState, 'generated/azure_mgmt_subscriptions/models/subscription_state.rb' + autoload :SpendingLimit, 'generated/azure_mgmt_subscriptions/models/spending_limit.rb' end end diff --git a/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/location.rb b/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/location.rb index c9451188d..f45f34eae 100644 --- a/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/location.rb +++ b/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/location.rb @@ -12,23 +12,23 @@ module Azure::ARM::Subscriptions include MsRestAzure - # @return [String] Gets or sets the ID of the resource - # (/subscriptions/SubscriptionId). + # @return [String] The fully qualified Id of the location. For example, + # /subscriptions/00000000-0000-0000-0000-000000000000/locations/westus. attr_accessor :id - # @return [String] Gets or sets the subscription Id. + # @return [String] The subscription Id. attr_accessor :subscription_id - # @return [String] Gets or sets the location name + # @return [String] The location name. attr_accessor :name - # @return [String] Gets or sets the display name of the location + # @return [String] The display name of the location. attr_accessor :display_name - # @return [String] Gets or sets the latitude of the location + # @return [String] The latitude of the location. attr_accessor :latitude - # @return [String] Gets or sets the longitude of the location + # @return [String] The longitude of the location. attr_accessor :longitude @@ -46,6 +46,7 @@ module Azure::ARM::Subscriptions model_properties: { id: { required: false, + read_only: true, serialized_name: 'id', type: { name: 'String' @@ -53,6 +54,7 @@ module Azure::ARM::Subscriptions }, subscription_id: { required: false, + read_only: true, serialized_name: 'subscriptionId', type: { name: 'String' @@ -60,6 +62,7 @@ module Azure::ARM::Subscriptions }, name: { required: false, + read_only: true, serialized_name: 'name', type: { name: 'String' @@ -67,6 +70,7 @@ module Azure::ARM::Subscriptions }, display_name: { required: false, + read_only: true, serialized_name: 'displayName', type: { name: 'String' @@ -74,6 +78,7 @@ module Azure::ARM::Subscriptions }, latitude: { required: false, + read_only: true, serialized_name: 'latitude', type: { name: 'String' @@ -81,6 +86,7 @@ module Azure::ARM::Subscriptions }, longitude: { required: false, + read_only: true, serialized_name: 'longitude', type: { name: 'String' diff --git a/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/location_list_result.rb b/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/location_list_result.rb index b5eb86603..aab99e21d 100644 --- a/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/location_list_result.rb +++ b/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/location_list_result.rb @@ -12,7 +12,7 @@ module Azure::ARM::Subscriptions include MsRestAzure - # @return [Array] Gets the locations. + # @return [Array] The locations. attr_accessor :value diff --git a/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/spending_limit.rb b/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/spending_limit.rb new file mode 100644 index 000000000..78e7c8beb --- /dev/null +++ b/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/spending_limit.rb @@ -0,0 +1,17 @@ +# encoding: utf-8 +# Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0 +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. + +module Azure::ARM::Subscriptions + module Models + # + # Defines values for SpendingLimit + # + module SpendingLimit + On = "On" + Off = "Off" + CurrentPeriodOff = "CurrentPeriodOff" + end + end +end diff --git a/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/subscription.rb b/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/subscription.rb index fccd225b2..940761153 100644 --- a/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/subscription.rb +++ b/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/subscription.rb @@ -12,22 +12,31 @@ module Azure::ARM::Subscriptions include MsRestAzure - # @return [String] Gets or sets the ID of the resource - # (/subscriptions/SubscriptionId). + # @return [String] The fully qualified Id. For example, + # /subscriptions/00000000-0000-0000-0000-000000000000. attr_accessor :id - # @return [String] Gets or sets the subscription Id. + # @return [String] The subscription Id. attr_accessor :subscription_id - # @return [String] Gets or sets the subscription display name + # @return [String] The tenant Id. + attr_accessor :tenant_id + + # @return [String] The subscription display name. attr_accessor :display_name - # @return [String] Gets or sets the subscription state + # @return [SubscriptionState] The subscription state. Possible values + # include: 'Enabled', 'Warned', 'PastDue', 'Disabled', 'Deleted' attr_accessor :state - # @return [SubscriptionPolicies] Gets or sets the subscription policies. + # @return [SubscriptionPolicies] The subscription policies. attr_accessor :subscription_policies + # @return [String] The authorization source of the request. Valid values + # are one or more combinations of Legacy, RoleBased, Bypassed, Direct + # and Management. For example, 'Legacy, RoleBased'. + attr_accessor :authorization_source + # # Mapper for Subscription class as Ruby Hash. @@ -43,6 +52,7 @@ module Azure::ARM::Subscriptions model_properties: { id: { required: false, + read_only: true, serialized_name: 'id', type: { name: 'String' @@ -50,13 +60,23 @@ module Azure::ARM::Subscriptions }, subscription_id: { required: false, + read_only: true, serialized_name: 'subscriptionId', type: { name: 'String' } }, + tenant_id: { + required: false, + read_only: true, + serialized_name: 'tenantId', + type: { + name: 'String' + } + }, display_name: { required: false, + read_only: true, serialized_name: 'displayName', type: { name: 'String' @@ -64,9 +84,11 @@ module Azure::ARM::Subscriptions }, state: { required: false, + read_only: true, serialized_name: 'state', type: { - name: 'String' + name: 'Enum', + module: 'SubscriptionState' } }, subscription_policies: { @@ -76,6 +98,13 @@ module Azure::ARM::Subscriptions name: 'Composite', class_name: 'SubscriptionPolicies' } + }, + authorization_source: { + required: false, + serialized_name: 'authorizationSource', + type: { + name: 'String' + } } } } diff --git a/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/subscription_list_result.rb b/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/subscription_list_result.rb index b555fc8c3..ada83e91b 100644 --- a/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/subscription_list_result.rb +++ b/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/subscription_list_result.rb @@ -12,10 +12,10 @@ module Azure::ARM::Subscriptions include MsRestAzure - # @return [Array] Gets or sets subscriptions. + # @return [Array] The subscriptions. attr_accessor :value - # @return [String] Gets or sets the URL to get the next set of results. + # @return [String] The URL to get the next set of results. attr_accessor :next_link # return [Proc] with next page method call. diff --git a/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/subscription_policies.rb b/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/subscription_policies.rb index 41f5b6ac7..0d8bc9db5 100644 --- a/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/subscription_policies.rb +++ b/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/subscription_policies.rb @@ -12,12 +12,19 @@ module Azure::ARM::Subscriptions include MsRestAzure - # @return [String] Gets or sets the subscription location placement Id. + # @return [String] The subscription location placement Id. The Id + # indicates which regions are visible for a subscription. For example, + # a subscription with a location placement Id of Public_2014-09-01 has + # access to Azure public regions. attr_accessor :location_placement_id - # @return [String] Gets or sets the subscription quota Id. + # @return [String] The subscription quota Id. attr_accessor :quota_id + # @return [SpendingLimit] The subscription spending limit. Possible + # values include: 'On', 'Off', 'CurrentPeriodOff' + attr_accessor :spending_limit + # # Mapper for SubscriptionPolicies class as Ruby Hash. @@ -33,6 +40,7 @@ module Azure::ARM::Subscriptions model_properties: { location_placement_id: { required: false, + read_only: true, serialized_name: 'locationPlacementId', type: { name: 'String' @@ -40,10 +48,20 @@ module Azure::ARM::Subscriptions }, quota_id: { required: false, + read_only: true, serialized_name: 'quotaId', type: { name: 'String' } + }, + spending_limit: { + required: false, + read_only: true, + serialized_name: 'spendingLimit', + type: { + name: 'Enum', + module: 'SpendingLimit' + } } } } diff --git a/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/subscription_state.rb b/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/subscription_state.rb new file mode 100644 index 000000000..5ceb36328 --- /dev/null +++ b/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/subscription_state.rb @@ -0,0 +1,19 @@ +# encoding: utf-8 +# Code generated by Microsoft (R) AutoRest Code Generator 0.17.0.0 +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. + +module Azure::ARM::Subscriptions + module Models + # + # Defines values for SubscriptionState + # + module SubscriptionState + Enabled = "Enabled" + Warned = "Warned" + PastDue = "PastDue" + Disabled = "Disabled" + Deleted = "Deleted" + end + end +end diff --git a/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/tenant_id_description.rb b/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/tenant_id_description.rb index 01f09a485..608e83e9d 100644 --- a/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/tenant_id_description.rb +++ b/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/tenant_id_description.rb @@ -6,16 +6,18 @@ module Azure::ARM::Subscriptions module Models # - # Tenant Id information + # Tenant Id information. # class TenantIdDescription include MsRestAzure - # @return [String] Gets or sets Id + # @return [String] The fully qualified Id. For example, + # /tenants/00000000-0000-0000-0000-000000000000. attr_accessor :id - # @return [String] Gets or sets tenantId + # @return [String] The tenantId. For example, + # 00000000-0000-0000-0000-000000000000. attr_accessor :tenant_id @@ -33,6 +35,7 @@ module Azure::ARM::Subscriptions model_properties: { id: { required: false, + read_only: true, serialized_name: 'id', type: { name: 'String' @@ -40,6 +43,7 @@ module Azure::ARM::Subscriptions }, tenant_id: { required: false, + read_only: true, serialized_name: 'tenantId', type: { name: 'String' diff --git a/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/tenant_list_result.rb b/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/tenant_list_result.rb index 24ff61ba0..625fc61d0 100644 --- a/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/tenant_list_result.rb +++ b/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/models/tenant_list_result.rb @@ -12,10 +12,10 @@ module Azure::ARM::Subscriptions include MsRestAzure - # @return [Array] Gets or sets tenant Ids. + # @return [Array] The tenant Ids. attr_accessor :value - # @return [String] Gets or sets the URL to get the next set of results. + # @return [String] The URL to get the next set of results. attr_accessor :next_link # return [Proc] with next page method call. diff --git a/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/subscription_client.rb b/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/subscription_client.rb index ffca4eaa6..a35c8f41e 100644 --- a/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/subscription_client.rb +++ b/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/subscription_client.rb @@ -53,7 +53,7 @@ module Azure::ARM::Subscriptions @subscriptions = Subscriptions.new(self) @tenants = Tenants.new(self) - @api_version = '2015-11-01' + @api_version = '2016-06-01' @accept_language = 'en-US' @long_running_operation_retry_timeout = 30 @generate_client_request_id = true diff --git a/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/subscriptions.rb b/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/subscriptions.rb index 069a71896..3fa553f7c 100644 --- a/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/subscriptions.rb +++ b/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/subscriptions.rb @@ -195,7 +195,7 @@ module Azure::ARM::Subscriptions end # - # Gets a list of the subscriptionIds. + # Gets a list of subscriptions. # # @param custom_headers [Hash{String => String}] A hash of custom headers that # will be added to the HTTP request. @@ -215,7 +215,7 @@ module Azure::ARM::Subscriptions end # - # Gets a list of the subscriptionIds. + # Gets a list of subscriptions. # # @param custom_headers [Hash{String => String}] A hash of custom headers that # will be added to the HTTP request. @@ -228,7 +228,7 @@ module Azure::ARM::Subscriptions end # - # Gets a list of the subscriptionIds. + # Gets a list of subscriptions. # # @param custom_headers [Hash{String => String}] A hash of custom headers that # will be added to the HTTP request. @@ -240,7 +240,7 @@ module Azure::ARM::Subscriptions end # - # Gets a list of the subscriptionIds. + # Gets a list of subscriptions. # # @param [Hash{String => String}] A hash of custom headers that will be added # to the HTTP request. @@ -296,7 +296,7 @@ module Azure::ARM::Subscriptions end # - # Gets a list of the subscriptionIds. + # Gets a list of subscriptions. # # @param next_page_link [String] The NextLink from the previous successful # call to List operation. @@ -311,7 +311,7 @@ module Azure::ARM::Subscriptions end # - # Gets a list of the subscriptionIds. + # Gets a list of subscriptions. # # @param next_page_link [String] The NextLink from the previous successful # call to List operation. @@ -325,7 +325,7 @@ module Azure::ARM::Subscriptions end # - # Gets a list of the subscriptionIds. + # Gets a list of subscriptions. # # @param next_page_link [String] The NextLink from the previous successful # call to List operation. diff --git a/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/tenants.rb b/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/tenants.rb index 4440094dc..b86b158ab 100644 --- a/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/tenants.rb +++ b/management/azure_mgmt_subscriptions/lib/generated/azure_mgmt_subscriptions/tenants.rb @@ -23,7 +23,7 @@ module Azure::ARM::Subscriptions attr_reader :client # - # Gets a list of the tenantIds. + # Gets a list of tenants. # # @param custom_headers [Hash{String => String}] A hash of custom headers that # will be added to the HTTP request. @@ -43,7 +43,7 @@ module Azure::ARM::Subscriptions end # - # Gets a list of the tenantIds. + # Gets a list of tenants. # # @param custom_headers [Hash{String => String}] A hash of custom headers that # will be added to the HTTP request. @@ -56,7 +56,7 @@ module Azure::ARM::Subscriptions end # - # Gets a list of the tenantIds. + # Gets a list of tenants. # # @param custom_headers [Hash{String => String}] A hash of custom headers that # will be added to the HTTP request. @@ -68,7 +68,7 @@ module Azure::ARM::Subscriptions end # - # Gets a list of the tenantIds. + # Gets a list of tenants. # # @param [Hash{String => String}] A hash of custom headers that will be added # to the HTTP request. @@ -124,7 +124,7 @@ module Azure::ARM::Subscriptions end # - # Gets a list of the tenantIds. + # Gets a list of tenants. # # @param next_page_link [String] The NextLink from the previous successful # call to List operation. @@ -139,7 +139,7 @@ module Azure::ARM::Subscriptions end # - # Gets a list of the tenantIds. + # Gets a list of tenants. # # @param next_page_link [String] The NextLink from the previous successful # call to List operation. @@ -153,7 +153,7 @@ module Azure::ARM::Subscriptions end # - # Gets a list of the tenantIds. + # Gets a list of tenants. # # @param next_page_link [String] The NextLink from the previous successful # call to List operation. diff --git a/swagger_to_sdk_config.json b/swagger_to_sdk_config.json index fdb196c59..04a57ed98 100644 --- a/swagger_to_sdk_config.json +++ b/swagger_to_sdk_config.json @@ -380,7 +380,7 @@ ] }, "azure_mgmt_subscriptions": { - "swagger": "arm-resources/subscriptions/2015-11-01/swagger/subscriptions.json", + "swagger": "arm-resources/subscriptions/2016-06-01/swagger/subscriptions.json", "autorest_options": { "Namespace": "Azure::ARM::Subscriptions", "PackageName": "azure_mgmt_subscriptions",