From ff48f1da36bc6e20487d8b9337d3fec6ca40d154 Mon Sep 17 00:00:00 2001 From: adxsdknet Date: Thu, 2 May 2019 17:51:08 +0000 Subject: [PATCH] .NET SDK Resource Provider:'ContainerService' REST Spec PR 'https://github.com/Azure/azure-rest-api-specs/pull/5841' REST Spec PR Author 'JunSun17' REST Spec PR Last commit --- src/SDKs/ContainerService/AzSdk.RP.props | 2 +- .../Generated/ContainerServicesOperations.cs | 6 +++--- .../ContainerServicesOperationsExtensions.cs | 8 ++++---- .../Generated/IContainerServicesOperations.cs | 3 ++- .../Generated/Models/AgentPool.cs | 10 +--------- .../Models/ManagedClusterAgentPoolProfile.cs | 5 ++--- .../ManagedClusterAgentPoolProfileProperties.cs | 10 +--------- .../Generated/Models/OrchestratorProfile.cs | 17 +++++++++++------ .../Models/OrchestratorVersionProfile.cs | 17 +++++++++++------ .../Generated/SdkInfo_ContainerServiceClient.cs | 2 +- 10 files changed, 37 insertions(+), 43 deletions(-) diff --git a/src/SDKs/ContainerService/AzSdk.RP.props b/src/SDKs/ContainerService/AzSdk.RP.props index 0db367b67699a..f175eb5244b09 100644 --- a/src/SDKs/ContainerService/AzSdk.RP.props +++ b/src/SDKs/ContainerService/AzSdk.RP.props @@ -1,7 +1,7 @@ - ContainerService_2019-04-01;ContainerService_2017-07-01;ContainerService_2017-09-30;ContainerService_2019-04-30; + ContainerService_2019-04-01;ContainerService_2017-07-01;ContainerService_2019-04-30; $(PackageTags);$(CommonTags);$(AzureApiTag); \ No newline at end of file diff --git a/src/SDKs/ContainerService/Management.ContainerService/Generated/ContainerServicesOperations.cs b/src/SDKs/ContainerService/Management.ContainerService/Generated/ContainerServicesOperations.cs index 20d2f2a25ef38..b8ec9621329db 100644 --- a/src/SDKs/ContainerService/Management.ContainerService/Generated/ContainerServicesOperations.cs +++ b/src/SDKs/ContainerService/Management.ContainerService/Generated/ContainerServicesOperations.cs @@ -695,8 +695,8 @@ internal ContainerServicesOperations(ContainerServiceClient client) /// /// /// Gets a list of supported orchestrators in the specified subscription. The - /// operation returns properties of each orchestrator including version and - /// available upgrades. + /// operation returns properties of each orchestrator including version, + /// available upgrades and whether that version or upgrades are in preview. /// /// /// The name of a supported Azure region. @@ -735,7 +735,7 @@ internal ContainerServicesOperations(ContainerServiceClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "location"); } - string apiVersion = "2017-09-30"; + string apiVersion = "2019-04-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; diff --git a/src/SDKs/ContainerService/Management.ContainerService/Generated/ContainerServicesOperationsExtensions.cs b/src/SDKs/ContainerService/Management.ContainerService/Generated/ContainerServicesOperationsExtensions.cs index 1b6d81a52b144..bea8a4a2c4b8e 100644 --- a/src/SDKs/ContainerService/Management.ContainerService/Generated/ContainerServicesOperationsExtensions.cs +++ b/src/SDKs/ContainerService/Management.ContainerService/Generated/ContainerServicesOperationsExtensions.cs @@ -287,8 +287,8 @@ public static IPage ListByResourceGroup(this IContainerSe /// /// /// Gets a list of supported orchestrators in the specified subscription. The - /// operation returns properties of each orchestrator including version and - /// available upgrades. + /// operation returns properties of each orchestrator including version, + /// available upgrades and whether that version or upgrades are in preview. /// /// /// The operations group for this extension method. @@ -309,8 +309,8 @@ public static IPage ListByResourceGroup(this IContainerSe /// /// /// Gets a list of supported orchestrators in the specified subscription. The - /// operation returns properties of each orchestrator including version and - /// available upgrades. + /// operation returns properties of each orchestrator including version, + /// available upgrades and whether that version or upgrades are in preview. /// /// /// The operations group for this extension method. diff --git a/src/SDKs/ContainerService/Management.ContainerService/Generated/IContainerServicesOperations.cs b/src/SDKs/ContainerService/Management.ContainerService/Generated/IContainerServicesOperations.cs index da9a3854ccc7a..a081424bad6c6 100644 --- a/src/SDKs/ContainerService/Management.ContainerService/Generated/IContainerServicesOperations.cs +++ b/src/SDKs/ContainerService/Management.ContainerService/Generated/IContainerServicesOperations.cs @@ -185,7 +185,8 @@ public partial interface IContainerServicesOperations /// /// Gets a list of supported orchestrators in the specified /// subscription. The operation returns properties of each orchestrator - /// including version and available upgrades. + /// including version, available upgrades and whether that version or + /// upgrades are in preview. /// /// /// The name of a supported Azure region. diff --git a/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/AgentPool.cs b/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/AgentPool.cs index fd91959540f67..62d800ddd453b 100644 --- a/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/AgentPool.cs +++ b/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/AgentPool.cs @@ -123,8 +123,7 @@ public AgentPool() /// provisioning state, which only appears in the response. /// (PREVIEW) Availability zones for /// nodes. Must use VirtualMachineScaleSets AgentPoolType. - /// Enable public IP for nodes - public AgentPool(int count, string vmSize, string id = default(string), string name = default(string), string type = default(string), int? osDiskSizeGB = default(int?), string vnetSubnetID = default(string), int? maxPods = default(int?), string osType = default(string), int? maxCount = default(int?), int? minCount = default(int?), bool? enableAutoScaling = default(bool?), string agentPoolType = default(string), string orchestratorVersion = default(string), string provisioningState = default(string), IList availabilityZones = default(IList), bool? enableNodePublicIP = default(bool?)) + public AgentPool(int count, string vmSize, string id = default(string), string name = default(string), string type = default(string), int? osDiskSizeGB = default(int?), string vnetSubnetID = default(string), int? maxPods = default(int?), string osType = default(string), int? maxCount = default(int?), int? minCount = default(int?), bool? enableAutoScaling = default(bool?), string agentPoolType = default(string), string orchestratorVersion = default(string), string provisioningState = default(string), IList availabilityZones = default(IList)) : base(id, name, type) { Count = count; @@ -140,7 +139,6 @@ public AgentPool() OrchestratorVersion = orchestratorVersion; ProvisioningState = provisioningState; AvailabilityZones = availabilityZones; - EnableNodePublicIP = enableNodePublicIP; CustomInit(); } @@ -293,12 +291,6 @@ public AgentPool() [JsonProperty(PropertyName = "properties.availabilityZones")] public IList AvailabilityZones { get; set; } - /// - /// Gets or sets enable public IP for nodes - /// - [JsonProperty(PropertyName = "properties.enableNodePublicIP")] - public bool? EnableNodePublicIP { get; set; } - /// /// Validate the object. /// diff --git a/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/ManagedClusterAgentPoolProfile.cs b/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/ManagedClusterAgentPoolProfile.cs index 8a92b8e339e33..357545428fe3b 100644 --- a/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/ManagedClusterAgentPoolProfile.cs +++ b/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/ManagedClusterAgentPoolProfile.cs @@ -120,9 +120,8 @@ public ManagedClusterAgentPoolProfile() /// provisioning state, which only appears in the response. /// (PREVIEW) Availability zones for /// nodes. Must use VirtualMachineScaleSets AgentPoolType. - /// Enable public IP for nodes - public ManagedClusterAgentPoolProfile(int count, string vmSize, string name, int? osDiskSizeGB = default(int?), string vnetSubnetID = default(string), int? maxPods = default(int?), string osType = default(string), int? maxCount = default(int?), int? minCount = default(int?), bool? enableAutoScaling = default(bool?), string type = default(string), string orchestratorVersion = default(string), string provisioningState = default(string), IList availabilityZones = default(IList), bool? enableNodePublicIP = default(bool?)) - : base(count, vmSize, osDiskSizeGB, vnetSubnetID, maxPods, osType, maxCount, minCount, enableAutoScaling, type, orchestratorVersion, provisioningState, availabilityZones, enableNodePublicIP) + public ManagedClusterAgentPoolProfile(int count, string vmSize, string name, int? osDiskSizeGB = default(int?), string vnetSubnetID = default(string), int? maxPods = default(int?), string osType = default(string), int? maxCount = default(int?), int? minCount = default(int?), bool? enableAutoScaling = default(bool?), string type = default(string), string orchestratorVersion = default(string), string provisioningState = default(string), IList availabilityZones = default(IList)) + : base(count, vmSize, osDiskSizeGB, vnetSubnetID, maxPods, osType, maxCount, minCount, enableAutoScaling, type, orchestratorVersion, provisioningState, availabilityZones) { Name = name; CustomInit(); diff --git a/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/ManagedClusterAgentPoolProfileProperties.cs b/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/ManagedClusterAgentPoolProfileProperties.cs index 65c47f9c145cb..6e86f0cc9df6c 100644 --- a/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/ManagedClusterAgentPoolProfileProperties.cs +++ b/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/ManagedClusterAgentPoolProfileProperties.cs @@ -118,8 +118,7 @@ public ManagedClusterAgentPoolProfileProperties() /// provisioning state, which only appears in the response. /// (PREVIEW) Availability zones for /// nodes. Must use VirtualMachineScaleSets AgentPoolType. - /// Enable public IP for nodes - public ManagedClusterAgentPoolProfileProperties(int count, string vmSize, int? osDiskSizeGB = default(int?), string vnetSubnetID = default(string), int? maxPods = default(int?), string osType = default(string), int? maxCount = default(int?), int? minCount = default(int?), bool? enableAutoScaling = default(bool?), string type = default(string), string orchestratorVersion = default(string), string provisioningState = default(string), IList availabilityZones = default(IList), bool? enableNodePublicIP = default(bool?)) + public ManagedClusterAgentPoolProfileProperties(int count, string vmSize, int? osDiskSizeGB = default(int?), string vnetSubnetID = default(string), int? maxPods = default(int?), string osType = default(string), int? maxCount = default(int?), int? minCount = default(int?), bool? enableAutoScaling = default(bool?), string type = default(string), string orchestratorVersion = default(string), string provisioningState = default(string), IList availabilityZones = default(IList)) { Count = count; VmSize = vmSize; @@ -134,7 +133,6 @@ public ManagedClusterAgentPoolProfileProperties() OrchestratorVersion = orchestratorVersion; ProvisioningState = provisioningState; AvailabilityZones = availabilityZones; - EnableNodePublicIP = enableNodePublicIP; CustomInit(); } @@ -287,12 +285,6 @@ public ManagedClusterAgentPoolProfileProperties() [JsonProperty(PropertyName = "availabilityZones")] public IList AvailabilityZones { get; set; } - /// - /// Gets or sets enable public IP for nodes - /// - [JsonProperty(PropertyName = "enableNodePublicIP")] - public bool? EnableNodePublicIP { get; set; } - /// /// Validate the object. /// diff --git a/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/OrchestratorProfile.cs b/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/OrchestratorProfile.cs index 94a79e6d0d76e..1628d4cda06ba 100644 --- a/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/OrchestratorProfile.cs +++ b/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/OrchestratorProfile.cs @@ -30,13 +30,16 @@ public OrchestratorProfile() /// /// Initializes a new instance of the OrchestratorProfile class. /// - /// Orchestrator type. /// Orchestrator version (major, /// minor, patch). - public OrchestratorProfile(string orchestratorType, string orchestratorVersion) + /// Orchestrator type. + /// Whether Kubernetes version is currently in + /// preview. + public OrchestratorProfile(string orchestratorVersion, string orchestratorType = default(string), bool? isPreview = default(bool?)) { OrchestratorType = orchestratorType; OrchestratorVersion = orchestratorVersion; + IsPreview = isPreview; CustomInit(); } @@ -57,6 +60,12 @@ public OrchestratorProfile(string orchestratorType, string orchestratorVersion) [JsonProperty(PropertyName = "orchestratorVersion")] public string OrchestratorVersion { get; set; } + /// + /// Gets or sets whether Kubernetes version is currently in preview. + /// + [JsonProperty(PropertyName = "isPreview")] + public bool? IsPreview { get; set; } + /// /// Validate the object. /// @@ -65,10 +74,6 @@ public OrchestratorProfile(string orchestratorType, string orchestratorVersion) /// public virtual void Validate() { - if (OrchestratorType == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "OrchestratorType"); - } if (OrchestratorVersion == null) { throw new ValidationException(ValidationRules.CannotBeNull, "OrchestratorVersion"); diff --git a/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/OrchestratorVersionProfile.cs b/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/OrchestratorVersionProfile.cs index 67f66aedb891a..9edf7e175de69 100644 --- a/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/OrchestratorVersionProfile.cs +++ b/src/SDKs/ContainerService/Management.ContainerService/Generated/Models/OrchestratorVersionProfile.cs @@ -37,13 +37,16 @@ public OrchestratorVersionProfile() /// minor, patch). /// Installed by default if version is /// not specified. + /// Whether Kubernetes version is currently in + /// preview. /// The list of available upgrade /// versions. - public OrchestratorVersionProfile(string orchestratorType, string orchestratorVersion, bool defaultProperty, IList upgrades) + public OrchestratorVersionProfile(string orchestratorType, string orchestratorVersion, bool? defaultProperty = default(bool?), bool? isPreview = default(bool?), IList upgrades = default(IList)) { OrchestratorType = orchestratorType; OrchestratorVersion = orchestratorVersion; DefaultProperty = defaultProperty; + IsPreview = isPreview; Upgrades = upgrades; CustomInit(); } @@ -69,7 +72,13 @@ public OrchestratorVersionProfile(string orchestratorType, string orchestratorVe /// Gets or sets installed by default if version is not specified. /// [JsonProperty(PropertyName = "default")] - public bool DefaultProperty { get; set; } + public bool? DefaultProperty { get; set; } + + /// + /// Gets or sets whether Kubernetes version is currently in preview. + /// + [JsonProperty(PropertyName = "isPreview")] + public bool? IsPreview { get; set; } /// /// Gets or sets the list of available upgrade versions. @@ -93,10 +102,6 @@ public virtual void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "OrchestratorVersion"); } - if (Upgrades == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "Upgrades"); - } if (Upgrades != null) { foreach (var element in Upgrades) diff --git a/src/SDKs/ContainerService/Management.ContainerService/Generated/SdkInfo_ContainerServiceClient.cs b/src/SDKs/ContainerService/Management.ContainerService/Generated/SdkInfo_ContainerServiceClient.cs index bfbe782137816..e35757d720208 100644 --- a/src/SDKs/ContainerService/Management.ContainerService/Generated/SdkInfo_ContainerServiceClient.cs +++ b/src/SDKs/ContainerService/Management.ContainerService/Generated/SdkInfo_ContainerServiceClient.cs @@ -21,7 +21,7 @@ public static IEnumerable> ApiInfo_ContainerServic { new Tuple("ContainerService", "AgentPools", "2019-04-01"), new Tuple("ContainerService", "ContainerServices", "2017-07-01"), - new Tuple("ContainerService", "ContainerServices", "2017-09-30"), + new Tuple("ContainerService", "ContainerServices", "2019-04-01"), new Tuple("ContainerService", "ManagedClusters", "2019-04-01"), new Tuple("ContainerService", "OpenShiftManagedClusters", "2019-04-30"), new Tuple("ContainerService", "Operations", "2019-04-01"),