diff --git a/eng/mgmt/mgmtmetadata/redis_resource-manager.txt b/eng/mgmt/mgmtmetadata/redis_resource-manager.txt
index 9dc113380c2e..1fe549c18fb7 100644
--- a/eng/mgmt/mgmtmetadata/redis_resource-manager.txt
+++ b/eng/mgmt/mgmtmetadata/redis_resource-manager.txt
@@ -1,14 +1,14 @@
-Installing AutoRest version: latest
+Installing AutoRest version: v2
AutoRest installed successfully.
Commencing code generation
Generating CSharp code
Executing AutoRest command
-cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/redis/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=D:\repos\azuresdknetfork\azure-sdk-for-net\sdk
-2019-11-23 01:25:48 UTC
+cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/redis/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --csharp-sdks-folder=E:\azure-sdk-for-net\sdk
+2020-06-11 05:53:09 UTC
Azure-rest-api-specs repository information
GitHub fork: Azure
Branch: master
-Commit: 381b06c1a2483f4de61bd211a337c8e45e342fc4
+Commit: edbb9cc14033a8ec1b8f97232589ea9d7524e7ac
AutoRest information
-Requested version: latest
-Bootstrapper version: autorest@2.0.4407
+Requested version: v2
+Bootstrapper version: autorest@2.0.4413
diff --git a/sdk/redis/Microsoft.Azure.Management.RedisCache/src/Generated/Models/RedisInstanceDetails.cs b/sdk/redis/Microsoft.Azure.Management.RedisCache/src/Generated/Models/RedisInstanceDetails.cs
index 955d1667177c..86ffa91a8a6f 100644
--- a/sdk/redis/Microsoft.Azure.Management.RedisCache/src/Generated/Models/RedisInstanceDetails.cs
+++ b/sdk/redis/Microsoft.Azure.Management.RedisCache/src/Generated/Models/RedisInstanceDetails.cs
@@ -36,12 +36,15 @@ public RedisInstanceDetails()
/// availability zone where this instance is located.
/// If clustering is enabled, the Shard ID of
/// Redis Instance
- public RedisInstanceDetails(int? sslPort = default(int?), int? nonSslPort = default(int?), string zone = default(string), int? shardId = default(int?))
+ /// Specifies whether the instance is a master
+ /// node.
+ public RedisInstanceDetails(int? sslPort = default(int?), int? nonSslPort = default(int?), string zone = default(string), int? shardId = default(int?), bool? isMaster = default(bool?))
{
SslPort = sslPort;
NonSslPort = nonSslPort;
Zone = zone;
ShardId = shardId;
+ IsMaster = isMaster;
CustomInit();
}
@@ -76,5 +79,11 @@ public RedisInstanceDetails()
[JsonProperty(PropertyName = "shardId")]
public int? ShardId { get; private set; }
+ ///
+ /// Gets specifies whether the instance is a master node.
+ ///
+ [JsonProperty(PropertyName = "isMaster")]
+ public bool? IsMaster { get; private set; }
+
}
}
diff --git a/sdk/redis/Microsoft.Azure.Management.RedisCache/src/Generated/Models/RedisRebootParameters.cs b/sdk/redis/Microsoft.Azure.Management.RedisCache/src/Generated/Models/RedisRebootParameters.cs
index c83f438aff12..07d4b8264757 100644
--- a/sdk/redis/Microsoft.Azure.Management.RedisCache/src/Generated/Models/RedisRebootParameters.cs
+++ b/sdk/redis/Microsoft.Azure.Management.RedisCache/src/Generated/Models/RedisRebootParameters.cs
@@ -12,6 +12,8 @@ namespace Microsoft.Azure.Management.Redis.Models
{
using Microsoft.Rest;
using Newtonsoft.Json;
+ using System.Collections;
+ using System.Collections.Generic;
using System.Linq;
///
@@ -35,10 +37,13 @@ public RedisRebootParameters()
/// 'PrimaryNode', 'SecondaryNode', 'AllNodes'
/// If clustering is enabled, the ID of the shard
/// to be rebooted.
- public RedisRebootParameters(string rebootType, int? shardId = default(int?))
+ /// A list of redis instances to reboot, specified
+ /// by per-instance SSL ports or non-SSL ports.
+ public RedisRebootParameters(string rebootType = default(string), int? shardId = default(int?), IList ports = default(IList))
{
RebootType = rebootType;
ShardId = shardId;
+ Ports = ports;
CustomInit();
}
@@ -63,17 +68,10 @@ public RedisRebootParameters()
public int? ShardId { get; set; }
///
- /// Validate the object.
+ /// Gets or sets a list of redis instances to reboot, specified by
+ /// per-instance SSL ports or non-SSL ports.
///
- ///
- /// Thrown if validation fails
- ///
- public virtual void Validate()
- {
- if (RebootType == null)
- {
- throw new ValidationException(ValidationRules.CannotBeNull, "RebootType");
- }
- }
+ [JsonProperty(PropertyName = "ports")]
+ public IList Ports { get; set; }
}
}
diff --git a/sdk/redis/Microsoft.Azure.Management.RedisCache/src/Generated/RedisOperations.cs b/sdk/redis/Microsoft.Azure.Management.RedisCache/src/Generated/RedisOperations.cs
index a9f6a6742107..fd6b5dea4e7d 100644
--- a/sdk/redis/Microsoft.Azure.Management.RedisCache/src/Generated/RedisOperations.cs
+++ b/sdk/redis/Microsoft.Azure.Management.RedisCache/src/Generated/RedisOperations.cs
@@ -1505,10 +1505,6 @@ internal RedisOperations(RedisManagementClient client)
{
throw new ValidationException(ValidationRules.CannotBeNull, "parameters");
}
- if (parameters != null)
- {
- parameters.Validate();
- }
if (Client.ApiVersion == null)
{
throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
diff --git a/sdk/redis/Microsoft.Azure.Management.RedisCache/src/Microsoft.Azure.Management.Redis.csproj b/sdk/redis/Microsoft.Azure.Management.RedisCache/src/Microsoft.Azure.Management.Redis.csproj
index 7e360766a30a..b0e9e6f4c85b 100644
--- a/sdk/redis/Microsoft.Azure.Management.RedisCache/src/Microsoft.Azure.Management.Redis.csproj
+++ b/sdk/redis/Microsoft.Azure.Management.RedisCache/src/Microsoft.Azure.Management.Redis.csproj
@@ -6,11 +6,10 @@
Microsoft.Azure.Management.Redis
Provides redis cache management capabilities for Microsoft Azure.
- 6.0.0-preview.1
+ 6.0.0-preview.2
Microsoft.Azure.Management.Redis
Microsoft Azure Redis Cache management;Redis Management;
- Added "ReplicasPerMaster" property for Cache Create, Update operations
-Added "ReplicasPerMaster" and "instances" property to the output of Cache Create, Update and Get operations
+ Added support for specifying ports to RedisRebootParameters to enable rebooting cache instances based on their exposed port information.
$(SdkTargetFx)
diff --git a/sdk/redis/Microsoft.Azure.Management.RedisCache/tests/ScenarioTests/BeginCreateFunctionalTests.cs b/sdk/redis/Microsoft.Azure.Management.RedisCache/tests/ScenarioTests/BeginCreateFunctionalTests.cs
index efc642924c93..7d650fd4c32a 100644
--- a/sdk/redis/Microsoft.Azure.Management.RedisCache/tests/ScenarioTests/BeginCreateFunctionalTests.cs
+++ b/sdk/redis/Microsoft.Azure.Management.RedisCache/tests/ScenarioTests/BeginCreateFunctionalTests.cs
@@ -54,6 +54,7 @@ public void BeginCreateFunctionalTest()
Assert.Null(response.Instances[i].NonSslPort);
Assert.Null(response.Instances[i].ShardId);
Assert.Null(response.Instances[i].Zone);
+ Assert.Null(response.Instances[i].IsMaster);
}
for (int i = 0; i < 60; i++)