diff --git a/src/SDKs/ServiceFabric/AzSdk.RP.props b/src/SDKs/ServiceFabric/AzSdk.RP.props index c4365e4e0dcc..eb2f5db82991 100644 --- a/src/SDKs/ServiceFabric/AzSdk.RP.props +++ b/src/SDKs/ServiceFabric/AzSdk.RP.props @@ -1,7 +1,7 @@ - ServiceFabric_2017-07-01-preview;ServiceFabric_2018-02-01; + ServiceFabric_2019-03-01-preview; $(PackageTags);$(CommonTags);$(AzureApiTag); \ No newline at end of file diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ApplicationTypeVersionsOperations.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ApplicationTypeVersionsOperations.cs index 679d7eccf53c..f8a1472e3c5e 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ApplicationTypeVersionsOperations.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ApplicationTypeVersionsOperations.cs @@ -113,7 +113,6 @@ internal ApplicationTypeVersionsOperations(ServiceFabricManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "version"); } - string apiVersion = "2017-07-01-preview"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -125,7 +124,6 @@ internal ApplicationTypeVersionsOperations(ServiceFabricManagementClient client) tracingParameters.Add("clusterName", clusterName); tracingParameters.Add("applicationTypeName", applicationTypeName); tracingParameters.Add("version", version); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters); } @@ -138,9 +136,9 @@ internal ApplicationTypeVersionsOperations(ServiceFabricManagementClient client) _url = _url.Replace("{applicationTypeName}", System.Uri.EscapeDataString(applicationTypeName)); _url = _url.Replace("{version}", System.Uri.EscapeDataString(version)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -385,7 +383,6 @@ internal ApplicationTypeVersionsOperations(ServiceFabricManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "applicationTypeName"); } - string apiVersion = "2017-07-01-preview"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -396,7 +393,6 @@ internal ApplicationTypeVersionsOperations(ServiceFabricManagementClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("clusterName", clusterName); tracingParameters.Add("applicationTypeName", applicationTypeName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters); } @@ -408,9 +404,9 @@ internal ApplicationTypeVersionsOperations(ServiceFabricManagementClient client) _url = _url.Replace("{clusterName}", System.Uri.EscapeDataString(clusterName)); _url = _url.Replace("{applicationTypeName}", System.Uri.EscapeDataString(applicationTypeName)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -605,7 +601,6 @@ internal ApplicationTypeVersionsOperations(ServiceFabricManagementClient client) { parameters.Validate(); } - string apiVersion = "2017-07-01-preview"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -617,7 +612,6 @@ internal ApplicationTypeVersionsOperations(ServiceFabricManagementClient client) tracingParameters.Add("clusterName", clusterName); tracingParameters.Add("applicationTypeName", applicationTypeName); tracingParameters.Add("version", version); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("parameters", parameters); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "BeginCreate", tracingParameters); @@ -631,9 +625,9 @@ internal ApplicationTypeVersionsOperations(ServiceFabricManagementClient client) _url = _url.Replace("{applicationTypeName}", System.Uri.EscapeDataString(applicationTypeName)); _url = _url.Replace("{version}", System.Uri.EscapeDataString(version)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -820,7 +814,6 @@ internal ApplicationTypeVersionsOperations(ServiceFabricManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "version"); } - string apiVersion = "2017-07-01-preview"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -832,7 +825,6 @@ internal ApplicationTypeVersionsOperations(ServiceFabricManagementClient client) tracingParameters.Add("clusterName", clusterName); tracingParameters.Add("applicationTypeName", applicationTypeName); tracingParameters.Add("version", version); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "BeginDelete", tracingParameters); } @@ -845,9 +837,9 @@ internal ApplicationTypeVersionsOperations(ServiceFabricManagementClient client) _url = _url.Replace("{applicationTypeName}", System.Uri.EscapeDataString(applicationTypeName)); _url = _url.Replace("{version}", System.Uri.EscapeDataString(version)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ApplicationTypesOperations.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ApplicationTypesOperations.cs index 216b640875b9..235da2140d7e 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ApplicationTypesOperations.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ApplicationTypesOperations.cs @@ -105,7 +105,6 @@ internal ApplicationTypesOperations(ServiceFabricManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "applicationTypeName"); } - string apiVersion = "2017-07-01-preview"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -116,7 +115,6 @@ internal ApplicationTypesOperations(ServiceFabricManagementClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("clusterName", clusterName); tracingParameters.Add("applicationTypeName", applicationTypeName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters); } @@ -128,9 +126,9 @@ internal ApplicationTypesOperations(ServiceFabricManagementClient client) _url = _url.Replace("{clusterName}", System.Uri.EscapeDataString(clusterName)); _url = _url.Replace("{applicationTypeName}", System.Uri.EscapeDataString(applicationTypeName)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -268,8 +266,8 @@ internal ApplicationTypesOperations(ServiceFabricManagementClient client) /// /// The name of the application type name resource. /// - /// - /// Azure resource location. + /// + /// The application type name resource. /// /// /// Headers that will be added to request. @@ -292,7 +290,7 @@ internal ApplicationTypesOperations(ServiceFabricManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task> CreateWithHttpMessagesAsync(string resourceGroupName, string clusterName, string applicationTypeName, string location = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> CreateWithHttpMessagesAsync(string resourceGroupName, string clusterName, string applicationTypeName, ApplicationTypeResource parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (Client.SubscriptionId == null) { @@ -310,11 +308,9 @@ internal ApplicationTypesOperations(ServiceFabricManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "applicationTypeName"); } - string apiVersion = "2017-07-01-preview"; - ApplicationTypeResource parameters = new ApplicationTypeResource(); - if (location != null) + if (parameters == null) { - parameters.Location = location; + throw new ValidationException(ValidationRules.CannotBeNull, "parameters"); } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; @@ -326,7 +322,6 @@ internal ApplicationTypesOperations(ServiceFabricManagementClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("clusterName", clusterName); tracingParameters.Add("applicationTypeName", applicationTypeName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("parameters", parameters); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Create", tracingParameters); @@ -339,9 +334,9 @@ internal ApplicationTypesOperations(ServiceFabricManagementClient client) _url = _url.Replace("{clusterName}", System.Uri.EscapeDataString(clusterName)); _url = _url.Replace("{applicationTypeName}", System.Uri.EscapeDataString(applicationTypeName)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -547,7 +542,6 @@ internal ApplicationTypesOperations(ServiceFabricManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "clusterName"); } - string apiVersion = "2017-07-01-preview"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -557,7 +551,6 @@ internal ApplicationTypesOperations(ServiceFabricManagementClient client) Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("clusterName", clusterName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters); } @@ -568,9 +561,9 @@ internal ApplicationTypesOperations(ServiceFabricManagementClient client) _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); _url = _url.Replace("{clusterName}", System.Uri.EscapeDataString(clusterName)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -744,7 +737,6 @@ internal ApplicationTypesOperations(ServiceFabricManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "applicationTypeName"); } - string apiVersion = "2017-07-01-preview"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -755,7 +747,6 @@ internal ApplicationTypesOperations(ServiceFabricManagementClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("clusterName", clusterName); tracingParameters.Add("applicationTypeName", applicationTypeName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "BeginDelete", tracingParameters); } @@ -767,9 +758,9 @@ internal ApplicationTypesOperations(ServiceFabricManagementClient client) _url = _url.Replace("{clusterName}", System.Uri.EscapeDataString(clusterName)); _url = _url.Replace("{applicationTypeName}", System.Uri.EscapeDataString(applicationTypeName)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ApplicationTypesOperationsExtensions.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ApplicationTypesOperationsExtensions.cs index 4dc9aff6df9a..4fbbc4525695 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ApplicationTypesOperationsExtensions.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ApplicationTypesOperationsExtensions.cs @@ -94,12 +94,12 @@ public static ApplicationTypeResource Get(this IApplicationTypesOperations opera /// /// The name of the application type name resource. /// - /// - /// Azure resource location. + /// + /// The application type name resource. /// - public static ApplicationTypeResource Create(this IApplicationTypesOperations operations, string resourceGroupName, string clusterName, string applicationTypeName, string location = default(string)) + public static ApplicationTypeResource Create(this IApplicationTypesOperations operations, string resourceGroupName, string clusterName, string applicationTypeName, ApplicationTypeResource parameters) { - return operations.CreateAsync(resourceGroupName, clusterName, applicationTypeName, location).GetAwaiter().GetResult(); + return operations.CreateAsync(resourceGroupName, clusterName, applicationTypeName, parameters).GetAwaiter().GetResult(); } /// @@ -121,15 +121,15 @@ public static ApplicationTypeResource Get(this IApplicationTypesOperations opera /// /// The name of the application type name resource. /// - /// - /// Azure resource location. + /// + /// The application type name resource. /// /// /// The cancellation token. /// - public static async Task CreateAsync(this IApplicationTypesOperations operations, string resourceGroupName, string clusterName, string applicationTypeName, string location = default(string), CancellationToken cancellationToken = default(CancellationToken)) + public static async Task CreateAsync(this IApplicationTypesOperations operations, string resourceGroupName, string clusterName, string applicationTypeName, ApplicationTypeResource parameters, CancellationToken cancellationToken = default(CancellationToken)) { - using (var _result = await operations.CreateWithHttpMessagesAsync(resourceGroupName, clusterName, applicationTypeName, location, null, cancellationToken).ConfigureAwait(false)) + using (var _result = await operations.CreateWithHttpMessagesAsync(resourceGroupName, clusterName, applicationTypeName, parameters, null, cancellationToken).ConfigureAwait(false)) { return _result.Body; } diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ApplicationsOperations.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ApplicationsOperations.cs index 03c8d3e3ba5e..8e9bec1a1432 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ApplicationsOperations.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ApplicationsOperations.cs @@ -105,7 +105,6 @@ internal ApplicationsOperations(ServiceFabricManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "applicationName"); } - string apiVersion = "2017-07-01-preview"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -116,7 +115,6 @@ internal ApplicationsOperations(ServiceFabricManagementClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("clusterName", clusterName); tracingParameters.Add("applicationName", applicationName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters); } @@ -128,9 +126,9 @@ internal ApplicationsOperations(ServiceFabricManagementClient client) _url = _url.Replace("{clusterName}", System.Uri.EscapeDataString(clusterName)); _url = _url.Replace("{applicationName}", System.Uri.EscapeDataString(applicationName)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -308,10 +306,10 @@ internal ApplicationsOperations(ServiceFabricManagementClient client) /// /// The cancellation token. /// - public async Task> UpdateWithHttpMessagesAsync(string resourceGroupName, string clusterName, string applicationName, ApplicationResourceUpdate parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> UpdateWithHttpMessagesAsync(string resourceGroupName, string clusterName, string applicationName, ApplicationResourceUpdate parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { // Send Request - AzureOperationResponse _response = await BeginUpdateWithHttpMessagesAsync(resourceGroupName, clusterName, applicationName, parameters, customHeaders, cancellationToken).ConfigureAwait(false); + AzureOperationResponse _response = await BeginUpdateWithHttpMessagesAsync(resourceGroupName, clusterName, applicationName, parameters, customHeaders, cancellationToken).ConfigureAwait(false); return await Client.GetPutOrPatchOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false); } @@ -392,7 +390,6 @@ internal ApplicationsOperations(ServiceFabricManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "clusterName"); } - string apiVersion = "2017-07-01-preview"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -402,7 +399,6 @@ internal ApplicationsOperations(ServiceFabricManagementClient client) Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("clusterName", clusterName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters); } @@ -413,9 +409,9 @@ internal ApplicationsOperations(ServiceFabricManagementClient client) _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); _url = _url.Replace("{clusterName}", System.Uri.EscapeDataString(clusterName)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -603,7 +599,6 @@ internal ApplicationsOperations(ServiceFabricManagementClient client) { parameters.Validate(); } - string apiVersion = "2017-07-01-preview"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -614,7 +609,6 @@ internal ApplicationsOperations(ServiceFabricManagementClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("clusterName", clusterName); tracingParameters.Add("applicationName", applicationName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("parameters", parameters); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "BeginCreate", tracingParameters); @@ -627,9 +621,9 @@ internal ApplicationsOperations(ServiceFabricManagementClient client) _url = _url.Replace("{clusterName}", System.Uri.EscapeDataString(clusterName)); _url = _url.Replace("{applicationName}", System.Uri.EscapeDataString(applicationName)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -796,7 +790,7 @@ internal ApplicationsOperations(ServiceFabricManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task> BeginUpdateWithHttpMessagesAsync(string resourceGroupName, string clusterName, string applicationName, ApplicationResourceUpdate parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> BeginUpdateWithHttpMessagesAsync(string resourceGroupName, string clusterName, string applicationName, ApplicationResourceUpdate parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (Client.SubscriptionId == null) { @@ -818,7 +812,6 @@ internal ApplicationsOperations(ServiceFabricManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "parameters"); } - string apiVersion = "2017-07-01-preview"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -829,7 +822,6 @@ internal ApplicationsOperations(ServiceFabricManagementClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("clusterName", clusterName); tracingParameters.Add("applicationName", applicationName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("parameters", parameters); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "BeginUpdate", tracingParameters); @@ -842,9 +834,9 @@ internal ApplicationsOperations(ServiceFabricManagementClient client) _url = _url.Replace("{clusterName}", System.Uri.EscapeDataString(clusterName)); _url = _url.Replace("{applicationName}", System.Uri.EscapeDataString(applicationName)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -940,7 +932,7 @@ internal ApplicationsOperations(ServiceFabricManagementClient client) throw ex; } // Create Result - var _result = new AzureOperationResponse(); + var _result = new AzureOperationResponse(); _result.Request = _httpRequest; _result.Response = _httpResponse; if (_httpResponse.Headers.Contains("x-ms-request-id")) @@ -953,7 +945,7 @@ internal ApplicationsOperations(ServiceFabricManagementClient client) _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); try { - _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); } catch (JsonException ex) { @@ -1023,7 +1015,6 @@ internal ApplicationsOperations(ServiceFabricManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "applicationName"); } - string apiVersion = "2017-07-01-preview"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -1034,7 +1025,6 @@ internal ApplicationsOperations(ServiceFabricManagementClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("clusterName", clusterName); tracingParameters.Add("applicationName", applicationName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "BeginDelete", tracingParameters); } @@ -1046,9 +1036,9 @@ internal ApplicationsOperations(ServiceFabricManagementClient client) _url = _url.Replace("{clusterName}", System.Uri.EscapeDataString(clusterName)); _url = _url.Replace("{applicationName}", System.Uri.EscapeDataString(applicationName)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ApplicationsOperationsExtensions.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ApplicationsOperationsExtensions.cs index 7a5e0b92396e..4746a3e9bc7f 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ApplicationsOperationsExtensions.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ApplicationsOperationsExtensions.cs @@ -156,7 +156,7 @@ public static ApplicationResource Create(this IApplicationsOperations operations /// /// The application resource for patch operations. /// - public static ApplicationResourceUpdate Update(this IApplicationsOperations operations, string resourceGroupName, string clusterName, string applicationName, ApplicationResourceUpdate parameters) + public static ApplicationResource Update(this IApplicationsOperations operations, string resourceGroupName, string clusterName, string applicationName, ApplicationResourceUpdate parameters) { return operations.UpdateAsync(resourceGroupName, clusterName, applicationName, parameters).GetAwaiter().GetResult(); } @@ -185,7 +185,7 @@ public static ApplicationResourceUpdate Update(this IApplicationsOperations oper /// /// The cancellation token. /// - public static async Task UpdateAsync(this IApplicationsOperations operations, string resourceGroupName, string clusterName, string applicationName, ApplicationResourceUpdate parameters, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task UpdateAsync(this IApplicationsOperations operations, string resourceGroupName, string clusterName, string applicationName, ApplicationResourceUpdate parameters, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.UpdateWithHttpMessagesAsync(resourceGroupName, clusterName, applicationName, parameters, null, cancellationToken).ConfigureAwait(false)) { @@ -373,7 +373,7 @@ public static ApplicationResource BeginCreate(this IApplicationsOperations opera /// /// The application resource for patch operations. /// - public static ApplicationResourceUpdate BeginUpdate(this IApplicationsOperations operations, string resourceGroupName, string clusterName, string applicationName, ApplicationResourceUpdate parameters) + public static ApplicationResource BeginUpdate(this IApplicationsOperations operations, string resourceGroupName, string clusterName, string applicationName, ApplicationResourceUpdate parameters) { return operations.BeginUpdateAsync(resourceGroupName, clusterName, applicationName, parameters).GetAwaiter().GetResult(); } @@ -402,7 +402,7 @@ public static ApplicationResourceUpdate BeginUpdate(this IApplicationsOperations /// /// The cancellation token. /// - public static async Task BeginUpdateAsync(this IApplicationsOperations operations, string resourceGroupName, string clusterName, string applicationName, ApplicationResourceUpdate parameters, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task BeginUpdateAsync(this IApplicationsOperations operations, string resourceGroupName, string clusterName, string applicationName, ApplicationResourceUpdate parameters, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.BeginUpdateWithHttpMessagesAsync(resourceGroupName, clusterName, applicationName, parameters, null, cancellationToken).ConfigureAwait(false)) { diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ClusterVersionsOperations.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ClusterVersionsOperations.cs index be48e8716ae8..c0a0133cd9aa 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ClusterVersionsOperations.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ClusterVersionsOperations.cs @@ -99,7 +99,6 @@ internal ClusterVersionsOperations(ServiceFabricManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "clusterVersion"); } - string apiVersion = "2018-02-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -108,7 +107,6 @@ internal ClusterVersionsOperations(ServiceFabricManagementClient client) _invocationId = ServiceClientTracing.NextInvocationId.ToString(); Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("location", location); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("clusterVersion", clusterVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters); @@ -120,9 +118,9 @@ internal ClusterVersionsOperations(ServiceFabricManagementClient client) _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); _url = _url.Replace("{clusterVersion}", System.Uri.EscapeDataString(clusterVersion)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -307,7 +305,6 @@ internal ClusterVersionsOperations(ServiceFabricManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "clusterVersion"); } - string apiVersion = "2018-02-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -317,7 +314,6 @@ internal ClusterVersionsOperations(ServiceFabricManagementClient client) Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("location", location); tracingParameters.Add("environment", environment); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("clusterVersion", clusterVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "GetByEnvironment", tracingParameters); @@ -326,13 +322,13 @@ internal ClusterVersionsOperations(ServiceFabricManagementClient client) var _baseUrl = Client.BaseUri.AbsoluteUri; var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.ServiceFabric/locations/{location}/environments/{environment}/clusterVersions/{clusterVersion}").ToString(); _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); - _url = _url.Replace("{environment}", System.Uri.EscapeDataString(environment)); + _url = _url.Replace("{environment}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(environment, Client.SerializationSettings).Trim('"'))); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); _url = _url.Replace("{clusterVersion}", System.Uri.EscapeDataString(clusterVersion)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -502,7 +498,6 @@ internal ClusterVersionsOperations(ServiceFabricManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); } - string apiVersion = "2018-02-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -511,7 +506,6 @@ internal ClusterVersionsOperations(ServiceFabricManagementClient client) _invocationId = ServiceClientTracing.NextInvocationId.ToString(); Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("location", location); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters); } @@ -521,9 +515,9 @@ internal ClusterVersionsOperations(ServiceFabricManagementClient client) _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -701,7 +695,6 @@ internal ClusterVersionsOperations(ServiceFabricManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); } - string apiVersion = "2018-02-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -711,7 +704,6 @@ internal ClusterVersionsOperations(ServiceFabricManagementClient client) Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("location", location); tracingParameters.Add("environment", environment); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "ListByEnvironment", tracingParameters); } @@ -719,12 +711,12 @@ internal ClusterVersionsOperations(ServiceFabricManagementClient client) var _baseUrl = Client.BaseUri.AbsoluteUri; var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.ServiceFabric/locations/{location}/environments/{environment}/clusterVersions").ToString(); _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); - _url = _url.Replace("{environment}", System.Uri.EscapeDataString(environment)); + _url = _url.Replace("{environment}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(environment, Client.SerializationSettings).Trim('"'))); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ClustersOperations.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ClustersOperations.cs index 3320a7fd514f..1d7f94270ec1 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ClustersOperations.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ClustersOperations.cs @@ -98,7 +98,6 @@ internal ClustersOperations(ServiceFabricManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); } - string apiVersion = "2018-02-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -108,7 +107,6 @@ internal ClustersOperations(ServiceFabricManagementClient client) Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("clusterName", clusterName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters); } @@ -119,9 +117,9 @@ internal ClustersOperations(ServiceFabricManagementClient client) _url = _url.Replace("{clusterName}", System.Uri.EscapeDataString(clusterName)); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -345,7 +343,6 @@ internal ClustersOperations(ServiceFabricManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); } - string apiVersion = "2018-02-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -355,7 +352,6 @@ internal ClustersOperations(ServiceFabricManagementClient client) Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("clusterName", clusterName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Delete", tracingParameters); } @@ -366,9 +362,9 @@ internal ClustersOperations(ServiceFabricManagementClient client) _url = _url.Replace("{clusterName}", System.Uri.EscapeDataString(clusterName)); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -514,7 +510,6 @@ internal ClustersOperations(ServiceFabricManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); } - string apiVersion = "2018-02-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -523,7 +518,6 @@ internal ClustersOperations(ServiceFabricManagementClient client) _invocationId = ServiceClientTracing.NextInvocationId.ToString(); Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("resourceGroupName", resourceGroupName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "ListByResourceGroup", tracingParameters); } @@ -533,9 +527,9 @@ internal ClustersOperations(ServiceFabricManagementClient client) _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -692,7 +686,6 @@ internal ClustersOperations(ServiceFabricManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); } - string apiVersion = "2018-02-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -700,7 +693,6 @@ internal ClustersOperations(ServiceFabricManagementClient client) { _invocationId = ServiceClientTracing.NextInvocationId.ToString(); Dictionary tracingParameters = new Dictionary(); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters); } @@ -709,9 +701,9 @@ internal ClustersOperations(ServiceFabricManagementClient client) var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.ServiceFabric/clusters").ToString(); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -891,7 +883,6 @@ internal ClustersOperations(ServiceFabricManagementClient client) { parameters.Validate(); } - string apiVersion = "2018-02-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -901,7 +892,6 @@ internal ClustersOperations(ServiceFabricManagementClient client) Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("clusterName", clusterName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("parameters", parameters); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "BeginCreate", tracingParameters); @@ -913,9 +903,9 @@ internal ClustersOperations(ServiceFabricManagementClient client) _url = _url.Replace("{clusterName}", System.Uri.EscapeDataString(clusterName)); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -1117,7 +1107,6 @@ internal ClustersOperations(ServiceFabricManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "parameters"); } - string apiVersion = "2018-02-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -1127,7 +1116,6 @@ internal ClustersOperations(ServiceFabricManagementClient client) Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("clusterName", clusterName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("parameters", parameters); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "BeginUpdate", tracingParameters); @@ -1139,9 +1127,9 @@ internal ClustersOperations(ServiceFabricManagementClient client) _url = _url.Replace("{clusterName}", System.Uri.EscapeDataString(clusterName)); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/IApplicationTypesOperations.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/IApplicationTypesOperations.cs index 5446fbf6d93b..0f6909abba7d 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/IApplicationTypesOperations.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/IApplicationTypesOperations.cs @@ -72,8 +72,8 @@ public partial interface IApplicationTypesOperations /// /// The name of the application type name resource. /// - /// - /// Azure resource location. + /// + /// The application type name resource. /// /// /// The headers that will be added to request. @@ -90,7 +90,7 @@ public partial interface IApplicationTypesOperations /// /// Thrown when a required parameter is null /// - Task> CreateWithHttpMessagesAsync(string resourceGroupName, string clusterName, string applicationTypeName, string location = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> CreateWithHttpMessagesAsync(string resourceGroupName, string clusterName, string applicationTypeName, ApplicationTypeResource parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Deletes a Service Fabric application type name resource. /// diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/IApplicationsOperations.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/IApplicationsOperations.cs index 5cafc6ef7901..bbbada5ee9f9 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/IApplicationsOperations.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/IApplicationsOperations.cs @@ -124,7 +124,7 @@ public partial interface IApplicationsOperations /// /// Thrown when a required parameter is null /// - Task> UpdateWithHttpMessagesAsync(string resourceGroupName, string clusterName, string applicationName, ApplicationResourceUpdate parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> UpdateWithHttpMessagesAsync(string resourceGroupName, string clusterName, string applicationName, ApplicationResourceUpdate parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Deletes a Service Fabric application resource. /// @@ -253,7 +253,7 @@ public partial interface IApplicationsOperations /// /// Thrown when a required parameter is null /// - Task> BeginUpdateWithHttpMessagesAsync(string resourceGroupName, string clusterName, string applicationName, ApplicationResourceUpdate parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> BeginUpdateWithHttpMessagesAsync(string resourceGroupName, string clusterName, string applicationName, ApplicationResourceUpdate parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Deletes a Service Fabric application resource. /// diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/IOperations.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/IOperations.cs index a8bc3b123137..3a9839f6f043 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/IOperations.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/IOperations.cs @@ -32,7 +32,7 @@ public partial interface IOperations /// operations. /// /// - /// The version of the Service Fabric resouce provider API + /// The version of the Service Fabric resource provider API /// /// /// The headers that will be added to request. diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/IServiceFabricManagementClient.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/IServiceFabricManagementClient.cs index bdc9157351de..1e551845c722 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/IServiceFabricManagementClient.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/IServiceFabricManagementClient.cs @@ -40,25 +40,33 @@ public partial interface IServiceFabricManagementClient : System.IDisposable /// ServiceClientCredentials Credentials { get; } + /// + /// The version of the Service Fabric resource provider API. This is a + /// required parameter and it's value must be "2019-03-01-preview" for + /// this specification. + /// + string ApiVersion { get; } + /// /// The customer subscription identifier. /// string SubscriptionId { get; set; } /// - /// Gets or sets the preferred language for the response. + /// The preferred language for the response. /// string AcceptLanguage { get; set; } /// - /// Gets or sets the retry timeout in seconds for Long Running - /// Operations. Default value is 30. + /// The retry timeout in seconds for Long Running Operations. Default + /// value is 30. /// int? LongRunningOperationRetryTimeout { get; set; } /// - /// When set to true a unique x-ms-client-request-id value is generated - /// and included in each request. Default is true. + /// Whether a unique x-ms-client-request-id should be generated. When + /// set to true a unique x-ms-client-request-id value is generated and + /// included in each request. Default is true. /// bool? GenerateClientRequestId { get; set; } diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/IServicesOperations.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/IServicesOperations.cs index 70e8f5b5cf46..e5920253ad60 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/IServicesOperations.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/IServicesOperations.cs @@ -135,7 +135,7 @@ public partial interface IServicesOperations /// /// Thrown when a required parameter is null /// - Task> UpdateWithHttpMessagesAsync(string resourceGroupName, string clusterName, string applicationName, string serviceName, ServiceResourceUpdate parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> UpdateWithHttpMessagesAsync(string resourceGroupName, string clusterName, string applicationName, string serviceName, ServiceResourceUpdate parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Deletes a Service Fabric service resource. /// @@ -277,7 +277,7 @@ public partial interface IServicesOperations /// /// Thrown when a required parameter is null /// - Task> BeginUpdateWithHttpMessagesAsync(string resourceGroupName, string clusterName, string applicationName, string serviceName, ServiceResourceUpdate parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> BeginUpdateWithHttpMessagesAsync(string resourceGroupName, string clusterName, string applicationName, string serviceName, ServiceResourceUpdate parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Deletes a Service Fabric service resource. /// diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationHealthPolicy.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationHealthPolicy.cs index 90c4fd6609d8..38f396bbcf0a 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationHealthPolicy.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationHealthPolicy.cs @@ -38,33 +38,10 @@ public ApplicationHealthPolicy() /// The map with service type /// health policy per service type name. The map is empty by /// default. - /// Indicates whether warnings are - /// treated with the same severity as errors. - /// The maximum - /// allowed percentage of unhealthy deployed applications. Allowed - /// values are Byte values from zero to 100. - /// The percentage represents the maximum tolerated percentage of - /// deployed applications that can be unhealthy before the application - /// is considered in error. - /// This is calculated by dividing the number of unhealthy deployed - /// applications over the number of nodes where the application is - /// currently deployed on in the cluster. - /// The computation rounds up to tolerate one failure on small numbers - /// of nodes. Default percentage is zero. - /// - /// The health policy - /// used by default to evaluate the health of a service type. - /// The map with service type - /// health policy per service type name. The map is empty by - /// default. - public ApplicationHealthPolicy(ServiceTypeHealthPolicy defaultServiceTypeHealthPolicy = default(ServiceTypeHealthPolicy), IDictionary serviceTypeHealthPolicies = default(IDictionary), bool? considerWarningAsError = default(bool?), int? maxPercentUnhealthyDeployedApplications = default(int?), ServiceTypeHealthPolicy defaultServiceTypeHealthPolicy1 = default(ServiceTypeHealthPolicy), IDictionary serviceTypeHealthPolicyMap = default(IDictionary)) + public ApplicationHealthPolicy(ServiceTypeHealthPolicy defaultServiceTypeHealthPolicy = default(ServiceTypeHealthPolicy), IDictionary serviceTypeHealthPolicies = default(IDictionary)) { DefaultServiceTypeHealthPolicy = defaultServiceTypeHealthPolicy; ServiceTypeHealthPolicies = serviceTypeHealthPolicies; - ConsiderWarningAsError = considerWarningAsError; - MaxPercentUnhealthyDeployedApplications = maxPercentUnhealthyDeployedApplications; - DefaultServiceTypeHealthPolicy1 = defaultServiceTypeHealthPolicy1; - ServiceTypeHealthPolicyMap = serviceTypeHealthPolicyMap; CustomInit(); } @@ -87,43 +64,6 @@ public ApplicationHealthPolicy() [JsonProperty(PropertyName = "serviceTypeHealthPolicies")] public IDictionary ServiceTypeHealthPolicies { get; set; } - /// - /// Gets or sets indicates whether warnings are treated with the same - /// severity as errors. - /// - [JsonProperty(PropertyName = "ConsiderWarningAsError")] - public bool? ConsiderWarningAsError { get; set; } - - /// - /// Gets or sets the maximum allowed percentage of unhealthy deployed - /// applications. Allowed values are Byte values from zero to 100. - /// The percentage represents the maximum tolerated percentage of - /// deployed applications that can be unhealthy before the application - /// is considered in error. - /// This is calculated by dividing the number of unhealthy deployed - /// applications over the number of nodes where the application is - /// currently deployed on in the cluster. - /// The computation rounds up to tolerate one failure on small numbers - /// of nodes. Default percentage is zero. - /// - /// - [JsonProperty(PropertyName = "MaxPercentUnhealthyDeployedApplications")] - public int? MaxPercentUnhealthyDeployedApplications { get; set; } - - /// - /// Gets or sets the health policy used by default to evaluate the - /// health of a service type. - /// - [JsonProperty(PropertyName = "DefaultServiceTypeHealthPolicy")] - public ServiceTypeHealthPolicy DefaultServiceTypeHealthPolicy1 { get; set; } - - /// - /// Gets or sets the map with service type health policy per service - /// type name. The map is empty by default. - /// - [JsonProperty(PropertyName = "ServiceTypeHealthPolicyMap")] - public IDictionary ServiceTypeHealthPolicyMap { get; set; } - /// /// Validate the object. /// @@ -146,20 +86,6 @@ public virtual void Validate() } } } - if (DefaultServiceTypeHealthPolicy1 != null) - { - DefaultServiceTypeHealthPolicy1.Validate(); - } - if (ServiceTypeHealthPolicyMap != null) - { - foreach (var valueElement1 in ServiceTypeHealthPolicyMap.Values) - { - if (valueElement1 != null) - { - valueElement1.Validate(); - } - } - } } } } diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationMetricDescription.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationMetricDescription.cs index f8729c84d8d1..d9eb8e0c225a 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationMetricDescription.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationMetricDescription.cs @@ -86,7 +86,7 @@ public ApplicationMetricDescription() /// /// Gets or sets the name of the metric. /// - [JsonProperty(PropertyName = "Name")] + [JsonProperty(PropertyName = "name")] public string Name { get; set; } /// @@ -105,7 +105,7 @@ public ApplicationMetricDescription() /// or equal to TotalApplicationCapacity. /// /// - [JsonProperty(PropertyName = "MaximumCapacity")] + [JsonProperty(PropertyName = "maximumCapacity")] public long? MaximumCapacity { get; set; } /// @@ -121,7 +121,7 @@ public ApplicationMetricDescription() /// MaximumCapacity for each metric. /// /// - [JsonProperty(PropertyName = "ReservationCapacity")] + [JsonProperty(PropertyName = "reservationCapacity")] public long? ReservationCapacity { get; set; } /// @@ -135,7 +135,7 @@ public ApplicationMetricDescription() /// smaller than or equal to this value. /// /// - [JsonProperty(PropertyName = "TotalApplicationCapacity")] + [JsonProperty(PropertyName = "totalApplicationCapacity")] public long? TotalApplicationCapacity { get; set; } } diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationResource.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationResource.cs index eee91e7082e3..5562c5260d94 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationResource.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationResource.cs @@ -38,6 +38,8 @@ public ApplicationResource() /// Azure resource name. /// Azure resource type. /// Azure resource location. + /// Azure resource tags. + /// Azure resource etag. /// The version of the application type as /// defined in the application manifest. /// List of application parameters with @@ -65,8 +67,8 @@ public ApplicationResource() /// provisioning state, which only appears in the response /// The application type name as defined in the /// application manifest. - public ApplicationResource(string id = default(string), string name = default(string), string type = default(string), string location = default(string), string typeVersion = default(string), IDictionary parameters = default(IDictionary), ApplicationUpgradePolicy upgradePolicy = default(ApplicationUpgradePolicy), long? minimumNodes = default(long?), long? maximumNodes = default(long?), bool? removeApplicationCapacity = default(bool?), IList metrics = default(IList), string provisioningState = default(string), string typeName = default(string)) - : base(id, name, type, location) + public ApplicationResource(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary tags = default(IDictionary), string etag = default(string), string typeVersion = default(string), IDictionary parameters = default(IDictionary), ApplicationUpgradePolicy upgradePolicy = default(ApplicationUpgradePolicy), long? minimumNodes = default(long?), long? maximumNodes = default(long?), bool? removeApplicationCapacity = default(bool?), IList metrics = default(IList), string provisioningState = default(string), string typeName = default(string)) + : base(id, name, type, location, tags, etag) { TypeVersion = typeVersion; Parameters = parameters; diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationResourceList.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationResourceList.cs index 08be3dda0d4d..8867fae81e42 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationResourceList.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationResourceList.cs @@ -31,9 +31,12 @@ public ApplicationResourceList() /// /// Initializes a new instance of the ApplicationResourceList class. /// - public ApplicationResourceList(IList value = default(IList)) + /// URL to get the next set of application list + /// results if there are any. + public ApplicationResourceList(IList value = default(IList), string nextLink = default(string)) { Value = value; + NextLink = nextLink; CustomInit(); } @@ -47,5 +50,12 @@ public ApplicationResourceList() [JsonProperty(PropertyName = "value")] public IList Value { get; set; } + /// + /// Gets URL to get the next set of application list results if there + /// are any. + /// + [JsonProperty(PropertyName = "nextLink")] + public string NextLink { get; private set; } + } } diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationResourceUpdate.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationResourceUpdate.cs index ad14ec564477..0ed21c5cdd8e 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationResourceUpdate.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationResourceUpdate.cs @@ -38,6 +38,8 @@ public ApplicationResourceUpdate() /// Azure resource name. /// Azure resource type. /// Azure resource location. + /// Azure resource tags. + /// Azure resource etag. /// The version of the application type as /// defined in the application manifest. /// List of application parameters with @@ -61,8 +63,8 @@ public ApplicationResourceUpdate() /// application capacity settings. /// List of application capacity metric /// description. - public ApplicationResourceUpdate(string id = default(string), string name = default(string), string type = default(string), string location = default(string), string typeVersion = default(string), IDictionary parameters = default(IDictionary), ApplicationUpgradePolicy upgradePolicy = default(ApplicationUpgradePolicy), long? minimumNodes = default(long?), long? maximumNodes = default(long?), bool? removeApplicationCapacity = default(bool?), IList metrics = default(IList)) - : base(id, name, type, location) + public ApplicationResourceUpdate(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary tags = default(IDictionary), string etag = default(string), string typeVersion = default(string), IDictionary parameters = default(IDictionary), ApplicationUpgradePolicy upgradePolicy = default(ApplicationUpgradePolicy), long? minimumNodes = default(long?), long? maximumNodes = default(long?), bool? removeApplicationCapacity = default(bool?), IList metrics = default(IList)) + : base(id, name, type, location, tags, etag) { TypeVersion = typeVersion; Parameters = parameters; diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationTypeResource.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationTypeResource.cs index 4fe690b5069f..f6feb114da26 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationTypeResource.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationTypeResource.cs @@ -13,6 +13,8 @@ namespace Microsoft.Azure.Management.ServiceFabric.Models using Microsoft.Rest; using Microsoft.Rest.Serialization; using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; using System.Linq; /// @@ -36,10 +38,12 @@ public ApplicationTypeResource() /// Azure resource name. /// Azure resource type. /// Azure resource location. + /// Azure resource tags. + /// Azure resource etag. /// The current deployment or /// provisioning state, which only appears in the response. - public ApplicationTypeResource(string id = default(string), string name = default(string), string type = default(string), string location = default(string), string provisioningState = default(string)) - : base(id, name, type, location) + public ApplicationTypeResource(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary tags = default(IDictionary), string etag = default(string), string provisioningState = default(string)) + : base(id, name, type, location, tags, etag) { ProvisioningState = provisioningState; CustomInit(); diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationTypeResourceList.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationTypeResourceList.cs index 55a9e5cdbbc4..e1b0f9a51689 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationTypeResourceList.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationTypeResourceList.cs @@ -33,9 +33,12 @@ public ApplicationTypeResourceList() /// Initializes a new instance of the ApplicationTypeResourceList /// class. /// - public ApplicationTypeResourceList(IList value = default(IList)) + /// URL to get the next set of application type + /// list results if there are any. + public ApplicationTypeResourceList(IList value = default(IList), string nextLink = default(string)) { Value = value; + NextLink = nextLink; CustomInit(); } @@ -49,5 +52,12 @@ public ApplicationTypeResourceList() [JsonProperty(PropertyName = "value")] public IList Value { get; set; } + /// + /// Gets URL to get the next set of application type list results if + /// there are any. + /// + [JsonProperty(PropertyName = "nextLink")] + public string NextLink { get; private set; } + } } diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationTypeVersionResource.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationTypeVersionResource.cs index b43e739f1aef..6d535afcf4d0 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationTypeVersionResource.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationTypeVersionResource.cs @@ -43,13 +43,15 @@ public ApplicationTypeVersionResource() /// Azure resource name. /// Azure resource type. /// Azure resource location. + /// Azure resource tags. + /// Azure resource etag. /// The current deployment or /// provisioning state, which only appears in the response /// List of application type /// parameters that can be overridden when creating or updating the /// application. - public ApplicationTypeVersionResource(string appPackageUrl, string id = default(string), string name = default(string), string type = default(string), string location = default(string), string provisioningState = default(string), IDictionary defaultParameterList = default(IDictionary)) - : base(id, name, type, location) + public ApplicationTypeVersionResource(string appPackageUrl, string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary tags = default(IDictionary), string etag = default(string), string provisioningState = default(string), IDictionary defaultParameterList = default(IDictionary)) + : base(id, name, type, location, tags, etag) { ProvisioningState = provisioningState; AppPackageUrl = appPackageUrl; diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationTypeVersionResourceList.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationTypeVersionResourceList.cs index 477a2299c7df..bdb0fa9ccfaf 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationTypeVersionResourceList.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationTypeVersionResourceList.cs @@ -34,9 +34,12 @@ public ApplicationTypeVersionResourceList() /// Initializes a new instance of the /// ApplicationTypeVersionResourceList class. /// - public ApplicationTypeVersionResourceList(IList value = default(IList)) + /// URL to get the next set of application type + /// version list results if there are any. + public ApplicationTypeVersionResourceList(IList value = default(IList), string nextLink = default(string)) { Value = value; + NextLink = nextLink; CustomInit(); } @@ -50,5 +53,12 @@ public ApplicationTypeVersionResourceList() [JsonProperty(PropertyName = "value")] public IList Value { get; set; } + /// + /// Gets URL to get the next set of application type version list + /// results if there are any. + /// + [JsonProperty(PropertyName = "nextLink")] + public string NextLink { get; private set; } + } } diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationUpgradePolicy.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationUpgradePolicy.cs index 6209656879f0..d02093daa32c 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationUpgradePolicy.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ApplicationUpgradePolicy.cs @@ -45,7 +45,7 @@ public ApplicationUpgradePolicy() /// to evaluate the health of an application or one of its children /// entities. /// - public ApplicationUpgradePolicy(long? upgradeReplicaSetCheckTimeout = default(long?), bool? forceRestart = default(bool?), RollingUpgradeMonitoringPolicy rollingUpgradeMonitoringPolicy = default(RollingUpgradeMonitoringPolicy), ApplicationHealthPolicy applicationHealthPolicy = default(ApplicationHealthPolicy)) + public ApplicationUpgradePolicy(string upgradeReplicaSetCheckTimeout = default(string), bool? forceRestart = default(bool?), ArmRollingUpgradeMonitoringPolicy rollingUpgradeMonitoringPolicy = default(ArmRollingUpgradeMonitoringPolicy), ArmApplicationHealthPolicy applicationHealthPolicy = default(ArmApplicationHealthPolicy)) { UpgradeReplicaSetCheckTimeout = upgradeReplicaSetCheckTimeout; ForceRestart = forceRestart; @@ -69,7 +69,7 @@ public ApplicationUpgradePolicy() /// integer). /// [JsonProperty(PropertyName = "upgradeReplicaSetCheckTimeout")] - public long? UpgradeReplicaSetCheckTimeout { get; set; } + public string UpgradeReplicaSetCheckTimeout { get; set; } /// /// Gets or sets if true, then processes are forcefully restarted @@ -83,7 +83,7 @@ public ApplicationUpgradePolicy() /// Gets or sets the policy used for monitoring the application upgrade /// [JsonProperty(PropertyName = "rollingUpgradeMonitoringPolicy")] - public RollingUpgradeMonitoringPolicy RollingUpgradeMonitoringPolicy { get; set; } + public ArmRollingUpgradeMonitoringPolicy RollingUpgradeMonitoringPolicy { get; set; } /// /// Gets or sets defines a health policy used to evaluate the health of @@ -91,7 +91,7 @@ public ApplicationUpgradePolicy() /// /// [JsonProperty(PropertyName = "applicationHealthPolicy")] - public ApplicationHealthPolicy ApplicationHealthPolicy { get; set; } + public ArmApplicationHealthPolicy ApplicationHealthPolicy { get; set; } /// /// Validate the object. diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ArmApplicationHealthPolicy.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ArmApplicationHealthPolicy.cs new file mode 100644 index 000000000000..510ba8b7faa3 --- /dev/null +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ArmApplicationHealthPolicy.cs @@ -0,0 +1,130 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.ServiceFabric.Models +{ + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// Defines a health policy used to evaluate the health of an application + /// or one of its children entities. + /// + /// + public partial class ArmApplicationHealthPolicy + { + /// + /// Initializes a new instance of the ArmApplicationHealthPolicy class. + /// + public ArmApplicationHealthPolicy() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ArmApplicationHealthPolicy class. + /// + /// Indicates whether warnings are + /// treated with the same severity as errors. + /// The maximum + /// allowed percentage of unhealthy deployed applications. Allowed + /// values are Byte values from zero to 100. + /// The percentage represents the maximum tolerated percentage of + /// deployed applications that can be unhealthy before the application + /// is considered in error. + /// This is calculated by dividing the number of unhealthy deployed + /// applications over the number of nodes where the application is + /// currently deployed on in the cluster. + /// The computation rounds up to tolerate one failure on small numbers + /// of nodes. Default percentage is zero. + /// + /// The health policy used + /// by default to evaluate the health of a service type. + /// The map with service type + /// health policy per service type name. The map is empty by + /// default. + public ArmApplicationHealthPolicy(bool? considerWarningAsError = default(bool?), int? maxPercentUnhealthyDeployedApplications = default(int?), ArmServiceTypeHealthPolicy defaultServiceTypeHealthPolicy = default(ArmServiceTypeHealthPolicy), IDictionary serviceTypeHealthPolicyMap = default(IDictionary)) + { + ConsiderWarningAsError = considerWarningAsError; + MaxPercentUnhealthyDeployedApplications = maxPercentUnhealthyDeployedApplications; + DefaultServiceTypeHealthPolicy = defaultServiceTypeHealthPolicy; + ServiceTypeHealthPolicyMap = serviceTypeHealthPolicyMap; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets indicates whether warnings are treated with the same + /// severity as errors. + /// + [JsonProperty(PropertyName = "considerWarningAsError")] + public bool? ConsiderWarningAsError { get; set; } + + /// + /// Gets or sets the maximum allowed percentage of unhealthy deployed + /// applications. Allowed values are Byte values from zero to 100. + /// The percentage represents the maximum tolerated percentage of + /// deployed applications that can be unhealthy before the application + /// is considered in error. + /// This is calculated by dividing the number of unhealthy deployed + /// applications over the number of nodes where the application is + /// currently deployed on in the cluster. + /// The computation rounds up to tolerate one failure on small numbers + /// of nodes. Default percentage is zero. + /// + /// + [JsonProperty(PropertyName = "maxPercentUnhealthyDeployedApplications")] + public int? MaxPercentUnhealthyDeployedApplications { get; set; } + + /// + /// Gets or sets the health policy used by default to evaluate the + /// health of a service type. + /// + [JsonProperty(PropertyName = "defaultServiceTypeHealthPolicy")] + public ArmServiceTypeHealthPolicy DefaultServiceTypeHealthPolicy { get; set; } + + /// + /// Gets or sets the map with service type health policy per service + /// type name. The map is empty by default. + /// + [JsonProperty(PropertyName = "serviceTypeHealthPolicyMap")] + public IDictionary ServiceTypeHealthPolicyMap { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (DefaultServiceTypeHealthPolicy != null) + { + DefaultServiceTypeHealthPolicy.Validate(); + } + if (ServiceTypeHealthPolicyMap != null) + { + foreach (var valueElement in ServiceTypeHealthPolicyMap.Values) + { + if (valueElement != null) + { + valueElement.Validate(); + } + } + } + } + } +} diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/RollingUpgradeMonitoringPolicy.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ArmRollingUpgradeMonitoringPolicy.cs similarity index 84% rename from src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/RollingUpgradeMonitoringPolicy.cs rename to src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ArmRollingUpgradeMonitoringPolicy.cs index 2b6c50a97ae0..2a10d07d56fb 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/RollingUpgradeMonitoringPolicy.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ArmRollingUpgradeMonitoringPolicy.cs @@ -16,21 +16,23 @@ namespace Microsoft.Azure.Management.ServiceFabric.Models /// /// The policy used for monitoring the application upgrade /// - public partial class RollingUpgradeMonitoringPolicy + public partial class ArmRollingUpgradeMonitoringPolicy { /// - /// Initializes a new instance of the RollingUpgradeMonitoringPolicy + /// Initializes a new instance of the ArmRollingUpgradeMonitoringPolicy /// class. /// - public RollingUpgradeMonitoringPolicy() + public ArmRollingUpgradeMonitoringPolicy() { CustomInit(); } /// - /// Initializes a new instance of the RollingUpgradeMonitoringPolicy + /// Initializes a new instance of the ArmRollingUpgradeMonitoringPolicy /// class. /// + /// The activation Mode of the service + /// package. Possible values include: 'Rollback', 'Manual' /// The amount of time to wait /// after completing an upgrade domain before applying health policies. /// It is first interpreted as a string representing an ISO 8601 @@ -58,8 +60,9 @@ public RollingUpgradeMonitoringPolicy() /// first interpreted as a string representing an ISO 8601 duration. If /// that fails, then it is interpreted as a number representing the /// total number of milliseconds. - public RollingUpgradeMonitoringPolicy(string healthCheckWaitDuration = default(string), string healthCheckStableDuration = default(string), string healthCheckRetryTimeout = default(string), string upgradeTimeout = default(string), string upgradeDomainTimeout = default(string)) + public ArmRollingUpgradeMonitoringPolicy(string failureAction = default(string), string healthCheckWaitDuration = default(string), string healthCheckStableDuration = default(string), string healthCheckRetryTimeout = default(string), string upgradeTimeout = default(string), string upgradeDomainTimeout = default(string)) { + FailureAction = failureAction; HealthCheckWaitDuration = healthCheckWaitDuration; HealthCheckStableDuration = healthCheckStableDuration; HealthCheckRetryTimeout = healthCheckRetryTimeout; @@ -73,6 +76,13 @@ public RollingUpgradeMonitoringPolicy() /// partial void CustomInit(); + /// + /// Gets or sets the activation Mode of the service package. Possible + /// values include: 'Rollback', 'Manual' + /// + [JsonProperty(PropertyName = "failureAction")] + public string FailureAction { get; set; } + /// /// Gets or sets the amount of time to wait after completing an upgrade /// domain before applying health policies. It is first interpreted as diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ArmServicePackageActivationMode.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ArmServicePackageActivationMode.cs new file mode 100644 index 000000000000..8412369b7da8 --- /dev/null +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ArmServicePackageActivationMode.cs @@ -0,0 +1,30 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.ServiceFabric.Models +{ + + /// + /// Defines values for ArmServicePackageActivationMode. + /// + public static class ArmServicePackageActivationMode + { + /// + /// Indicates the application package activation mode will use shared + /// process. + /// + public const string SharedProcess = "SharedProcess"; + /// + /// Indicates the application package activation mode will use + /// exclusive process. + /// + public const string ExclusiveProcess = "ExclusiveProcess"; + } +} diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ArmServiceTypeHealthPolicy.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ArmServiceTypeHealthPolicy.cs new file mode 100644 index 000000000000..646b3418e864 --- /dev/null +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ArmServiceTypeHealthPolicy.cs @@ -0,0 +1,120 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.ServiceFabric.Models +{ + using Microsoft.Rest; + using Newtonsoft.Json; + using System.Linq; + + /// + /// Represents the health policy used to evaluate the health of services + /// belonging to a service type. + /// + /// + public partial class ArmServiceTypeHealthPolicy + { + /// + /// Initializes a new instance of the ArmServiceTypeHealthPolicy class. + /// + public ArmServiceTypeHealthPolicy() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ArmServiceTypeHealthPolicy class. + /// + /// The maximum percentage of + /// services allowed to be unhealthy before your application is + /// considered in error. + /// + /// The maximum + /// percentage of partitions per service allowed to be unhealthy before + /// your application is considered in error. + /// + /// The maximum + /// percentage of replicas per partition allowed to be unhealthy before + /// your application is considered in error. + /// + public ArmServiceTypeHealthPolicy(int? maxPercentUnhealthyServices = default(int?), int? maxPercentUnhealthyPartitionsPerService = default(int?), int? maxPercentUnhealthyReplicasPerPartition = default(int?)) + { + MaxPercentUnhealthyServices = maxPercentUnhealthyServices; + MaxPercentUnhealthyPartitionsPerService = maxPercentUnhealthyPartitionsPerService; + MaxPercentUnhealthyReplicasPerPartition = maxPercentUnhealthyReplicasPerPartition; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the maximum percentage of services allowed to be + /// unhealthy before your application is considered in error. + /// + /// + [JsonProperty(PropertyName = "maxPercentUnhealthyServices")] + public int? MaxPercentUnhealthyServices { get; set; } + + /// + /// Gets or sets the maximum percentage of partitions per service + /// allowed to be unhealthy before your application is considered in + /// error. + /// + /// + [JsonProperty(PropertyName = "maxPercentUnhealthyPartitionsPerService")] + public int? MaxPercentUnhealthyPartitionsPerService { get; set; } + + /// + /// Gets or sets the maximum percentage of replicas per partition + /// allowed to be unhealthy before your application is considered in + /// error. + /// + /// + [JsonProperty(PropertyName = "maxPercentUnhealthyReplicasPerPartition")] + public int? MaxPercentUnhealthyReplicasPerPartition { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (MaxPercentUnhealthyServices > 100) + { + throw new ValidationException(ValidationRules.InclusiveMaximum, "MaxPercentUnhealthyServices", 100); + } + if (MaxPercentUnhealthyServices < 0) + { + throw new ValidationException(ValidationRules.InclusiveMinimum, "MaxPercentUnhealthyServices", 0); + } + if (MaxPercentUnhealthyPartitionsPerService > 100) + { + throw new ValidationException(ValidationRules.InclusiveMaximum, "MaxPercentUnhealthyPartitionsPerService", 100); + } + if (MaxPercentUnhealthyPartitionsPerService < 0) + { + throw new ValidationException(ValidationRules.InclusiveMinimum, "MaxPercentUnhealthyPartitionsPerService", 0); + } + if (MaxPercentUnhealthyReplicasPerPartition > 100) + { + throw new ValidationException(ValidationRules.InclusiveMaximum, "MaxPercentUnhealthyReplicasPerPartition", 100); + } + if (MaxPercentUnhealthyReplicasPerPartition < 0) + { + throw new ValidationException(ValidationRules.InclusiveMinimum, "MaxPercentUnhealthyReplicasPerPartition", 0); + } + } + } +} diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ArmUpgradeFailureAction.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ArmUpgradeFailureAction.cs new file mode 100644 index 000000000000..9f83cb861d16 --- /dev/null +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ArmUpgradeFailureAction.cs @@ -0,0 +1,31 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.ServiceFabric.Models +{ + + /// + /// Defines values for ArmUpgradeFailureAction. + /// + public static class ArmUpgradeFailureAction + { + /// + /// Indicates that a rollback of the upgrade will be performed by + /// Service Fabric if the upgrade fails. + /// + public const string Rollback = "Rollback"; + /// + /// Indicates that a manual repair will need to be performed by the + /// administrator if the upgrade fails. Service Fabric will not proceed + /// to the next upgrade domain automatically. + /// + public const string Manual = "Manual"; + } +} diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/AvailableOperationDisplay.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/AvailableOperationDisplay.cs index 87a31dea0be5..886a0842c7f2 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/AvailableOperationDisplay.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/AvailableOperationDisplay.cs @@ -14,7 +14,7 @@ namespace Microsoft.Azure.Management.ServiceFabric.Models using System.Linq; /// - /// Operation supported by Service Fabric resource provider + /// Operation supported by the Service Fabric resource provider /// public partial class AvailableOperationDisplay { diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/Cluster.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/Cluster.cs index bf2e97a16186..62511b3034b0 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/Cluster.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/Cluster.cs @@ -44,6 +44,7 @@ public Cluster() /// Azure resource name. /// Azure resource type. /// Azure resource tags. + /// Azure resource etag. /// The list of add-on features to enable /// in the cluster. /// The Service Fabric runtime @@ -107,6 +108,8 @@ public Cluster() /// 'AutoScale', 'Ready' /// The storage account /// information for storing Service Fabric diagnostic logs. + /// Indicates if the event store + /// service is enabled. /// The list of custom fabric settings to /// configure the cluster. /// The provisioning state of the @@ -147,8 +150,8 @@ public Cluster() /// . Possible values include: 'Automatic', 'Manual' /// The VM image VMSS has been configured with. /// Generic names such as Windows or Linux can be used. - public Cluster(string location, string managementEndpoint, IList nodeTypes, string id = default(string), string name = default(string), string type = default(string), IDictionary tags = default(IDictionary), IList addOnFeatures = default(IList), IList availableClusterVersions = default(IList), AzureActiveDirectory azureActiveDirectory = default(AzureActiveDirectory), CertificateDescription certificate = default(CertificateDescription), ServerCertificateCommonNames certificateCommonNames = default(ServerCertificateCommonNames), IList clientCertificateCommonNames = default(IList), IList clientCertificateThumbprints = default(IList), string clusterCodeVersion = default(string), string clusterEndpoint = default(string), string clusterId = default(string), string clusterState = default(string), DiagnosticsStorageAccountConfig diagnosticsStorageAccountConfig = default(DiagnosticsStorageAccountConfig), IList fabricSettings = default(IList), string provisioningState = default(string), string reliabilityLevel = default(string), CertificateDescription reverseProxyCertificate = default(CertificateDescription), ServerCertificateCommonNames reverseProxyCertificateCommonNames = default(ServerCertificateCommonNames), ClusterUpgradePolicy upgradeDescription = default(ClusterUpgradePolicy), string upgradeMode = default(string), string vmImage = default(string)) - : base(location, id, name, type, tags) + public Cluster(string location, string managementEndpoint, IList nodeTypes, string id = default(string), string name = default(string), string type = default(string), IDictionary tags = default(IDictionary), string etag = default(string), IList addOnFeatures = default(IList), IList availableClusterVersions = default(IList), AzureActiveDirectory azureActiveDirectory = default(AzureActiveDirectory), CertificateDescription certificate = default(CertificateDescription), ServerCertificateCommonNames certificateCommonNames = default(ServerCertificateCommonNames), IList clientCertificateCommonNames = default(IList), IList clientCertificateThumbprints = default(IList), string clusterCodeVersion = default(string), string clusterEndpoint = default(string), string clusterId = default(string), string clusterState = default(string), DiagnosticsStorageAccountConfig diagnosticsStorageAccountConfig = default(DiagnosticsStorageAccountConfig), bool? eventStoreServiceEnabled = default(bool?), IList fabricSettings = default(IList), string provisioningState = default(string), string reliabilityLevel = default(string), CertificateDescription reverseProxyCertificate = default(CertificateDescription), ServerCertificateCommonNames reverseProxyCertificateCommonNames = default(ServerCertificateCommonNames), ClusterUpgradePolicy upgradeDescription = default(ClusterUpgradePolicy), string upgradeMode = default(string), string vmImage = default(string)) + : base(location, id, name, type, tags, etag) { AddOnFeatures = addOnFeatures; AvailableClusterVersions = availableClusterVersions; @@ -162,6 +165,7 @@ public Cluster() ClusterId = clusterId; ClusterState = clusterState; DiagnosticsStorageAccountConfig = diagnosticsStorageAccountConfig; + EventStoreServiceEnabled = eventStoreServiceEnabled; FabricSettings = fabricSettings; ManagementEndpoint = managementEndpoint; NodeTypes = nodeTypes; @@ -298,6 +302,12 @@ public Cluster() [JsonProperty(PropertyName = "properties.diagnosticsStorageAccountConfig")] public DiagnosticsStorageAccountConfig DiagnosticsStorageAccountConfig { get; set; } + /// + /// Gets or sets indicates if the event store service is enabled. + /// + [JsonProperty(PropertyName = "properties.eventStoreServiceEnabled")] + public bool? EventStoreServiceEnabled { get; set; } + /// /// Gets or sets the list of custom fabric settings to configure the /// cluster. diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ClusterCodeVersionsListResult.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ClusterCodeVersionsListResult.cs index 10994424ad3b..c4c7d9634302 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ClusterCodeVersionsListResult.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ClusterCodeVersionsListResult.cs @@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.ServiceFabric.Models using System.Linq; /// - /// The list results of the ServiceFabric runtime versions. + /// The list results of the Service Fabric runtime versions. /// public partial class ClusterCodeVersionsListResult { diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ClusterCodeVersionsResult.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ClusterCodeVersionsResult.cs index 5278974ca36a..2f0bef9fd6f1 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ClusterCodeVersionsResult.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ClusterCodeVersionsResult.cs @@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.ServiceFabric.Models using System.Linq; /// - /// The result of the ServiceFabric runtime versions + /// The result of the Service Fabric runtime versions /// [Rest.Serialization.JsonTransformation] public partial class ClusterCodeVersionsResult diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ClusterUpdateParameters.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ClusterUpdateParameters.cs index 8993afe029ac..b7a96dbbab95 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ClusterUpdateParameters.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ClusterUpdateParameters.cs @@ -55,6 +55,8 @@ public ClusterUpdateParameters() /// Service Fabric versions for new clusters use [ClusterVersion /// API](./ClusterVersion.md). To get the list of available version for /// existing clusters use **availableClusterVersions**. + /// Indicates if the event store + /// service is enabled. /// The list of custom fabric settings to /// configure the cluster. This will overwrite the existing /// list. @@ -91,7 +93,7 @@ public ClusterUpdateParameters() /// resource. /// . Possible values include: 'Automatic', 'Manual' /// Cluster update parameters - public ClusterUpdateParameters(IList addOnFeatures = default(IList), CertificateDescription certificate = default(CertificateDescription), ServerCertificateCommonNames certificateCommonNames = default(ServerCertificateCommonNames), IList clientCertificateCommonNames = default(IList), IList clientCertificateThumbprints = default(IList), string clusterCodeVersion = default(string), IList fabricSettings = default(IList), IList nodeTypes = default(IList), string reliabilityLevel = default(string), CertificateDescription reverseProxyCertificate = default(CertificateDescription), ClusterUpgradePolicy upgradeDescription = default(ClusterUpgradePolicy), string upgradeMode = default(string), IDictionary tags = default(IDictionary)) + public ClusterUpdateParameters(IList addOnFeatures = default(IList), CertificateDescription certificate = default(CertificateDescription), ServerCertificateCommonNames certificateCommonNames = default(ServerCertificateCommonNames), IList clientCertificateCommonNames = default(IList), IList clientCertificateThumbprints = default(IList), string clusterCodeVersion = default(string), bool? eventStoreServiceEnabled = default(bool?), IList fabricSettings = default(IList), IList nodeTypes = default(IList), string reliabilityLevel = default(string), CertificateDescription reverseProxyCertificate = default(CertificateDescription), ClusterUpgradePolicy upgradeDescription = default(ClusterUpgradePolicy), string upgradeMode = default(string), IDictionary tags = default(IDictionary)) { AddOnFeatures = addOnFeatures; Certificate = certificate; @@ -99,6 +101,7 @@ public ClusterUpdateParameters() ClientCertificateCommonNames = clientCertificateCommonNames; ClientCertificateThumbprints = clientCertificateThumbprints; ClusterCodeVersion = clusterCodeVersion; + EventStoreServiceEnabled = eventStoreServiceEnabled; FabricSettings = fabricSettings; NodeTypes = nodeTypes; ReliabilityLevel = reliabilityLevel; @@ -163,6 +166,12 @@ public ClusterUpdateParameters() [JsonProperty(PropertyName = "properties.clusterCodeVersion")] public string ClusterCodeVersion { get; set; } + /// + /// Gets or sets indicates if the event store service is enabled. + /// + [JsonProperty(PropertyName = "properties.eventStoreServiceEnabled")] + public bool? EventStoreServiceEnabled { get; set; } + /// /// Gets or sets the list of custom fabric settings to configure the /// cluster. This will overwrite the existing list. diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ProxyResource.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ProxyResource.cs index 11353329698a..354080d4a64b 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ProxyResource.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ProxyResource.cs @@ -13,6 +13,8 @@ namespace Microsoft.Azure.Management.ServiceFabric.Models using Microsoft.Rest; using Microsoft.Rest.Azure; using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; using System.Linq; /// @@ -35,12 +37,16 @@ public ProxyResource() /// Azure resource name. /// Azure resource type. /// Azure resource location. - public ProxyResource(string id = default(string), string name = default(string), string type = default(string), string location = default(string)) + /// Azure resource tags. + /// Azure resource etag. + public ProxyResource(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary tags = default(IDictionary), string etag = default(string)) { Id = id; Name = name; Type = type; Location = location; + Tags = tags; + Etag = etag; CustomInit(); } @@ -73,5 +79,17 @@ public ProxyResource() [JsonProperty(PropertyName = "location")] public string Location { get; set; } + /// + /// Gets or sets azure resource tags. + /// + [JsonProperty(PropertyName = "tags")] + public IDictionary Tags { get; set; } + + /// + /// Gets azure resource etag. + /// + [JsonProperty(PropertyName = "etag")] + public string Etag { get; private set; } + } } diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/Resource.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/Resource.cs index 46a6c6fb9850..b23fdc9f8072 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/Resource.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/Resource.cs @@ -38,13 +38,15 @@ public Resource() /// Azure resource name. /// Azure resource type. /// Azure resource tags. - public Resource(string location, string id = default(string), string name = default(string), string type = default(string), IDictionary tags = default(IDictionary)) + /// Azure resource etag. + public Resource(string location, string id = default(string), string name = default(string), string type = default(string), IDictionary tags = default(IDictionary), string etag = default(string)) { Id = id; Name = name; Type = type; Location = location; Tags = tags; + Etag = etag; CustomInit(); } @@ -83,6 +85,12 @@ public Resource() [JsonProperty(PropertyName = "tags")] public IDictionary Tags { get; set; } + /// + /// Gets azure resource etag. + /// + [JsonProperty(PropertyName = "etag")] + public string Etag { get; private set; } + /// /// Validate the object. /// diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ServiceCorrelationDescription.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ServiceCorrelationDescription.cs index 1a8ffbbc3d5d..10451d04793f 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ServiceCorrelationDescription.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ServiceCorrelationDescription.cs @@ -56,14 +56,14 @@ public ServiceCorrelationDescription(string scheme, string serviceName) /// ServiceName. Possible values include: 'Invalid', 'Affinity', /// 'AlignedAffinity', 'NonAlignedAffinity' /// - [JsonProperty(PropertyName = "Scheme")] + [JsonProperty(PropertyName = "scheme")] public string Scheme { get; set; } /// /// Gets or sets the name of the service that the correlation /// relationship is established with. /// - [JsonProperty(PropertyName = "ServiceName")] + [JsonProperty(PropertyName = "serviceName")] public string ServiceName { get; set; } /// diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ServiceLoadMetricDescription.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ServiceLoadMetricDescription.cs index 23628dcdd8b2..fb35455bd996 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ServiceLoadMetricDescription.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ServiceLoadMetricDescription.cs @@ -69,7 +69,7 @@ public ServiceLoadMetricDescription() /// name that is specified in Name exactly. Note that metric names are /// case sensitive. /// - [JsonProperty(PropertyName = "Name")] + [JsonProperty(PropertyName = "name")] public string Name { get; set; } /// @@ -77,7 +77,7 @@ public ServiceLoadMetricDescription() /// other metrics configured for this service, as a number. Possible /// values include: 'Zero', 'Low', 'Medium', 'High' /// - [JsonProperty(PropertyName = "Weight")] + [JsonProperty(PropertyName = "weight")] public string Weight { get; set; } /// @@ -85,7 +85,7 @@ public ServiceLoadMetricDescription() /// load, as a number, that this service creates for this metric when /// it is a Primary replica. /// - [JsonProperty(PropertyName = "PrimaryDefaultLoad")] + [JsonProperty(PropertyName = "primaryDefaultLoad")] public int? PrimaryDefaultLoad { get; set; } /// @@ -93,14 +93,14 @@ public ServiceLoadMetricDescription() /// load, as a number, that this service creates for this metric when /// it is a Secondary replica. /// - [JsonProperty(PropertyName = "SecondaryDefaultLoad")] + [JsonProperty(PropertyName = "secondaryDefaultLoad")] public int? SecondaryDefaultLoad { get; set; } /// /// Gets or sets used only for Stateless services. The default amount /// of load, as a number, that this service creates for this metric. /// - [JsonProperty(PropertyName = "DefaultLoad")] + [JsonProperty(PropertyName = "defaultLoad")] public int? DefaultLoad { get; set; } /// diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ServiceResource.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ServiceResource.cs index e94caecc7ebd..b3d1119e8ec5 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ServiceResource.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ServiceResource.cs @@ -38,6 +38,8 @@ public ServiceResource() /// Azure resource name. /// Azure resource type. /// Azure resource location. + /// Azure resource tags. + /// Azure resource etag. /// The placement constraints as a /// string. Placement constraints are boolean expressions on node /// properties and allow for restricting a service to particular nodes @@ -58,8 +60,11 @@ public ServiceResource() /// The name of the service type /// Describes how the service is /// partitioned. - public ServiceResource(string id = default(string), string name = default(string), string type = default(string), string location = default(string), string placementConstraints = default(string), IList correlationScheme = default(IList), IList serviceLoadMetrics = default(IList), IList servicePlacementPolicies = default(IList), string defaultMoveCost = default(string), string provisioningState = default(string), string serviceTypeName = default(string), PartitionSchemeDescription partitionDescription = default(PartitionSchemeDescription)) - : base(id, name, type, location) + /// The activation Mode of + /// the service package. Possible values include: 'SharedProcess', + /// 'ExclusiveProcess' + public ServiceResource(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary tags = default(IDictionary), string etag = default(string), string placementConstraints = default(string), IList correlationScheme = default(IList), IList serviceLoadMetrics = default(IList), IList servicePlacementPolicies = default(IList), string defaultMoveCost = default(string), string provisioningState = default(string), string serviceTypeName = default(string), PartitionSchemeDescription partitionDescription = default(PartitionSchemeDescription), string servicePackageActivationMode = default(string)) + : base(id, name, type, location, tags, etag) { PlacementConstraints = placementConstraints; CorrelationScheme = correlationScheme; @@ -69,6 +74,7 @@ public ServiceResource() ProvisioningState = provisioningState; ServiceTypeName = serviceTypeName; PartitionDescription = partitionDescription; + ServicePackageActivationMode = servicePackageActivationMode; CustomInit(); } @@ -134,5 +140,12 @@ public ServiceResource() [JsonProperty(PropertyName = "properties.partitionDescription")] public PartitionSchemeDescription PartitionDescription { get; set; } + /// + /// Gets or sets the activation Mode of the service package. Possible + /// values include: 'SharedProcess', 'ExclusiveProcess' + /// + [JsonProperty(PropertyName = "properties.servicePackageActivationMode")] + public string ServicePackageActivationMode { get; set; } + } } diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ServiceResourceList.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ServiceResourceList.cs index 0d8bb915fa2f..08534c5ece52 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ServiceResourceList.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ServiceResourceList.cs @@ -31,9 +31,12 @@ public ServiceResourceList() /// /// Initializes a new instance of the ServiceResourceList class. /// - public ServiceResourceList(IList value = default(IList)) + /// URL to get the next set of service list + /// results if there are any. + public ServiceResourceList(IList value = default(IList), string nextLink = default(string)) { Value = value; + NextLink = nextLink; CustomInit(); } @@ -47,5 +50,12 @@ public ServiceResourceList() [JsonProperty(PropertyName = "value")] public IList Value { get; set; } + /// + /// Gets URL to get the next set of service list results if there are + /// any. + /// + [JsonProperty(PropertyName = "nextLink")] + public string NextLink { get; private set; } + } } diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ServiceResourceProperties.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ServiceResourceProperties.cs index a6ac8016cdde..e4ac4c863728 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ServiceResourceProperties.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ServiceResourceProperties.cs @@ -51,12 +51,16 @@ public ServiceResourceProperties() /// The name of the service type /// Describes how the service is /// partitioned. - public ServiceResourceProperties(string placementConstraints = default(string), IList correlationScheme = default(IList), IList serviceLoadMetrics = default(IList), IList servicePlacementPolicies = default(IList), string defaultMoveCost = default(string), string provisioningState = default(string), string serviceTypeName = default(string), PartitionSchemeDescription partitionDescription = default(PartitionSchemeDescription)) + /// The activation Mode of + /// the service package. Possible values include: 'SharedProcess', + /// 'ExclusiveProcess' + public ServiceResourceProperties(string placementConstraints = default(string), IList correlationScheme = default(IList), IList serviceLoadMetrics = default(IList), IList servicePlacementPolicies = default(IList), string defaultMoveCost = default(string), string provisioningState = default(string), string serviceTypeName = default(string), PartitionSchemeDescription partitionDescription = default(PartitionSchemeDescription), string servicePackageActivationMode = default(string)) : base(placementConstraints, correlationScheme, serviceLoadMetrics, servicePlacementPolicies, defaultMoveCost) { ProvisioningState = provisioningState; ServiceTypeName = serviceTypeName; PartitionDescription = partitionDescription; + ServicePackageActivationMode = servicePackageActivationMode; CustomInit(); } @@ -84,5 +88,12 @@ public ServiceResourceProperties() [JsonProperty(PropertyName = "partitionDescription")] public PartitionSchemeDescription PartitionDescription { get; set; } + /// + /// Gets or sets the activation Mode of the service package. Possible + /// values include: 'SharedProcess', 'ExclusiveProcess' + /// + [JsonProperty(PropertyName = "servicePackageActivationMode")] + public string ServicePackageActivationMode { get; set; } + } } diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ServiceResourceUpdate.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ServiceResourceUpdate.cs index 63f5e2d6a24c..6680e5b40f73 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ServiceResourceUpdate.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/ServiceResourceUpdate.cs @@ -38,6 +38,8 @@ public ServiceResourceUpdate() /// Azure resource name. /// Azure resource type. /// Azure resource location. + /// Azure resource tags. + /// Azure resource etag. /// The placement constraints as a /// string. Placement constraints are boolean expressions on node /// properties and allow for restricting a service to particular nodes @@ -53,8 +55,8 @@ public ServiceResourceUpdate() /// Specifies the move cost for the /// service. Possible values include: 'Zero', 'Low', 'Medium', /// 'High' - public ServiceResourceUpdate(string id = default(string), string name = default(string), string type = default(string), string location = default(string), string placementConstraints = default(string), IList correlationScheme = default(IList), IList serviceLoadMetrics = default(IList), IList servicePlacementPolicies = default(IList), string defaultMoveCost = default(string)) - : base(id, name, type, location) + public ServiceResourceUpdate(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary tags = default(IDictionary), string etag = default(string), string placementConstraints = default(string), IList correlationScheme = default(IList), IList serviceLoadMetrics = default(IList), IList servicePlacementPolicies = default(IList), string defaultMoveCost = default(string)) + : base(id, name, type, location, tags, etag) { PlacementConstraints = placementConstraints; CorrelationScheme = correlationScheme; diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/StatefulServiceProperties.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/StatefulServiceProperties.cs index a074f6efa34e..bf7d89094452 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/StatefulServiceProperties.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/StatefulServiceProperties.cs @@ -53,6 +53,9 @@ public StatefulServiceProperties() /// The name of the service type /// Describes how the service is /// partitioned. + /// The activation Mode of + /// the service package. Possible values include: 'SharedProcess', + /// 'ExclusiveProcess' /// A flag indicating whether this is a /// persistent service which stores states on the local disk. If it is /// then the value of this property is true, if not it is @@ -70,8 +73,8 @@ public StatefulServiceProperties() /// The definition on how long /// StandBy replicas should be maintained before being removed, /// represented in ISO 8601 format (hh:mm:ss.s). - public StatefulServiceProperties(string placementConstraints = default(string), IList correlationScheme = default(IList), IList serviceLoadMetrics = default(IList), IList servicePlacementPolicies = default(IList), string defaultMoveCost = default(string), string provisioningState = default(string), string serviceTypeName = default(string), PartitionSchemeDescription partitionDescription = default(PartitionSchemeDescription), bool? hasPersistedState = default(bool?), int? targetReplicaSetSize = default(int?), int? minReplicaSetSize = default(int?), System.DateTime? replicaRestartWaitDuration = default(System.DateTime?), System.DateTime? quorumLossWaitDuration = default(System.DateTime?), System.DateTime? standByReplicaKeepDuration = default(System.DateTime?)) - : base(placementConstraints, correlationScheme, serviceLoadMetrics, servicePlacementPolicies, defaultMoveCost, provisioningState, serviceTypeName, partitionDescription) + public StatefulServiceProperties(string placementConstraints = default(string), IList correlationScheme = default(IList), IList serviceLoadMetrics = default(IList), IList servicePlacementPolicies = default(IList), string defaultMoveCost = default(string), string provisioningState = default(string), string serviceTypeName = default(string), PartitionSchemeDescription partitionDescription = default(PartitionSchemeDescription), string servicePackageActivationMode = default(string), bool? hasPersistedState = default(bool?), int? targetReplicaSetSize = default(int?), int? minReplicaSetSize = default(int?), System.DateTime? replicaRestartWaitDuration = default(System.DateTime?), System.DateTime? quorumLossWaitDuration = default(System.DateTime?), System.DateTime? standByReplicaKeepDuration = default(System.DateTime?)) + : base(placementConstraints, correlationScheme, serviceLoadMetrics, servicePlacementPolicies, defaultMoveCost, provisioningState, serviceTypeName, partitionDescription, servicePackageActivationMode) { HasPersistedState = hasPersistedState; TargetReplicaSetSize = targetReplicaSetSize; diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/StatelessServiceProperties.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/StatelessServiceProperties.cs index 0e58d16e8654..d082e34a3fa1 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/StatelessServiceProperties.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Models/StatelessServiceProperties.cs @@ -53,9 +53,12 @@ public StatelessServiceProperties() /// The name of the service type /// Describes how the service is /// partitioned. + /// The activation Mode of + /// the service package. Possible values include: 'SharedProcess', + /// 'ExclusiveProcess' /// The instance count. - public StatelessServiceProperties(string placementConstraints = default(string), IList correlationScheme = default(IList), IList serviceLoadMetrics = default(IList), IList servicePlacementPolicies = default(IList), string defaultMoveCost = default(string), string provisioningState = default(string), string serviceTypeName = default(string), PartitionSchemeDescription partitionDescription = default(PartitionSchemeDescription), int? instanceCount = default(int?)) - : base(placementConstraints, correlationScheme, serviceLoadMetrics, servicePlacementPolicies, defaultMoveCost, provisioningState, serviceTypeName, partitionDescription) + public StatelessServiceProperties(string placementConstraints = default(string), IList correlationScheme = default(IList), IList serviceLoadMetrics = default(IList), IList servicePlacementPolicies = default(IList), string defaultMoveCost = default(string), string provisioningState = default(string), string serviceTypeName = default(string), PartitionSchemeDescription partitionDescription = default(PartitionSchemeDescription), string servicePackageActivationMode = default(string), int? instanceCount = default(int?)) + : base(placementConstraints, correlationScheme, serviceLoadMetrics, servicePlacementPolicies, defaultMoveCost, provisioningState, serviceTypeName, partitionDescription, servicePackageActivationMode) { InstanceCount = instanceCount; CustomInit(); diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Operations.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Operations.cs index 22347025632c..ca80a7ba7686 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Operations.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/Operations.cs @@ -57,7 +57,7 @@ internal Operations(ServiceFabricManagementClient client) /// Get the list of available Service Fabric resource provider API operations. /// /// - /// The version of the Service Fabric resouce provider API + /// The version of the Service Fabric resource provider API /// /// /// Headers that will be added to request. diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/OperationsExtensions.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/OperationsExtensions.cs index a4b90084e879..94809212a629 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/OperationsExtensions.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/OperationsExtensions.cs @@ -31,7 +31,7 @@ public static partial class OperationsExtensions /// The operations group for this extension method. /// /// - /// The version of the Service Fabric resouce provider API + /// The version of the Service Fabric resource provider API /// public static IPage List(this IOperations operations, string apiVersion) { @@ -48,7 +48,7 @@ public static IPage List(this IOperations operations, string ap /// The operations group for this extension method. /// /// - /// The version of the Service Fabric resouce provider API + /// The version of the Service Fabric resource provider API /// /// /// The cancellation token. diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/SdkInfo_ServiceFabricManagementClient.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/SdkInfo_ServiceFabricManagementClient.cs index c8b40f6f26b2..315953f46a5a 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/SdkInfo_ServiceFabricManagementClient.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/SdkInfo_ServiceFabricManagementClient.cs @@ -19,14 +19,13 @@ public static IEnumerable> ApiInfo_ServiceFabricMa { return new Tuple[] { - new Tuple("ServiceFabric", "ApplicationTypeVersions", "2017-07-01-preview"), - new Tuple("ServiceFabric", "ApplicationTypes", "2017-07-01-preview"), - new Tuple("ServiceFabric", "Applications", "2017-07-01-preview"), - new Tuple("ServiceFabric", "ClusterVersions", "2018-02-01"), - new Tuple("ServiceFabric", "Clusters", "2018-02-01"), - new Tuple("ServiceFabric", "Operations", "2017-07-01-preview"), - new Tuple("ServiceFabric", "Operations", "2018-02-01"), - new Tuple("ServiceFabric", "Services", "2017-07-01-preview"), + new Tuple("ServiceFabric", "ApplicationTypeVersions", "2019-03-01-preview"), + new Tuple("ServiceFabric", "ApplicationTypes", "2019-03-01-preview"), + new Tuple("ServiceFabric", "Applications", "2019-03-01-preview"), + new Tuple("ServiceFabric", "ClusterVersions", "2019-03-01-preview"), + new Tuple("ServiceFabric", "Clusters", "2019-03-01-preview"), + new Tuple("ServiceFabric", "Operations", "2019-03-01-preview"), + new Tuple("ServiceFabric", "Services", "2019-03-01-preview"), }.AsEnumerable(); } } diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ServiceFabricManagementClient.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ServiceFabricManagementClient.cs index d08202544ef6..72b4214f5ac1 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ServiceFabricManagementClient.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ServiceFabricManagementClient.cs @@ -46,25 +46,33 @@ public partial class ServiceFabricManagementClient : ServiceClient public ServiceClientCredentials Credentials { get; private set; } + /// + /// The version of the Service Fabric resource provider API. This is a required + /// parameter and it's value must be "2019-03-01-preview" for this + /// specification. + /// + public string ApiVersion { get; private set; } + /// /// The customer subscription identifier. /// public string SubscriptionId { get; set; } /// - /// Gets or sets the preferred language for the response. + /// The preferred language for the response. /// public string AcceptLanguage { get; set; } /// - /// Gets or sets the retry timeout in seconds for Long Running Operations. - /// Default value is 30. + /// The retry timeout in seconds for Long Running Operations. Default value is + /// 30. /// public int? LongRunningOperationRetryTimeout { get; set; } /// - /// When set to true a unique x-ms-client-request-id value is generated and - /// included in each request. Default is true. + /// Whether a unique x-ms-client-request-id should be generated. When set to + /// true a unique x-ms-client-request-id value is generated and included in + /// each request. Default is true. /// public bool? GenerateClientRequestId { get; set; } @@ -103,6 +111,19 @@ public partial class ServiceFabricManagementClient : ServiceClient public virtual IServicesOperations Services { get; private set; } + /// + /// Initializes a new instance of the ServiceFabricManagementClient class. + /// + /// + /// HttpClient to be used + /// + /// + /// True: will dispose the provided httpClient on calling ServiceFabricManagementClient.Dispose(). False: will not dispose provided httpClient + protected ServiceFabricManagementClient(HttpClient httpClient, bool disposeHttpClient) : base(httpClient, disposeHttpClient) + { + Initialize(); + } + /// /// Initializes a new instance of the ServiceFabricManagementClient class. /// @@ -198,6 +219,33 @@ public ServiceFabricManagementClient(ServiceClientCredentials credentials, param } } + /// + /// Initializes a new instance of the ServiceFabricManagementClient class. + /// + /// + /// Required. Credentials needed for the client to connect to Azure. + /// + /// + /// HttpClient to be used + /// + /// + /// True: will dispose the provided httpClient on calling ServiceFabricManagementClient.Dispose(). False: will not dispose provided httpClient + /// + /// Thrown when a required parameter is null + /// + public ServiceFabricManagementClient(ServiceClientCredentials credentials, HttpClient httpClient, bool disposeHttpClient) : this(httpClient, disposeHttpClient) + { + if (credentials == null) + { + throw new System.ArgumentNullException("credentials"); + } + Credentials = credentials; + if (Credentials != null) + { + Credentials.InitializeServiceClient(this); + } + } + /// /// Initializes a new instance of the ServiceFabricManagementClient class. /// @@ -312,6 +360,7 @@ private void Initialize() Applications = new ApplicationsOperations(this); Services = new ServicesOperations(this); BaseUri = new System.Uri("https://management.azure.com"); + ApiVersion = "2019-03-01-preview"; AcceptLanguage = "en-US"; LongRunningOperationRetryTimeout = 30; GenerateClientRequestId = true; @@ -341,10 +390,10 @@ private void Initialize() new Iso8601TimeSpanConverter() } }; + SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter("partitionScheme")); + DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter("partitionScheme")); SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter("Type")); DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter("Type")); - SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter("PartitionScheme")); - DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter("PartitionScheme")); SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter("serviceKind")); DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter("serviceKind")); SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter("serviceKind")); diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ServicesOperations.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ServicesOperations.cs index 32f4b01cd313..5204b5ee269c 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ServicesOperations.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ServicesOperations.cs @@ -113,7 +113,6 @@ internal ServicesOperations(ServiceFabricManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "serviceName"); } - string apiVersion = "2017-07-01-preview"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -125,7 +124,6 @@ internal ServicesOperations(ServiceFabricManagementClient client) tracingParameters.Add("clusterName", clusterName); tracingParameters.Add("applicationName", applicationName); tracingParameters.Add("serviceName", serviceName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters); } @@ -138,9 +136,9 @@ internal ServicesOperations(ServiceFabricManagementClient client) _url = _url.Replace("{applicationName}", System.Uri.EscapeDataString(applicationName)); _url = _url.Replace("{serviceName}", System.Uri.EscapeDataString(serviceName)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -325,10 +323,10 @@ internal ServicesOperations(ServiceFabricManagementClient client) /// /// The cancellation token. /// - public async Task> UpdateWithHttpMessagesAsync(string resourceGroupName, string clusterName, string applicationName, string serviceName, ServiceResourceUpdate parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> UpdateWithHttpMessagesAsync(string resourceGroupName, string clusterName, string applicationName, string serviceName, ServiceResourceUpdate parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { // Send Request - AzureOperationResponse _response = await BeginUpdateWithHttpMessagesAsync(resourceGroupName, clusterName, applicationName, serviceName, parameters, customHeaders, cancellationToken).ConfigureAwait(false); + AzureOperationResponse _response = await BeginUpdateWithHttpMessagesAsync(resourceGroupName, clusterName, applicationName, serviceName, parameters, customHeaders, cancellationToken).ConfigureAwait(false); return await Client.GetPutOrPatchOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false); } @@ -420,7 +418,6 @@ internal ServicesOperations(ServiceFabricManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "applicationName"); } - string apiVersion = "2017-07-01-preview"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -431,7 +428,6 @@ internal ServicesOperations(ServiceFabricManagementClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("clusterName", clusterName); tracingParameters.Add("applicationName", applicationName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters); } @@ -443,9 +439,9 @@ internal ServicesOperations(ServiceFabricManagementClient client) _url = _url.Replace("{clusterName}", System.Uri.EscapeDataString(clusterName)); _url = _url.Replace("{applicationName}", System.Uri.EscapeDataString(applicationName)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -636,7 +632,6 @@ internal ServicesOperations(ServiceFabricManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "parameters"); } - string apiVersion = "2017-07-01-preview"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -648,7 +643,6 @@ internal ServicesOperations(ServiceFabricManagementClient client) tracingParameters.Add("clusterName", clusterName); tracingParameters.Add("applicationName", applicationName); tracingParameters.Add("serviceName", serviceName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("parameters", parameters); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "BeginCreate", tracingParameters); @@ -662,9 +656,9 @@ internal ServicesOperations(ServiceFabricManagementClient client) _url = _url.Replace("{applicationName}", System.Uri.EscapeDataString(applicationName)); _url = _url.Replace("{serviceName}", System.Uri.EscapeDataString(serviceName)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -835,7 +829,7 @@ internal ServicesOperations(ServiceFabricManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task> BeginUpdateWithHttpMessagesAsync(string resourceGroupName, string clusterName, string applicationName, string serviceName, ServiceResourceUpdate parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> BeginUpdateWithHttpMessagesAsync(string resourceGroupName, string clusterName, string applicationName, string serviceName, ServiceResourceUpdate parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (Client.SubscriptionId == null) { @@ -861,7 +855,6 @@ internal ServicesOperations(ServiceFabricManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "parameters"); } - string apiVersion = "2017-07-01-preview"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -873,7 +866,6 @@ internal ServicesOperations(ServiceFabricManagementClient client) tracingParameters.Add("clusterName", clusterName); tracingParameters.Add("applicationName", applicationName); tracingParameters.Add("serviceName", serviceName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("parameters", parameters); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "BeginUpdate", tracingParameters); @@ -887,9 +879,9 @@ internal ServicesOperations(ServiceFabricManagementClient client) _url = _url.Replace("{applicationName}", System.Uri.EscapeDataString(applicationName)); _url = _url.Replace("{serviceName}", System.Uri.EscapeDataString(serviceName)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -985,7 +977,7 @@ internal ServicesOperations(ServiceFabricManagementClient client) throw ex; } // Create Result - var _result = new AzureOperationResponse(); + var _result = new AzureOperationResponse(); _result.Request = _httpRequest; _result.Response = _httpResponse; if (_httpResponse.Headers.Contains("x-ms-request-id")) @@ -998,7 +990,7 @@ internal ServicesOperations(ServiceFabricManagementClient client) _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); try { - _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); } catch (JsonException ex) { @@ -1076,7 +1068,6 @@ internal ServicesOperations(ServiceFabricManagementClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "serviceName"); } - string apiVersion = "2017-07-01-preview"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -1088,7 +1079,6 @@ internal ServicesOperations(ServiceFabricManagementClient client) tracingParameters.Add("clusterName", clusterName); tracingParameters.Add("applicationName", applicationName); tracingParameters.Add("serviceName", serviceName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "BeginDelete", tracingParameters); } @@ -1101,9 +1091,9 @@ internal ServicesOperations(ServiceFabricManagementClient client) _url = _url.Replace("{applicationName}", System.Uri.EscapeDataString(applicationName)); _url = _url.Replace("{serviceName}", System.Uri.EscapeDataString(serviceName)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { diff --git a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ServicesOperationsExtensions.cs b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ServicesOperationsExtensions.cs index 9f12105a5441..a0f4d0f71197 100644 --- a/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ServicesOperationsExtensions.cs +++ b/src/SDKs/ServiceFabric/Management.ServiceFabric/Generated/ServicesOperationsExtensions.cs @@ -174,7 +174,7 @@ public static ServiceResource Create(this IServicesOperations operations, string /// /// The service resource for patch operations. /// - public static ServiceResourceUpdate Update(this IServicesOperations operations, string resourceGroupName, string clusterName, string applicationName, string serviceName, ServiceResourceUpdate parameters) + public static ServiceResource Update(this IServicesOperations operations, string resourceGroupName, string clusterName, string applicationName, string serviceName, ServiceResourceUpdate parameters) { return operations.UpdateAsync(resourceGroupName, clusterName, applicationName, serviceName, parameters).GetAwaiter().GetResult(); } @@ -207,7 +207,7 @@ public static ServiceResourceUpdate Update(this IServicesOperations operations, /// /// The cancellation token. /// - public static async Task UpdateAsync(this IServicesOperations operations, string resourceGroupName, string clusterName, string applicationName, string serviceName, ServiceResourceUpdate parameters, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task UpdateAsync(this IServicesOperations operations, string resourceGroupName, string clusterName, string applicationName, string serviceName, ServiceResourceUpdate parameters, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.UpdateWithHttpMessagesAsync(resourceGroupName, clusterName, applicationName, serviceName, parameters, null, cancellationToken).ConfigureAwait(false)) { @@ -419,7 +419,7 @@ public static ServiceResource BeginCreate(this IServicesOperations operations, s /// /// The service resource for patch operations. /// - public static ServiceResourceUpdate BeginUpdate(this IServicesOperations operations, string resourceGroupName, string clusterName, string applicationName, string serviceName, ServiceResourceUpdate parameters) + public static ServiceResource BeginUpdate(this IServicesOperations operations, string resourceGroupName, string clusterName, string applicationName, string serviceName, ServiceResourceUpdate parameters) { return operations.BeginUpdateAsync(resourceGroupName, clusterName, applicationName, serviceName, parameters).GetAwaiter().GetResult(); } @@ -452,7 +452,7 @@ public static ServiceResourceUpdate BeginUpdate(this IServicesOperations operati /// /// The cancellation token. /// - public static async Task BeginUpdateAsync(this IServicesOperations operations, string resourceGroupName, string clusterName, string applicationName, string serviceName, ServiceResourceUpdate parameters, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task BeginUpdateAsync(this IServicesOperations operations, string resourceGroupName, string clusterName, string applicationName, string serviceName, ServiceResourceUpdate parameters, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.BeginUpdateWithHttpMessagesAsync(resourceGroupName, clusterName, applicationName, serviceName, parameters, null, cancellationToken).ConfigureAwait(false)) {