diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index 1a2803bf0af9..1481bd2fe16b 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -2540,7 +2540,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/ai-inference@file:projects/ai-inference.tgz':
-    resolution: {integrity: sha512-jy3iCFAJq8qZFdMN0GEK8XNPi3lTfEIQEOM4jNCqE850gODahI+XXRqHMbrGUJd2tjmZMm0cKc6CQbjVxFsi/Q==, tarball: file:projects/ai-inference.tgz}
+    resolution: {integrity: sha512-3F/JVas1qHmWihXHHGxX6EUigHTNsftXBjspS6BMU6/lu/xDNMxKAY30DJMK90KyhH5UxZ+ZRwWlWbhKWW+2ow==, tarball: file:projects/ai-inference.tgz}
     version: 0.0.0
 
   '@rush-temp/ai-language-conversations@file:projects/ai-language-conversations.tgz':
@@ -2560,7 +2560,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/ai-projects@file:projects/ai-projects.tgz':
-    resolution: {integrity: sha512-olWaOR+lScYd4KfOBFDagJ6zLA728vt+08hSgNDsM182EdAAAYN2c5dqJ7BsN/1rv7I6rb6lywdCSQ5gK9pABQ==, tarball: file:projects/ai-projects.tgz}
+    resolution: {integrity: sha512-rbzbhwz+05oHf7CC83pshBtWypNW2LVlSpfOOwkX3BmqB4MiHah+CmjehPDEKqpnn0vgU4GzdM0BeD4HoI9J1w==, tarball: file:projects/ai-projects.tgz}
     version: 0.0.0
 
   '@rush-temp/ai-text-analytics@file:projects/ai-text-analytics.tgz':
@@ -3364,7 +3364,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/arm-redisenterprisecache@file:projects/arm-redisenterprisecache.tgz':
-    resolution: {integrity: sha512-u3WUeA9t07iG0ThDguteQ2RG0pVJqilicsJpIRzrDON70EFoSop6NKVf5CUzOu2dMcJY8/ZDfmvHVabwIYIMwA==, tarball: file:projects/arm-redisenterprisecache.tgz}
+    resolution: {integrity: sha512-NiVmYrexacMGAxvCnomlt67RT115FZeQIlmNH7/1CR67xiEasBbON5o8pLM23vseYL7F0kAvAjfWUlMUW1DL1Q==, tarball: file:projects/arm-redisenterprisecache.tgz}
     version: 0.0.0
 
   '@rush-temp/arm-relay@file:projects/arm-relay.tgz':
@@ -3884,7 +3884,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/mixed-reality-remote-rendering@file:projects/mixed-reality-remote-rendering.tgz':
-    resolution: {integrity: sha512-4Wx6KxuTYKmgYWfmzLs2BW2MkwATk98Fdx88WL7/sa632gevVbfOCT5WWUUsqW2OtLN36jpr8Vi6UfKrxEON0g==, tarball: file:projects/mixed-reality-remote-rendering.tgz}
+    resolution: {integrity: sha512-TN6cq8PIrYAy/tJ4mQIkcRn1Wkr5lBxnDY8UeSvQP9D61ZN0iESKb4j+wnXPJp2RNKa9tBpg8NcOt5Jc7qhwaQ==, tarball: file:projects/mixed-reality-remote-rendering.tgz}
     version: 0.0.0
 
   '@rush-temp/mock-hub@file:projects/mock-hub.tgz':
@@ -3900,11 +3900,11 @@ packages:
     version: 0.0.0
 
   '@rush-temp/monitor-opentelemetry@file:projects/monitor-opentelemetry.tgz':
-    resolution: {integrity: sha512-1K08pDS3mRgyqyPHPU/PS/Kwhn10bdtrh9sU9itLgfy+cj+Rn/KkMG0Y0ZIAqhPRYc1/LUdXBVR1LZ/l3gx0Iw==, tarball: file:projects/monitor-opentelemetry.tgz}
+    resolution: {integrity: sha512-HH9DSuPu9Flo0w2YXzGUnayl/lDLcTwcGEhht0VdjPe7ZwhakhOH8/VoxrZKQTdgseCZMpYDmWgB2BaKkUr/Mg==, tarball: file:projects/monitor-opentelemetry.tgz}
     version: 0.0.0
 
   '@rush-temp/monitor-query@file:projects/monitor-query.tgz':
-    resolution: {integrity: sha512-FfDHQlhugBYGKJAG+Qvo0eA9RxpyaY0LHrPOjcmIyF8gy3hxeJf0+Z9/XSfi3jDrCdv+l1K3as1cbuiY48Or4Q==, tarball: file:projects/monitor-query.tgz}
+    resolution: {integrity: sha512-bQ0lyAnF/GBcL7pwA66f/U6sjezndhPmHkMCjdmz1MD93PYpaQvasNEGspFvjrnt8Xwcg0CmdnzeWbHE6obY1w==, tarball: file:projects/monitor-query.tgz}
     version: 0.0.0
 
   '@rush-temp/notification-hubs@file:projects/notification-hubs.tgz':
@@ -3912,7 +3912,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/openai@file:projects/openai.tgz':
-    resolution: {integrity: sha512-QnN8rZhPnF3/GYsh3cLlyCb6JgnWdpPVrjGoau5jvxZQWcBIWb108P7yNZwXptJcPti/jGYJPFQuwRWW7CxgvA==, tarball: file:projects/openai.tgz}
+    resolution: {integrity: sha512-EB6z+wWho8coz2hCDFUcYTJ+Jw5CfJ20yzKpIZeNk4OxpglGY7XTSiWxsuCHa++eVGTTXRHMwG/gdOtAv9mZkw==, tarball: file:projects/openai.tgz}
     version: 0.0.0
 
   '@rush-temp/opentelemetry-instrumentation-azure-sdk@file:projects/opentelemetry-instrumentation-azure-sdk.tgz':
@@ -3980,7 +3980,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/perf-monitor-opentelemetry@file:projects/perf-monitor-opentelemetry.tgz':
-    resolution: {integrity: sha512-dwzpNIZPU6i3RcqjhLVipjyiz3ZZMtjs7dOuCSH4TtaOyj5vgqVvQC61FbEsnQrI5coVWW0NEOmbNYbzkih1Yw==, tarball: file:projects/perf-monitor-opentelemetry.tgz}
+    resolution: {integrity: sha512-B6GNjGVtP+BWESkV/d2t2Kg4FhgyWAibL4khmjnhduwd14Cjtqf/Aoz7B71usfgEXEUE9KvkL3VUg2IVm+MLSw==, tarball: file:projects/perf-monitor-opentelemetry.tgz}
     version: 0.0.0
 
   '@rush-temp/perf-monitor-query@file:projects/perf-monitor-query.tgz':
@@ -4056,7 +4056,7 @@ packages:
     version: 0.0.0
 
   '@rush-temp/service-bus@file:projects/service-bus.tgz':
-    resolution: {integrity: sha512-ICttr5Vkcza3Jpy5WP+rciaUvO8NRkplh7TEOk7RWExZR9GFF0hXTNbH11Id8/OSZ17v/vuWtwt+9GFLBeDsZw==, tarball: file:projects/service-bus.tgz}
+    resolution: {integrity: sha512-CEMwNWHdlbtYASoZFKNN3dzVF8Uno0LED5f7xmGV7kjawCq6iJuwxz4UhBDpDDdYYdG+cAIIcMZfUEj+cdcQsA==, tarball: file:projects/service-bus.tgz}
     version: 0.0.0
 
   '@rush-temp/storage-blob-changefeed@file:projects/storage-blob-changefeed.tgz':
@@ -17157,12 +17157,12 @@ snapshots:
     dependencies:
       '@azure/core-lro': 2.7.2
       '@types/node': 18.19.76
-      '@vitest/browser': 3.0.6(@types/node@18.19.76)(playwright@1.50.1)(typescript@5.7.3)(vite@6.1.1(@types/node@22.7.9)(tsx@4.19.3)(yaml@2.7.0))(vitest@3.0.6)
+      '@vitest/browser': 3.0.6(@types/node@18.19.76)(playwright@1.50.1)(typescript@5.6.3)(vite@6.1.1(@types/node@22.7.9)(tsx@4.19.3)(yaml@2.7.0))(vitest@3.0.6)
       '@vitest/coverage-istanbul': 3.0.6(vitest@3.0.6)
       dotenv: 16.4.7
       playwright: 1.50.1
       tslib: 2.8.1
-      typescript: 5.7.3
+      typescript: 5.6.3
       vitest: 3.0.6(@types/debug@4.1.12)(@types/node@18.19.76)(@vitest/browser@3.0.6)(msw@2.7.2(@types/node@22.7.9)(typescript@5.8.2))(tsx@4.19.3)(yaml@2.7.0)
     transitivePeerDependencies:
       - '@edge-runtime/vm'
@@ -23879,7 +23879,7 @@ snapshots:
 
   '@types/chai-as-promised@7.1.8':
     dependencies:
-      '@types/chai': 4.3.20
+      '@types/chai': 5.0.1
 
   '@types/chai-as-promised@8.0.1':
     dependencies:
@@ -27933,7 +27933,7 @@ snapshots:
       resolve-import: 1.4.6
       rimraf: 5.0.10
       sync-content: 1.0.2
-      typescript: 5.7.3
+      typescript: 5.8.2
       walk-up-path: 3.0.1
 
   tslib@2.8.1: {}
diff --git a/sdk/redisenterprise/arm-redisenterprisecache/CHANGELOG.md b/sdk/redisenterprise/arm-redisenterprisecache/CHANGELOG.md
index 2244f508d242..88cb58c7568f 100644
--- a/sdk/redisenterprise/arm-redisenterprisecache/CHANGELOG.md
+++ b/sdk/redisenterprise/arm-redisenterprisecache/CHANGELOG.md
@@ -1,15 +1,32 @@
 # Release History
-
-## 3.1.0-beta.3 (Unreleased)
-
+    
+## 3.1.0 (2025-03-06)
+    
 ### Features Added
 
-### Breaking Changes
-
-### Bugs Fixed
-
-### Other Changes
-
+  - Added operation Databases.beginForceLinkToReplicationGroup
+  - Added operation Databases.beginForceLinkToReplicationGroupAndWait
+  - Added Interface DatabasesDeleteHeaders
+  - Added Interface DatabasesExportHeaders
+  - Added Interface DatabasesForceLinkToReplicationGroupHeaders
+  - Added Interface DatabasesForceLinkToReplicationGroupOptionalParams
+  - Added Interface DatabasesForceUnlinkHeaders
+  - Added Interface DatabasesImportHeaders
+  - Added Interface DatabasesRegenerateKeyHeaders
+  - Added Interface DatabasesUpdateHeaders
+  - Added Interface ErrorDetailAutoGenerated
+  - Added Interface ErrorResponseAutoGenerated
+  - Added Interface ForceLinkParameters
+  - Added Interface ForceLinkParametersGeoReplication
+  - Added Interface RedisEnterpriseDeleteHeaders
+  - Added Interface RedisEnterpriseUpdateHeaders
+  - Added Type Alias DatabasesForceLinkToReplicationGroupResponse
+  - Enum KnownSkuName has a new value EnterpriseE1
+  - Enum KnownSkuName has a new value EnterpriseE200
+  - Enum KnownSkuName has a new value EnterpriseE400
+  - Enum KnownSkuName has a new value EnterpriseE5
+    
+    
 ## 3.1.0-beta.2 (2024-10-16)
 Compared with version 3.0.0
     
diff --git a/sdk/redisenterprise/arm-redisenterprisecache/LICENSE b/sdk/redisenterprise/arm-redisenterprisecache/LICENSE
index b2f52a2bad4e..63447fd8bbbf 100644
--- a/sdk/redisenterprise/arm-redisenterprisecache/LICENSE
+++ b/sdk/redisenterprise/arm-redisenterprisecache/LICENSE
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
\ No newline at end of file
diff --git a/sdk/redisenterprise/arm-redisenterprisecache/README.md b/sdk/redisenterprise/arm-redisenterprisecache/README.md
index 6d20ca122bab..c444781c9485 100644
--- a/sdk/redisenterprise/arm-redisenterprisecache/README.md
+++ b/sdk/redisenterprise/arm-redisenterprisecache/README.md
@@ -6,7 +6,7 @@ REST API for managing Redis Enterprise resources in Azure.
 
 [Source code](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/redisenterprise/arm-redisenterprisecache) |
 [Package (NPM)](https://www.npmjs.com/package/@azure/arm-redisenterprisecache) |
-[API reference documentation](https://learn.microsoft.com/javascript/api/@azure/arm-redisenterprisecache?view=azure-node-preview) |
+[API reference documentation](https://learn.microsoft.com/javascript/api/@azure/arm-redisenterprisecache) |
 [Samples](https://github.com/Azure-Samples/azure-samples-js-management)
 
 ## Getting started
@@ -44,7 +44,6 @@ npm install @azure/identity
 ```
 
 You will also need to **register a new AAD application and grant access to Azure RedisEnterpriseManagement** by assigning the suitable role to your service principal (note: roles such as `"Owner"` will not grant the necessary permissions).
-Set the values of the client ID, tenant ID, and client secret of the AAD application as environment variables: `AZURE_CLIENT_ID`, `AZURE_TENANT_ID`, `AZURE_CLIENT_SECRET`.
 
 For more information about how to create an Azure AD Application check out [this guide](https://learn.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal).
 
@@ -64,16 +63,14 @@ For browser environments, use the `InteractiveBrowserCredential` from the `@azur
 import { InteractiveBrowserCredential } from "@azure/identity";
 import { RedisEnterpriseManagementClient } from "@azure/arm-redisenterprisecache";
 
-const subscriptionId = "00000000-0000-0000-0000-000000000000";
 const credential = new InteractiveBrowserCredential({
   tenantId: "<YOUR_TENANT_ID>",
-  clientId: "<YOUR_CLIENT_ID>",
-});
+  clientId: "<YOUR_CLIENT_ID>"
+ });
 const client = new RedisEnterpriseManagementClient(credential, subscriptionId);
 ```
 
 ### JavaScript Bundle
-
 To use this client library in the browser, first you need to use a bundler. For details on how to do this, please refer to our [bundling documentation](https://aka.ms/AzureSDKBundling).
 
 ## Key concepts
@@ -108,7 +105,7 @@ If you'd like to contribute to this library, please read the [contributing guide
 
 - [Microsoft Azure SDK for JavaScript](https://github.com/Azure/azure-sdk-for-js)
 
-
+![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js%2Fsdk%2Fredisenterprise%2Farm-redisenterprisecache%2FREADME.png)
 
 [azure_cli]: https://learn.microsoft.com/cli/azure
 [azure_sub]: https://azure.microsoft.com/free/
diff --git a/sdk/redisenterprise/arm-redisenterprisecache/_meta.json b/sdk/redisenterprise/arm-redisenterprisecache/_meta.json
index 7299561eef8a..9698176c2579 100644
--- a/sdk/redisenterprise/arm-redisenterprisecache/_meta.json
+++ b/sdk/redisenterprise/arm-redisenterprisecache/_meta.json
@@ -1,8 +1,8 @@
 {
-  "commit": "04c0350ee69b9d7a788af5774c5418afab64a7b1",
+  "commit": "48f5ef8b12db91368ebffaf4a3aac82519cf9e35",
   "readme": "specification/redisenterprise/resource-manager/readme.md",
-  "autorest_command": "autorest --version=3.9.7 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\Git\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\redisenterprise\\resource-manager\\readme.md --use=@autorest/typescript@6.0.27 --generate-sample=true",
+  "autorest_command": "autorest --version=3.9.7 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/redisenterprise/resource-manager/readme.md --use=@autorest/typescript@^6.0.12",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
-  "release_tool": "@azure-tools/js-sdk-release-tools@2.7.13",
-  "use": "@autorest/typescript@6.0.27"
+  "release_tool": "@azure-tools/js-sdk-release-tools@2.7.21",
+  "use": "@autorest/typescript@^6.0.12"
 }
\ No newline at end of file
diff --git a/sdk/redisenterprise/arm-redisenterprisecache/api-extractor.json b/sdk/redisenterprise/arm-redisenterprisecache/api-extractor.json
index ffcbffb13b14..96c3a6e4a1c6 100644
--- a/sdk/redisenterprise/arm-redisenterprisecache/api-extractor.json
+++ b/sdk/redisenterprise/arm-redisenterprisecache/api-extractor.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "mainEntryPointFilePath": "dist/esm/index.d.ts",
+  "mainEntryPointFilePath": "./dist-esm/src/index.d.ts",
   "docModel": {
     "enabled": true
   },
@@ -11,7 +11,7 @@
   "dtsRollup": {
     "enabled": true,
     "untrimmedFilePath": "",
-    "publicTrimmedFilePath": "dist/arm-redisenterprisecache.d.ts"
+    "publicTrimmedFilePath": "./types/arm-redisenterprisecache.d.ts"
   },
   "messages": {
     "tsdocMessageReporting": {
@@ -28,4 +28,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/sdk/redisenterprise/arm-redisenterprisecache/package.json b/sdk/redisenterprise/arm-redisenterprisecache/package.json
index 84727de77d47..244de91d7e15 100644
--- a/sdk/redisenterprise/arm-redisenterprisecache/package.json
+++ b/sdk/redisenterprise/arm-redisenterprisecache/package.json
@@ -3,7 +3,7 @@
   "sdk-type": "mgmt",
   "author": "Microsoft Corporation",
   "description": "A generated SDK for RedisEnterpriseManagementClient.",
-  "version": "3.1.0-beta.3",
+  "version": "3.1.0",
   "engines": {
     "node": ">=18.0.0"
   },
@@ -25,22 +25,22 @@
   ],
   "license": "MIT",
   "main": "./dist/commonjs/index.js",
-  "module": "./dist/esm/index.js",
+  "module": "./dist-esm/src/index.js",
   "types": "./dist/commonjs/index.d.ts",
   "devDependencies": {
     "@azure-tools/test-credential": "^2.0.0",
     "@azure-tools/test-recorder": "^4.1.0",
     "@azure-tools/test-utils-vitest": "^1.0.0",
     "@azure/dev-tool": "^1.0.0",
-    "@azure/identity": "^4.6.0",
+    "@azure/identity": "^4.7.0",
     "@azure/logger": "^1.1.4",
     "@types/node": "^18.0.0",
-    "@vitest/browser": "^3.0.5",
-    "@vitest/coverage-istanbul": "^3.0.5",
+    "@vitest/browser": "^3.0.6",
+    "@vitest/coverage-istanbul": "^3.0.6",
     "dotenv": "^16.0.0",
     "playwright": "^1.50.1",
-    "typescript": "~5.7.2",
-    "vitest": "^3.0.5"
+    "typescript": "~5.6.2",
+    "vitest": "^3.0.6"
   },
   "repository": {
     "type": "git",
@@ -93,14 +93,6 @@
   },
   "autoPublish": true,
   "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/redisenterprise/arm-redisenterprisecache",
-  "//sampleConfiguration": {
-    "productName": "",
-    "productSlugs": [
-      "azure"
-    ],
-    "disableDocsMs": true,
-    "apiRefLink": "https://learn.microsoft.com/javascript/api/@azure/arm-redisenterprisecache?view=azure-node-preview"
-  },
   "type": "module",
   "tshy": {
     "project": "./tsconfig.src.json",
@@ -141,4 +133,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/sdk/redisenterprise/arm-redisenterprisecache/review/arm-redisenterprisecache.api.md b/sdk/redisenterprise/arm-redisenterprisecache/review/arm-redisenterprisecache.api.md
index 86d828a10e74..3b98ab86263f 100644
--- a/sdk/redisenterprise/arm-redisenterprisecache/review/arm-redisenterprisecache.api.md
+++ b/sdk/redisenterprise/arm-redisenterprisecache/review/arm-redisenterprisecache.api.md
@@ -16,85 +16,9 @@ export interface AccessKeys {
     readonly secondaryKey?: string;
 }
 
-// @public
-export type AccessKeysAuthentication = string;
-
 // @public
 export type AccessKeyType = "Primary" | "Secondary";
 
-// @public
-export interface AccessPolicyAssignment extends ProxyResourceAutoGenerated {
-    accessPolicyName?: string;
-    readonly provisioningState?: ProvisioningState;
-    user?: AccessPolicyAssignmentPropertiesUser;
-}
-
-// @public
-export interface AccessPolicyAssignmentCreateUpdateOptionalParams extends coreClient.OperationOptions {
-    resumeFrom?: string;
-    updateIntervalInMs?: number;
-}
-
-// @public
-export type AccessPolicyAssignmentCreateUpdateResponse = AccessPolicyAssignment;
-
-// @public
-export interface AccessPolicyAssignmentDeleteHeaders {
-    azureAsyncOperation?: string;
-    location?: string;
-}
-
-// @public
-export interface AccessPolicyAssignmentDeleteOptionalParams extends coreClient.OperationOptions {
-    resumeFrom?: string;
-    updateIntervalInMs?: number;
-}
-
-// @public
-export type AccessPolicyAssignmentDeleteResponse = AccessPolicyAssignmentDeleteHeaders;
-
-// @public
-export interface AccessPolicyAssignmentGetOptionalParams extends coreClient.OperationOptions {
-}
-
-// @public
-export type AccessPolicyAssignmentGetResponse = AccessPolicyAssignment;
-
-// @public
-export interface AccessPolicyAssignmentList {
-    readonly nextLink?: string;
-    value?: AccessPolicyAssignment[];
-}
-
-// @public
-export interface AccessPolicyAssignmentListNextOptionalParams extends coreClient.OperationOptions {
-}
-
-// @public
-export type AccessPolicyAssignmentListNextResponse = AccessPolicyAssignmentList;
-
-// @public
-export interface AccessPolicyAssignmentListOptionalParams extends coreClient.OperationOptions {
-}
-
-// @public
-export type AccessPolicyAssignmentListResponse = AccessPolicyAssignmentList;
-
-// @public
-export interface AccessPolicyAssignmentOperations {
-    beginCreateUpdate(resourceGroupName: string, clusterName: string, databaseName: string, accessPolicyAssignmentName: string, parameters: AccessPolicyAssignment, options?: AccessPolicyAssignmentCreateUpdateOptionalParams): Promise<SimplePollerLike<OperationState<AccessPolicyAssignmentCreateUpdateResponse>, AccessPolicyAssignmentCreateUpdateResponse>>;
-    beginCreateUpdateAndWait(resourceGroupName: string, clusterName: string, databaseName: string, accessPolicyAssignmentName: string, parameters: AccessPolicyAssignment, options?: AccessPolicyAssignmentCreateUpdateOptionalParams): Promise<AccessPolicyAssignmentCreateUpdateResponse>;
-    beginDelete(resourceGroupName: string, clusterName: string, databaseName: string, accessPolicyAssignmentName: string, options?: AccessPolicyAssignmentDeleteOptionalParams): Promise<SimplePollerLike<OperationState<AccessPolicyAssignmentDeleteResponse>, AccessPolicyAssignmentDeleteResponse>>;
-    beginDeleteAndWait(resourceGroupName: string, clusterName: string, databaseName: string, accessPolicyAssignmentName: string, options?: AccessPolicyAssignmentDeleteOptionalParams): Promise<AccessPolicyAssignmentDeleteResponse>;
-    get(resourceGroupName: string, clusterName: string, databaseName: string, accessPolicyAssignmentName: string, options?: AccessPolicyAssignmentGetOptionalParams): Promise<AccessPolicyAssignmentGetResponse>;
-    list(resourceGroupName: string, clusterName: string, databaseName: string, options?: AccessPolicyAssignmentListOptionalParams): PagedAsyncIterableIterator<AccessPolicyAssignment>;
-}
-
-// @public
-export interface AccessPolicyAssignmentPropertiesUser {
-    objectId?: string;
-}
-
 // @public
 export type ActionType = string;
 
@@ -104,14 +28,12 @@ export type AofFrequency = string;
 // @public
 export interface Cluster extends TrackedResource {
     encryption?: ClusterPropertiesEncryption;
-    highAvailability?: HighAvailability;
     readonly hostName?: string;
     identity?: ManagedServiceIdentity;
     minimumTlsVersion?: TlsVersion;
     readonly privateEndpointConnections?: PrivateEndpointConnection[];
     readonly provisioningState?: ProvisioningState;
     readonly redisVersion?: string;
-    readonly redundancyMode?: RedundancyMode;
     readonly resourceState?: ResourceState;
     sku: Sku;
     zones?: string[];
@@ -146,14 +68,12 @@ export interface ClusterPropertiesEncryptionCustomerManagedKeyEncryptionKeyIdent
 // @public
 export interface ClusterUpdate {
     encryption?: ClusterPropertiesEncryption;
-    highAvailability?: HighAvailability;
     readonly hostName?: string;
     identity?: ManagedServiceIdentity;
     minimumTlsVersion?: TlsVersion;
     readonly privateEndpointConnections?: PrivateEndpointConnection[];
     readonly provisioningState?: ProvisioningState;
     readonly redisVersion?: string;
-    readonly redundancyMode?: RedundancyMode;
     readonly resourceState?: ResourceState;
     sku?: Sku;
     tags?: {
@@ -164,22 +84,16 @@ export interface ClusterUpdate {
 // @public
 export type CmkIdentityType = string;
 
-// @public
-export type CreatedByType = string;
-
 // @public
 export interface Database extends ProxyResource {
-    accessKeysAuthentication?: AccessKeysAuthentication;
     clientProtocol?: Protocol;
     clusteringPolicy?: ClusteringPolicy;
-    deferUpgrade?: DeferUpgradeSetting;
     evictionPolicy?: EvictionPolicy;
     geoReplication?: DatabasePropertiesGeoReplication;
     modules?: Module[];
     persistence?: Persistence;
     port?: number;
     readonly provisioningState?: ProvisioningState;
-    readonly redisVersion?: string;
     readonly resourceState?: ResourceState;
 }
 
@@ -215,8 +129,6 @@ export interface Databases {
     beginRegenerateKeyAndWait(resourceGroupName: string, clusterName: string, databaseName: string, parameters: RegenerateKeyParameters, options?: DatabasesRegenerateKeyOptionalParams): Promise<DatabasesRegenerateKeyResponse>;
     beginUpdate(resourceGroupName: string, clusterName: string, databaseName: string, parameters: DatabaseUpdate, options?: DatabasesUpdateOptionalParams): Promise<SimplePollerLike<OperationState<DatabasesUpdateResponse>, DatabasesUpdateResponse>>;
     beginUpdateAndWait(resourceGroupName: string, clusterName: string, databaseName: string, parameters: DatabaseUpdate, options?: DatabasesUpdateOptionalParams): Promise<DatabasesUpdateResponse>;
-    beginUpgradeDBRedisVersion(resourceGroupName: string, clusterName: string, databaseName: string, options?: DatabasesUpgradeDBRedisVersionOptionalParams): Promise<SimplePollerLike<OperationState<DatabasesUpgradeDBRedisVersionResponse>, DatabasesUpgradeDBRedisVersionResponse>>;
-    beginUpgradeDBRedisVersionAndWait(resourceGroupName: string, clusterName: string, databaseName: string, options?: DatabasesUpgradeDBRedisVersionOptionalParams): Promise<DatabasesUpgradeDBRedisVersionResponse>;
     get(resourceGroupName: string, clusterName: string, databaseName: string, options?: DatabasesGetOptionalParams): Promise<DatabasesGetResponse>;
     listByCluster(resourceGroupName: string, clusterName: string, options?: DatabasesListByClusterOptionalParams): PagedAsyncIterableIterator<Database>;
     listKeys(resourceGroupName: string, clusterName: string, databaseName: string, options?: DatabasesListKeysOptionalParams): Promise<DatabasesListKeysResponse>;
@@ -364,40 +276,19 @@ export interface DatabasesUpdateOptionalParams extends coreClient.OperationOptio
 // @public
 export type DatabasesUpdateResponse = Database;
 
-// @public
-export interface DatabasesUpgradeDBRedisVersionHeaders {
-    azureAsyncOperation?: string;
-    location?: string;
-}
-
-// @public
-export interface DatabasesUpgradeDBRedisVersionOptionalParams extends coreClient.OperationOptions {
-    resumeFrom?: string;
-    updateIntervalInMs?: number;
-}
-
-// @public
-export type DatabasesUpgradeDBRedisVersionResponse = DatabasesUpgradeDBRedisVersionHeaders;
-
 // @public
 export interface DatabaseUpdate {
-    accessKeysAuthentication?: AccessKeysAuthentication;
     clientProtocol?: Protocol;
     clusteringPolicy?: ClusteringPolicy;
-    deferUpgrade?: DeferUpgradeSetting;
     evictionPolicy?: EvictionPolicy;
     geoReplication?: DatabasePropertiesGeoReplication;
     modules?: Module[];
     persistence?: Persistence;
     port?: number;
     readonly provisioningState?: ProvisioningState;
-    readonly redisVersion?: string;
     readonly resourceState?: ResourceState;
 }
 
-// @public
-export type DeferUpgradeSetting = string;
-
 // @public
 export interface ErrorAdditionalInfo {
     readonly info?: Record<string, unknown>;
@@ -413,11 +304,25 @@ export interface ErrorDetail {
     readonly target?: string;
 }
 
+// @public
+export interface ErrorDetailAutoGenerated {
+    readonly additionalInfo?: ErrorAdditionalInfo[];
+    readonly code?: string;
+    readonly details?: ErrorDetailAutoGenerated[];
+    readonly message?: string;
+    readonly target?: string;
+}
+
 // @public
 export interface ErrorResponse {
     error?: ErrorDetail;
 }
 
+// @public
+export interface ErrorResponseAutoGenerated {
+    error?: ErrorDetailAutoGenerated;
+}
+
 // @public
 export type EvictionPolicy = string;
 
@@ -433,8 +338,13 @@ export interface FlushParameters {
 
 // @public
 export interface ForceLinkParameters {
-    groupNickname: string;
-    linkedDatabases: LinkedDatabase[];
+    geoReplication: ForceLinkParametersGeoReplication;
+}
+
+// @public
+export interface ForceLinkParametersGeoReplication {
+    groupNickname?: string;
+    linkedDatabases?: LinkedDatabase[];
 }
 
 // @public
@@ -445,20 +355,11 @@ export interface ForceUnlinkParameters {
 // @public
 export function getContinuationToken(page: unknown): string | undefined;
 
-// @public
-export type HighAvailability = string;
-
 // @public
 export interface ImportClusterParameters {
     sasUris: string[];
 }
 
-// @public
-export enum KnownAccessKeysAuthentication {
-    Disabled = "Disabled",
-    Enabled = "Enabled"
-}
-
 // @public
 export enum KnownActionType {
     Internal = "Internal"
@@ -482,20 +383,6 @@ export enum KnownCmkIdentityType {
     UserAssignedIdentity = "userAssignedIdentity"
 }
 
-// @public
-export enum KnownCreatedByType {
-    Application = "Application",
-    Key = "Key",
-    ManagedIdentity = "ManagedIdentity",
-    User = "User"
-}
-
-// @public
-export enum KnownDeferUpgradeSetting {
-    Deferred = "Deferred",
-    NotDeferred = "NotDeferred"
-}
-
 // @public
 export enum KnownEvictionPolicy {
     AllKeysLFU = "AllKeysLFU",
@@ -508,12 +395,6 @@ export enum KnownEvictionPolicy {
     VolatileTTL = "VolatileTTL"
 }
 
-// @public
-export enum KnownHighAvailability {
-    Disabled = "Disabled",
-    Enabled = "Enabled"
-}
-
 // @public
 export enum KnownLinkState {
     Linked = "Linked",
@@ -576,13 +457,6 @@ export enum KnownRdbFrequency {
     TwelveH = "12h"
 }
 
-// @public
-export enum KnownRedundancyMode {
-    LR = "LR",
-    None = "None",
-    ZR = "ZR"
-}
-
 // @public
 export enum KnownResourceState {
     CreateFailed = "CreateFailed",
@@ -603,31 +477,6 @@ export enum KnownResourceState {
 
 // @public
 export enum KnownSkuName {
-    BalancedB0 = "Balanced_B0",
-    BalancedB1 = "Balanced_B1",
-    BalancedB10 = "Balanced_B10",
-    BalancedB100 = "Balanced_B100",
-    BalancedB1000 = "Balanced_B1000",
-    BalancedB150 = "Balanced_B150",
-    BalancedB20 = "Balanced_B20",
-    BalancedB250 = "Balanced_B250",
-    BalancedB3 = "Balanced_B3",
-    BalancedB350 = "Balanced_B350",
-    BalancedB5 = "Balanced_B5",
-    BalancedB50 = "Balanced_B50",
-    BalancedB500 = "Balanced_B500",
-    BalancedB700 = "Balanced_B700",
-    ComputeOptimizedX10 = "ComputeOptimized_X10",
-    ComputeOptimizedX100 = "ComputeOptimized_X100",
-    ComputeOptimizedX150 = "ComputeOptimized_X150",
-    ComputeOptimizedX20 = "ComputeOptimized_X20",
-    ComputeOptimizedX250 = "ComputeOptimized_X250",
-    ComputeOptimizedX3 = "ComputeOptimized_X3",
-    ComputeOptimizedX350 = "ComputeOptimized_X350",
-    ComputeOptimizedX5 = "ComputeOptimized_X5",
-    ComputeOptimizedX50 = "ComputeOptimized_X50",
-    ComputeOptimizedX500 = "ComputeOptimized_X500",
-    ComputeOptimizedX700 = "ComputeOptimized_X700",
     EnterpriseE1 = "Enterprise_E1",
     EnterpriseE10 = "Enterprise_E10",
     EnterpriseE100 = "Enterprise_E100",
@@ -638,26 +487,7 @@ export enum KnownSkuName {
     EnterpriseE50 = "Enterprise_E50",
     EnterpriseFlashF1500 = "EnterpriseFlash_F1500",
     EnterpriseFlashF300 = "EnterpriseFlash_F300",
-    EnterpriseFlashF700 = "EnterpriseFlash_F700",
-    FlashOptimizedA1000 = "FlashOptimized_A1000",
-    FlashOptimizedA1500 = "FlashOptimized_A1500",
-    FlashOptimizedA2000 = "FlashOptimized_A2000",
-    FlashOptimizedA250 = "FlashOptimized_A250",
-    FlashOptimizedA4500 = "FlashOptimized_A4500",
-    FlashOptimizedA500 = "FlashOptimized_A500",
-    FlashOptimizedA700 = "FlashOptimized_A700",
-    MemoryOptimizedM10 = "MemoryOptimized_M10",
-    MemoryOptimizedM100 = "MemoryOptimized_M100",
-    MemoryOptimizedM1000 = "MemoryOptimized_M1000",
-    MemoryOptimizedM150 = "MemoryOptimized_M150",
-    MemoryOptimizedM1500 = "MemoryOptimized_M1500",
-    MemoryOptimizedM20 = "MemoryOptimized_M20",
-    MemoryOptimizedM2000 = "MemoryOptimized_M2000",
-    MemoryOptimizedM250 = "MemoryOptimized_M250",
-    MemoryOptimizedM350 = "MemoryOptimized_M350",
-    MemoryOptimizedM50 = "MemoryOptimized_M50",
-    MemoryOptimizedM500 = "MemoryOptimized_M500",
-    MemoryOptimizedM700 = "MemoryOptimized_M700"
+    EnterpriseFlashF700 = "EnterpriseFlash_F700"
 }
 
 // @public
@@ -877,11 +707,7 @@ export type Protocol = string;
 export type ProvisioningState = string;
 
 // @public
-export interface ProxyResource extends ResourceAutoGenerated {
-}
-
-// @public
-export interface ProxyResourceAutoGenerated extends Resource {
+export interface ProxyResource extends Resource {
 }
 
 // @public
@@ -962,8 +788,6 @@ export class RedisEnterpriseManagementClient extends coreClient.ServiceClient {
     $host: string;
     constructor(credentials: coreAuth.TokenCredential, subscriptionId: string, options?: RedisEnterpriseManagementClientOptionalParams);
     // (undocumented)
-    accessPolicyAssignmentOperations: AccessPolicyAssignmentOperations;
-    // (undocumented)
     apiVersion: string;
     // (undocumented)
     databases: Databases;
@@ -1003,9 +827,6 @@ export interface RedisEnterpriseUpdateOptionalParams extends coreClient.Operatio
 // @public
 export type RedisEnterpriseUpdateResponse = Cluster;
 
-// @public
-export type RedundancyMode = string;
-
 // @public
 export interface RegenerateKeyParameters {
     keyType: AccessKeyType;
@@ -1018,14 +839,6 @@ export interface Resource {
     readonly type?: string;
 }
 
-// @public
-export interface ResourceAutoGenerated {
-    readonly id?: string;
-    readonly name?: string;
-    readonly systemData?: SystemData;
-    readonly type?: string;
-}
-
 // @public
 export type ResourceState = string;
 
@@ -1038,16 +851,6 @@ export interface Sku {
 // @public
 export type SkuName = string;
 
-// @public
-export interface SystemData {
-    createdAt?: Date;
-    createdBy?: string;
-    createdByType?: CreatedByType;
-    lastModifiedAt?: Date;
-    lastModifiedBy?: string;
-    lastModifiedByType?: CreatedByType;
-}
-
 // @public
 export type TlsVersion = string;
 
diff --git a/sdk/redisenterprise/arm-redisenterprisecache/sample.env b/sdk/redisenterprise/arm-redisenterprisecache/sample.env
index 672847a3fea0..508439fc7d62 100644
--- a/sdk/redisenterprise/arm-redisenterprisecache/sample.env
+++ b/sdk/redisenterprise/arm-redisenterprisecache/sample.env
@@ -1,4 +1 @@
-# App registration secret for AAD authentication
-AZURE_CLIENT_SECRET=
-AZURE_CLIENT_ID=
-AZURE_TENANT_ID= 
\ No newline at end of file
+# Feel free to add your own environment variables.
\ No newline at end of file
diff --git a/sdk/redisenterprise/arm-redisenterprisecache/src/lroImpl.ts b/sdk/redisenterprise/arm-redisenterprisecache/src/lroImpl.ts
index d8bc98987053..5f88efab981b 100644
--- a/sdk/redisenterprise/arm-redisenterprisecache/src/lroImpl.ts
+++ b/sdk/redisenterprise/arm-redisenterprisecache/src/lroImpl.ts
@@ -5,6 +5,10 @@
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
+
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
 import { AbortSignalLike } from "@azure/abort-controller";
 import { LongRunningOperation, LroResponse } from "@azure/core-lro";
 
diff --git a/sdk/redisenterprise/arm-redisenterprisecache/src/models/index.ts b/sdk/redisenterprise/arm-redisenterprisecache/src/models/index.ts
index 98bd2e207756..3b16e1ef2ba7 100644
--- a/sdk/redisenterprise/arm-redisenterprisecache/src/models/index.ts
+++ b/sdk/redisenterprise/arm-redisenterprisecache/src/models/index.ts
@@ -137,11 +137,11 @@ export interface OperationStatus {
   error?: ErrorResponse;
 }
 
-/** SKU parameters supplied to the create Redis Enterprise cluster operation. */
+/** SKU parameters supplied to the create RedisEnterprise operation. */
 export interface Sku {
-  /** The level of Redis Enterprise cluster to deploy. Possible values: ('Balanced_B5', 'MemoryOptimized_M10', 'ComputeOptimized_X5', etc.). For more information on SKUs see the latest pricing documentation. Note that additional SKUs may become supported in the future. */
+  /** The type of RedisEnterprise cluster to deploy. Possible values: (Enterprise_E10, EnterpriseFlash_F300 etc.) */
   name: SkuName;
-  /** This property is only used with Enterprise and EnterpriseFlash SKUs. Determines the size of the cluster. Valid values are (2, 4, 6, ...) for Enterprise SKUs and (3, 9, 15, ...) for EnterpriseFlash SKUs. */
+  /** The size of the RedisEnterprise cluster. Defaults to 2 or 3 depending on SKU. Valid values are (2, 4, 6, ...) for Enterprise SKUs and (3, 9, 15, ...) for Flash SKUs. */
   capacity?: number;
 }
 
@@ -237,7 +237,7 @@ export interface Resource {
   readonly type?: string;
 }
 
-/** A partial update to the Redis Enterprise cluster */
+/** A partial update to the RedisEnterprise cluster */
 export interface ClusterUpdate {
   /** The SKU to create, which affects price, performance, and features. */
   sku?: Sku;
@@ -245,9 +245,7 @@ export interface ClusterUpdate {
   identity?: ManagedServiceIdentity;
   /** Resource tags. */
   tags?: { [propertyName: string]: string };
-  /** Enabled by default. If highAvailability is disabled, the data set is not replicated. This affects the availability SLA, and increases the risk of data loss. */
-  highAvailability?: HighAvailability;
-  /** The minimum TLS version for the cluster to support, e.g. '1.2'. Newer versions can be added in the future. Note that TLS 1.0 and TLS 1.1 are now completely obsolete -- you cannot use them. They are mentioned only for the sake of consistency with old API versions. */
+  /** The minimum TLS version for the cluster to support, e.g. '1.2' */
   minimumTlsVersion?: TlsVersion;
   /** Encryption-at-rest configuration for the cluster. */
   encryption?: ClusterPropertiesEncryption;
@@ -261,11 +259,6 @@ export interface ClusterUpdate {
    * NOTE: This property will not be serialized. It can only be populated by the server.
    */
   readonly provisioningState?: ProvisioningState;
-  /**
-   * Explains the current redundancy strategy of the cluster, which affects the expected SLA.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly redundancyMode?: RedundancyMode;
   /**
    * Current resource status of the cluster
    * NOTE: This property will not be serialized. It can only be populated by the server.
@@ -277,7 +270,7 @@ export interface ClusterUpdate {
    */
   readonly redisVersion?: string;
   /**
-   * List of private endpoint connections associated with the specified Redis Enterprise cluster
+   * List of private endpoint connections associated with the specified RedisEnterprise cluster
    * NOTE: This property will not be serialized. It can only be populated by the server.
    */
   readonly privateEndpointConnections?: PrivateEndpointConnection[];
@@ -305,13 +298,13 @@ export interface DatabaseList {
   readonly nextLink?: string;
 }
 
-/** Persistence-related configuration for the Redis Enterprise database */
+/** Persistence-related configuration for the RedisEnterprise database */
 export interface Persistence {
-  /** Sets whether AOF is enabled. Note that at most one of AOF or RDB persistence may be enabled. */
+  /** Sets whether AOF is enabled. */
   aofEnabled?: boolean;
-  /** Sets whether RDB is enabled. Note that at most one of AOF or RDB persistence may be enabled. */
+  /** Sets whether RDB is enabled. */
   rdbEnabled?: boolean;
-  /** Sets the frequency at which data is written to disk. Defaults to '1s', meaning 'every second'. Note that the 'always' setting is deprecated, because of its performance impact. */
+  /** Sets the frequency at which data is written to disk. */
   aofFrequency?: AofFrequency;
   /** Sets the frequency at which a snapshot of the database is created. */
   rdbFrequency?: RdbFrequency;
@@ -349,47 +342,7 @@ export interface LinkedDatabase {
   readonly state?: LinkState;
 }
 
-/** Common fields that are returned in the response for all Azure Resource Manager resources */
-export interface ResourceAutoGenerated {
-  /**
-   * Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly id?: string;
-  /**
-   * The name of the resource
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly name?: string;
-  /**
-   * The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts"
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly type?: string;
-  /**
-   * Azure Resource Manager metadata containing createdBy and modifiedBy information.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly systemData?: SystemData;
-}
-
-/** Metadata pertaining to creation and last modification of the resource. */
-export interface SystemData {
-  /** The identity that created the resource. */
-  createdBy?: string;
-  /** The type of identity that created the resource. */
-  createdByType?: CreatedByType;
-  /** The timestamp of resource creation (UTC). */
-  createdAt?: Date;
-  /** The identity that last modified the resource. */
-  lastModifiedBy?: string;
-  /** The type of identity that last modified the resource. */
-  lastModifiedByType?: CreatedByType;
-  /** The timestamp of resource last modification (UTC) */
-  lastModifiedAt?: Date;
-}
-
-/** A partial update to the Redis Enterprise database */
+/** A partial update to the RedisEnterprise database */
 export interface DatabaseUpdate {
   /** Specifies whether redis clients can connect using TLS-encrypted or plaintext redis protocols. Default is TLS-encrypted. */
   clientProtocol?: Protocol;
@@ -405,7 +358,7 @@ export interface DatabaseUpdate {
    * NOTE: This property will not be serialized. It can only be populated by the server.
    */
   readonly resourceState?: ResourceState;
-  /** Clustering policy - default is OSSCluster. This property must be chosen at create time, and cannot be changed without deleting the database. */
+  /** Clustering policy - default is OSSCluster. Specified at create time. */
   clusteringPolicy?: ClusteringPolicy;
   /** Redis eviction policy - default is VolatileLRU */
   evictionPolicy?: EvictionPolicy;
@@ -415,15 +368,6 @@ export interface DatabaseUpdate {
   modules?: Module[];
   /** Optional set of properties to configure geo replication for this database. */
   geoReplication?: DatabasePropertiesGeoReplication;
-  /**
-   * Version of Redis the database is running on, e.g. '6.0'
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly redisVersion?: string;
-  /** Option to defer upgrade when newest version is released - default is NotDeferred. Learn more: https://aka.ms/redisversionupgrade */
-  deferUpgrade?: DeferUpgradeSetting;
-  /** This property can be Enabled/Disabled to allow or deny access with the current access keys. Can be updated even after database is created. */
-  accessKeysAuthentication?: AccessKeysAuthentication;
 }
 
 /** The secret access keys used for authenticating connections to redis */
@@ -458,23 +402,6 @@ export interface ExportClusterParameters {
   sasUri: string;
 }
 
-/** The user associated with the access policy. */
-export interface AccessPolicyAssignmentPropertiesUser {
-  /** The object ID of the user. */
-  objectId?: string;
-}
-
-/** The response of a list-all operation. */
-export interface AccessPolicyAssignmentList {
-  /** List of access policy assignments. */
-  value?: AccessPolicyAssignment[];
-  /**
-   * The URI to fetch the next page of results.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly nextLink?: string;
-}
-
 /** List of private endpoint connection associated with the specified storage account */
 export interface PrivateEndpointConnectionListResult {
   /** Array of private endpoint connections */
@@ -487,7 +414,7 @@ export interface PrivateLinkResourceListResult {
   value?: PrivateLinkResource[];
 }
 
-/** Parameters for a redis enterprise active geo-replication force unlink operation. */
+/** Parameters for a Redis Enterprise Active Geo Replication Force Unlink operation. */
 export interface ForceUnlinkParameters {
   /** The resource IDs of the database resources to be unlinked. */
   ids: string[];
@@ -495,10 +422,51 @@ export interface ForceUnlinkParameters {
 
 /** Parameters for reconfiguring active geo-replication, of an existing database that was previously unlinked from a replication group. */
 export interface ForceLinkParameters {
+  /** Properties to configure geo replication for this database. */
+  geoReplication: ForceLinkParametersGeoReplication;
+}
+
+/** Properties to configure geo replication for this database. */
+export interface ForceLinkParametersGeoReplication {
   /** The name of the group of linked database resources. This should match the existing replication group name. */
-  groupNickname: string;
+  groupNickname?: string;
   /** The resource IDs of the databases that are expected to be linked and included in the replication group. This parameter is used to validate that the linking is to the expected (unlinked) part of the replication group, if it is splintered. */
-  linkedDatabases: LinkedDatabase[];
+  linkedDatabases?: LinkedDatabase[];
+}
+
+/** Common error response for all Azure Resource Manager APIs to return error details for failed operations. (This also follows the OData error response format.). */
+export interface ErrorResponseAutoGenerated {
+  /** The error object. */
+  error?: ErrorDetailAutoGenerated;
+}
+
+/** The error detail. */
+export interface ErrorDetailAutoGenerated {
+  /**
+   * The error code.
+   * NOTE: This property will not be serialized. It can only be populated by the server.
+   */
+  readonly code?: string;
+  /**
+   * The error message.
+   * NOTE: This property will not be serialized. It can only be populated by the server.
+   */
+  readonly message?: string;
+  /**
+   * The error target.
+   * NOTE: This property will not be serialized. It can only be populated by the server.
+   */
+  readonly target?: string;
+  /**
+   * The error details.
+   * NOTE: This property will not be serialized. It can only be populated by the server.
+   */
+  readonly details?: ErrorDetailAutoGenerated[];
+  /**
+   * The error additional info.
+   * NOTE: This property will not be serialized. It can only be populated by the server.
+   */
+  readonly additionalInfo?: ErrorAdditionalInfo[];
 }
 
 /** Parameters for a Redis Enterprise active geo-replication flush operation */
@@ -529,7 +497,7 @@ export interface TrackedResource extends Resource {
 }
 
 /** The resource model definition for a Azure Resource Manager proxy resource. It will not have tags and a location */
-export interface ProxyResourceAutoGenerated extends Resource {}
+export interface ProxyResource extends Resource {}
 
 /** A private link resource */
 export interface PrivateLinkResource extends Resource {
@@ -547,10 +515,7 @@ export interface PrivateLinkResource extends Resource {
   requiredZoneNames?: string[];
 }
 
-/** The resource model definition for a Azure Resource Manager proxy resource. It will not have tags and a location */
-export interface ProxyResource extends ResourceAutoGenerated {}
-
-/** Describes the Redis Enterprise cluster */
+/** Describes the RedisEnterprise cluster */
 export interface Cluster extends TrackedResource {
   /** The SKU to create, which affects price, performance, and features. */
   sku: Sku;
@@ -558,9 +523,7 @@ export interface Cluster extends TrackedResource {
   zones?: string[];
   /** The identity of the resource. */
   identity?: ManagedServiceIdentity;
-  /** Enabled by default. If highAvailability is disabled, the data set is not replicated. This affects the availability SLA, and increases the risk of data loss. */
-  highAvailability?: HighAvailability;
-  /** The minimum TLS version for the cluster to support, e.g. '1.2'. Newer versions can be added in the future. Note that TLS 1.0 and TLS 1.1 are now completely obsolete -- you cannot use them. They are mentioned only for the sake of consistency with old API versions. */
+  /** The minimum TLS version for the cluster to support, e.g. '1.2' */
   minimumTlsVersion?: TlsVersion;
   /** Encryption-at-rest configuration for the cluster. */
   encryption?: ClusterPropertiesEncryption;
@@ -574,11 +537,6 @@ export interface Cluster extends TrackedResource {
    * NOTE: This property will not be serialized. It can only be populated by the server.
    */
   readonly provisioningState?: ProvisioningState;
-  /**
-   * Explains the current redundancy strategy of the cluster, which affects the expected SLA.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly redundancyMode?: RedundancyMode;
   /**
    * Current resource status of the cluster
    * NOTE: This property will not be serialized. It can only be populated by the server.
@@ -590,26 +548,13 @@ export interface Cluster extends TrackedResource {
    */
   readonly redisVersion?: string;
   /**
-   * List of private endpoint connections associated with the specified Redis Enterprise cluster
+   * List of private endpoint connections associated with the specified RedisEnterprise cluster
    * NOTE: This property will not be serialized. It can only be populated by the server.
    */
   readonly privateEndpointConnections?: PrivateEndpointConnection[];
 }
 
-/** Describes the access policy assignment of Redis Enterprise database */
-export interface AccessPolicyAssignment extends ProxyResourceAutoGenerated {
-  /**
-   * Current provisioning status of the access policy assignment.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly provisioningState?: ProvisioningState;
-  /** Name of access policy under specific access policy assignment. Only "default" policy is supported for now. */
-  accessPolicyName?: string;
-  /** The user associated with the access policy. */
-  user?: AccessPolicyAssignmentPropertiesUser;
-}
-
-/** Describes a database on the Redis Enterprise cluster */
+/** Describes a database on the RedisEnterprise cluster */
 export interface Database extends ProxyResource {
   /** Specifies whether redis clients can connect using TLS-encrypted or plaintext redis protocols. Default is TLS-encrypted. */
   clientProtocol?: Protocol;
@@ -625,7 +570,7 @@ export interface Database extends ProxyResource {
    * NOTE: This property will not be serialized. It can only be populated by the server.
    */
   readonly resourceState?: ResourceState;
-  /** Clustering policy - default is OSSCluster. This property must be chosen at create time, and cannot be changed without deleting the database. */
+  /** Clustering policy - default is OSSCluster. Specified at create time. */
   clusteringPolicy?: ClusteringPolicy;
   /** Redis eviction policy - default is VolatileLRU */
   evictionPolicy?: EvictionPolicy;
@@ -635,15 +580,6 @@ export interface Database extends ProxyResource {
   modules?: Module[];
   /** Optional set of properties to configure geo replication for this database. */
   geoReplication?: DatabasePropertiesGeoReplication;
-  /**
-   * Version of Redis the database is running on, e.g. '6.0'
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly redisVersion?: string;
-  /** Option to defer upgrade when newest version is released - default is NotDeferred. Learn more: https://aka.ms/redisversionupgrade */
-  deferUpgrade?: DeferUpgradeSetting;
-  /** This property can be Enabled/Disabled to allow or deny access with the current access keys. Can be updated even after database is created. */
-  accessKeysAuthentication?: AccessKeysAuthentication;
 }
 
 /** Defines headers for RedisEnterprise_update operation. */
@@ -726,22 +662,6 @@ export interface DatabasesFlushHeaders {
   azureAsyncOperation?: string;
 }
 
-/** Defines headers for Databases_upgradeDBRedisVersion operation. */
-export interface DatabasesUpgradeDBRedisVersionHeaders {
-  /** Location URI to poll for result */
-  location?: string;
-  /** URI to poll for the operation status */
-  azureAsyncOperation?: string;
-}
-
-/** Defines headers for AccessPolicyAssignment_delete operation. */
-export interface AccessPolicyAssignmentDeleteHeaders {
-  /** Location URI to poll for result */
-  location?: string;
-  /** Azure-AsyncOperation URI to poll for result */
-  azureAsyncOperation?: string;
-}
-
 /** Defines headers for PrivateEndpointConnections_delete operation. */
 export interface PrivateEndpointConnectionsDeleteHeaders {
   /** Location URI to poll for result */
@@ -810,94 +730,6 @@ export enum KnownSkuName {
   EnterpriseFlashF700 = "EnterpriseFlash_F700",
   /** EnterpriseFlashF1500 */
   EnterpriseFlashF1500 = "EnterpriseFlash_F1500",
-  /** BalancedB0 */
-  BalancedB0 = "Balanced_B0",
-  /** BalancedB1 */
-  BalancedB1 = "Balanced_B1",
-  /** BalancedB3 */
-  BalancedB3 = "Balanced_B3",
-  /** BalancedB5 */
-  BalancedB5 = "Balanced_B5",
-  /** BalancedB10 */
-  BalancedB10 = "Balanced_B10",
-  /** BalancedB20 */
-  BalancedB20 = "Balanced_B20",
-  /** BalancedB50 */
-  BalancedB50 = "Balanced_B50",
-  /** BalancedB100 */
-  BalancedB100 = "Balanced_B100",
-  /** BalancedB150 */
-  BalancedB150 = "Balanced_B150",
-  /** BalancedB250 */
-  BalancedB250 = "Balanced_B250",
-  /** BalancedB350 */
-  BalancedB350 = "Balanced_B350",
-  /** BalancedB500 */
-  BalancedB500 = "Balanced_B500",
-  /** BalancedB700 */
-  BalancedB700 = "Balanced_B700",
-  /** BalancedB1000 */
-  BalancedB1000 = "Balanced_B1000",
-  /** MemoryOptimizedM10 */
-  MemoryOptimizedM10 = "MemoryOptimized_M10",
-  /** MemoryOptimizedM20 */
-  MemoryOptimizedM20 = "MemoryOptimized_M20",
-  /** MemoryOptimizedM50 */
-  MemoryOptimizedM50 = "MemoryOptimized_M50",
-  /** MemoryOptimizedM100 */
-  MemoryOptimizedM100 = "MemoryOptimized_M100",
-  /** MemoryOptimizedM150 */
-  MemoryOptimizedM150 = "MemoryOptimized_M150",
-  /** MemoryOptimizedM250 */
-  MemoryOptimizedM250 = "MemoryOptimized_M250",
-  /** MemoryOptimizedM350 */
-  MemoryOptimizedM350 = "MemoryOptimized_M350",
-  /** MemoryOptimizedM500 */
-  MemoryOptimizedM500 = "MemoryOptimized_M500",
-  /** MemoryOptimizedM700 */
-  MemoryOptimizedM700 = "MemoryOptimized_M700",
-  /** MemoryOptimizedM1000 */
-  MemoryOptimizedM1000 = "MemoryOptimized_M1000",
-  /** MemoryOptimizedM1500 */
-  MemoryOptimizedM1500 = "MemoryOptimized_M1500",
-  /** MemoryOptimizedM2000 */
-  MemoryOptimizedM2000 = "MemoryOptimized_M2000",
-  /** ComputeOptimizedX3 */
-  ComputeOptimizedX3 = "ComputeOptimized_X3",
-  /** ComputeOptimizedX5 */
-  ComputeOptimizedX5 = "ComputeOptimized_X5",
-  /** ComputeOptimizedX10 */
-  ComputeOptimizedX10 = "ComputeOptimized_X10",
-  /** ComputeOptimizedX20 */
-  ComputeOptimizedX20 = "ComputeOptimized_X20",
-  /** ComputeOptimizedX50 */
-  ComputeOptimizedX50 = "ComputeOptimized_X50",
-  /** ComputeOptimizedX100 */
-  ComputeOptimizedX100 = "ComputeOptimized_X100",
-  /** ComputeOptimizedX150 */
-  ComputeOptimizedX150 = "ComputeOptimized_X150",
-  /** ComputeOptimizedX250 */
-  ComputeOptimizedX250 = "ComputeOptimized_X250",
-  /** ComputeOptimizedX350 */
-  ComputeOptimizedX350 = "ComputeOptimized_X350",
-  /** ComputeOptimizedX500 */
-  ComputeOptimizedX500 = "ComputeOptimized_X500",
-  /** ComputeOptimizedX700 */
-  ComputeOptimizedX700 = "ComputeOptimized_X700",
-  /** FlashOptimizedA250 */
-  FlashOptimizedA250 = "FlashOptimized_A250",
-  /** FlashOptimizedA500 */
-  FlashOptimizedA500 = "FlashOptimized_A500",
-  /** FlashOptimizedA700 */
-  FlashOptimizedA700 = "FlashOptimized_A700",
-  /** FlashOptimizedA1000 */
-  FlashOptimizedA1000 = "FlashOptimized_A1000",
-  /** FlashOptimizedA1500 */
-  FlashOptimizedA1500 = "FlashOptimized_A1500",
-  /** FlashOptimizedA2000 */
-  FlashOptimizedA2000 = "FlashOptimized_A2000",
-  /** FlashOptimizedA4500 */
-  FlashOptimizedA4500 = "FlashOptimized_A4500",
 }
 
 /**
@@ -915,51 +747,7 @@ export enum KnownSkuName {
  * **Enterprise_E400** \
  * **EnterpriseFlash_F300** \
  * **EnterpriseFlash_F700** \
- * **EnterpriseFlash_F1500** \
- * **Balanced_B0** \
- * **Balanced_B1** \
- * **Balanced_B3** \
- * **Balanced_B5** \
- * **Balanced_B10** \
- * **Balanced_B20** \
- * **Balanced_B50** \
- * **Balanced_B100** \
- * **Balanced_B150** \
- * **Balanced_B250** \
- * **Balanced_B350** \
- * **Balanced_B500** \
- * **Balanced_B700** \
- * **Balanced_B1000** \
- * **MemoryOptimized_M10** \
- * **MemoryOptimized_M20** \
- * **MemoryOptimized_M50** \
- * **MemoryOptimized_M100** \
- * **MemoryOptimized_M150** \
- * **MemoryOptimized_M250** \
- * **MemoryOptimized_M350** \
- * **MemoryOptimized_M500** \
- * **MemoryOptimized_M700** \
- * **MemoryOptimized_M1000** \
- * **MemoryOptimized_M1500** \
- * **MemoryOptimized_M2000** \
- * **ComputeOptimized_X3** \
- * **ComputeOptimized_X5** \
- * **ComputeOptimized_X10** \
- * **ComputeOptimized_X20** \
- * **ComputeOptimized_X50** \
- * **ComputeOptimized_X100** \
- * **ComputeOptimized_X150** \
- * **ComputeOptimized_X250** \
- * **ComputeOptimized_X350** \
- * **ComputeOptimized_X500** \
- * **ComputeOptimized_X700** \
- * **FlashOptimized_A250** \
- * **FlashOptimized_A500** \
- * **FlashOptimized_A700** \
- * **FlashOptimized_A1000** \
- * **FlashOptimized_A1500** \
- * **FlashOptimized_A2000** \
- * **FlashOptimized_A4500**
+ * **EnterpriseFlash_F1500**
  */
 export type SkuName = string;
 
@@ -987,24 +775,6 @@ export enum KnownManagedServiceIdentityType {
  */
 export type ManagedServiceIdentityType = string;
 
-/** Known values of {@link HighAvailability} that the service accepts. */
-export enum KnownHighAvailability {
-  /** Enabled */
-  Enabled = "Enabled",
-  /** Disabled */
-  Disabled = "Disabled",
-}
-
-/**
- * Defines values for HighAvailability. \
- * {@link KnownHighAvailability} can be used interchangeably with HighAvailability,
- *  this enum contains the known values that the service supports.
- * ### Known values supported by the service
- * **Enabled** \
- * **Disabled**
- */
-export type HighAvailability = string;
-
 /** Known values of {@link TlsVersion} that the service accepts. */
 export enum KnownTlsVersion {
   /** One0 */
@@ -1074,27 +844,6 @@ export enum KnownProvisioningState {
  */
 export type ProvisioningState = string;
 
-/** Known values of {@link RedundancyMode} that the service accepts. */
-export enum KnownRedundancyMode {
-  /** No redundancy. Availability loss will occur. */
-  None = "None",
-  /** Local redundancy with high availability. */
-  LR = "LR",
-  /** Zone redundant. Higher availability. */
-  ZR = "ZR",
-}
-
-/**
- * Defines values for RedundancyMode. \
- * {@link KnownRedundancyMode} can be used interchangeably with RedundancyMode,
- *  this enum contains the known values that the service supports.
- * ### Known values supported by the service
- * **None**: No redundancy. Availability loss will occur. \
- * **LR**: Local redundancy with high availability. \
- * **ZR**: Zone redundant. Higher availability.
- */
-export type RedundancyMode = string;
-
 /** Known values of {@link ResourceState} that the service accepts. */
 export enum KnownResourceState {
   /** Running */
@@ -1214,9 +963,9 @@ export type Protocol = string;
 
 /** Known values of {@link ClusteringPolicy} that the service accepts. */
 export enum KnownClusteringPolicy {
-  /** Enterprise clustering policy uses only the classic redis protocol, which does not support redis cluster commands. */
+  /** EnterpriseCluster */
   EnterpriseCluster = "EnterpriseCluster",
-  /** OSS clustering policy follows the redis cluster specification, and requires all clients to support redis clustering. */
+  /** OSSCluster */
   OSSCluster = "OSSCluster",
 }
 
@@ -1225,8 +974,8 @@ export enum KnownClusteringPolicy {
  * {@link KnownClusteringPolicy} can be used interchangeably with ClusteringPolicy,
  *  this enum contains the known values that the service supports.
  * ### Known values supported by the service
- * **EnterpriseCluster**: Enterprise clustering policy uses only the classic redis protocol, which does not support redis cluster commands. \
- * **OSSCluster**: OSS clustering policy follows the redis cluster specification, and requires all clients to support redis clustering.
+ * **EnterpriseCluster** \
+ * **OSSCluster**
  */
 export type ClusteringPolicy = string;
 
@@ -1331,66 +1080,6 @@ export enum KnownLinkState {
  * **UnlinkFailed**
  */
 export type LinkState = string;
-
-/** Known values of {@link DeferUpgradeSetting} that the service accepts. */
-export enum KnownDeferUpgradeSetting {
-  /** Deferred */
-  Deferred = "Deferred",
-  /** NotDeferred */
-  NotDeferred = "NotDeferred",
-}
-
-/**
- * Defines values for DeferUpgradeSetting. \
- * {@link KnownDeferUpgradeSetting} can be used interchangeably with DeferUpgradeSetting,
- *  this enum contains the known values that the service supports.
- * ### Known values supported by the service
- * **Deferred** \
- * **NotDeferred**
- */
-export type DeferUpgradeSetting = string;
-
-/** Known values of {@link AccessKeysAuthentication} that the service accepts. */
-export enum KnownAccessKeysAuthentication {
-  /** Disabled */
-  Disabled = "Disabled",
-  /** Enabled */
-  Enabled = "Enabled",
-}
-
-/**
- * Defines values for AccessKeysAuthentication. \
- * {@link KnownAccessKeysAuthentication} can be used interchangeably with AccessKeysAuthentication,
- *  this enum contains the known values that the service supports.
- * ### Known values supported by the service
- * **Disabled** \
- * **Enabled**
- */
-export type AccessKeysAuthentication = string;
-
-/** Known values of {@link CreatedByType} that the service accepts. */
-export enum KnownCreatedByType {
-  /** User */
-  User = "User",
-  /** Application */
-  Application = "Application",
-  /** ManagedIdentity */
-  ManagedIdentity = "ManagedIdentity",
-  /** Key */
-  Key = "Key",
-}
-
-/**
- * Defines values for CreatedByType. \
- * {@link KnownCreatedByType} can be used interchangeably with CreatedByType,
- *  this enum contains the known values that the service supports.
- * ### Known values supported by the service
- * **User** \
- * **Application** \
- * **ManagedIdentity** \
- * **Key**
- */
-export type CreatedByType = string;
 /** Defines values for AccessKeyType. */
 export type AccessKeyType = "Primary" | "Secondary";
 
@@ -1598,19 +1287,6 @@ export interface DatabasesFlushOptionalParams
   resumeFrom?: string;
 }
 
-/** Optional parameters. */
-export interface DatabasesUpgradeDBRedisVersionOptionalParams
-  extends coreClient.OperationOptions {
-  /** Delay to wait until next poll, in milliseconds. */
-  updateIntervalInMs?: number;
-  /** A serialized poller which can be used to resume an existing paused Long-Running-Operation. */
-  resumeFrom?: string;
-}
-
-/** Contains response data for the upgradeDBRedisVersion operation. */
-export type DatabasesUpgradeDBRedisVersionResponse =
-  DatabasesUpgradeDBRedisVersionHeaders;
-
 /** Optional parameters. */
 export interface DatabasesListByClusterNextOptionalParams
   extends coreClient.OperationOptions {}
@@ -1618,52 +1294,6 @@ export interface DatabasesListByClusterNextOptionalParams
 /** Contains response data for the listByClusterNext operation. */
 export type DatabasesListByClusterNextResponse = DatabaseList;
 
-/** Optional parameters. */
-export interface AccessPolicyAssignmentCreateUpdateOptionalParams
-  extends coreClient.OperationOptions {
-  /** Delay to wait until next poll, in milliseconds. */
-  updateIntervalInMs?: number;
-  /** A serialized poller which can be used to resume an existing paused Long-Running-Operation. */
-  resumeFrom?: string;
-}
-
-/** Contains response data for the createUpdate operation. */
-export type AccessPolicyAssignmentCreateUpdateResponse = AccessPolicyAssignment;
-
-/** Optional parameters. */
-export interface AccessPolicyAssignmentGetOptionalParams
-  extends coreClient.OperationOptions {}
-
-/** Contains response data for the get operation. */
-export type AccessPolicyAssignmentGetResponse = AccessPolicyAssignment;
-
-/** Optional parameters. */
-export interface AccessPolicyAssignmentDeleteOptionalParams
-  extends coreClient.OperationOptions {
-  /** Delay to wait until next poll, in milliseconds. */
-  updateIntervalInMs?: number;
-  /** A serialized poller which can be used to resume an existing paused Long-Running-Operation. */
-  resumeFrom?: string;
-}
-
-/** Contains response data for the delete operation. */
-export type AccessPolicyAssignmentDeleteResponse =
-  AccessPolicyAssignmentDeleteHeaders;
-
-/** Optional parameters. */
-export interface AccessPolicyAssignmentListOptionalParams
-  extends coreClient.OperationOptions {}
-
-/** Contains response data for the list operation. */
-export type AccessPolicyAssignmentListResponse = AccessPolicyAssignmentList;
-
-/** Optional parameters. */
-export interface AccessPolicyAssignmentListNextOptionalParams
-  extends coreClient.OperationOptions {}
-
-/** Contains response data for the listNext operation. */
-export type AccessPolicyAssignmentListNextResponse = AccessPolicyAssignmentList;
-
 /** Optional parameters. */
 export interface PrivateEndpointConnectionsListOptionalParams
   extends coreClient.OperationOptions {}
diff --git a/sdk/redisenterprise/arm-redisenterprisecache/src/models/mappers.ts b/sdk/redisenterprise/arm-redisenterprisecache/src/models/mappers.ts
index 3b9324c9fe33..a91c72ddf8cd 100644
--- a/sdk/redisenterprise/arm-redisenterprisecache/src/models/mappers.ts
+++ b/sdk/redisenterprise/arm-redisenterprisecache/src/models/mappers.ts
@@ -506,12 +506,6 @@ export const ClusterUpdate: coreClient.CompositeMapper = {
           value: { type: { name: "String" } },
         },
       },
-      highAvailability: {
-        serializedName: "properties.highAvailability",
-        type: {
-          name: "String",
-        },
-      },
       minimumTlsVersion: {
         serializedName: "properties.minimumTlsVersion",
         type: {
@@ -539,13 +533,6 @@ export const ClusterUpdate: coreClient.CompositeMapper = {
           name: "String",
         },
       },
-      redundancyMode: {
-        serializedName: "properties.redundancyMode",
-        readOnly: true,
-        type: {
-          name: "String",
-        },
-      },
       resourceState: {
         serializedName: "properties.resourceState",
         readOnly: true,
@@ -744,88 +731,6 @@ export const LinkedDatabase: coreClient.CompositeMapper = {
   },
 };
 
-export const ResourceAutoGenerated: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "ResourceAutoGenerated",
-    modelProperties: {
-      id: {
-        serializedName: "id",
-        readOnly: true,
-        type: {
-          name: "String",
-        },
-      },
-      name: {
-        serializedName: "name",
-        readOnly: true,
-        type: {
-          name: "String",
-        },
-      },
-      type: {
-        serializedName: "type",
-        readOnly: true,
-        type: {
-          name: "String",
-        },
-      },
-      systemData: {
-        serializedName: "systemData",
-        type: {
-          name: "Composite",
-          className: "SystemData",
-        },
-      },
-    },
-  },
-};
-
-export const SystemData: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "SystemData",
-    modelProperties: {
-      createdBy: {
-        serializedName: "createdBy",
-        type: {
-          name: "String",
-        },
-      },
-      createdByType: {
-        serializedName: "createdByType",
-        type: {
-          name: "String",
-        },
-      },
-      createdAt: {
-        serializedName: "createdAt",
-        type: {
-          name: "DateTime",
-        },
-      },
-      lastModifiedBy: {
-        serializedName: "lastModifiedBy",
-        type: {
-          name: "String",
-        },
-      },
-      lastModifiedByType: {
-        serializedName: "lastModifiedByType",
-        type: {
-          name: "String",
-        },
-      },
-      lastModifiedAt: {
-        serializedName: "lastModifiedAt",
-        type: {
-          name: "DateTime",
-        },
-      },
-    },
-  },
-};
-
 export const DatabaseUpdate: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
@@ -895,25 +800,6 @@ export const DatabaseUpdate: coreClient.CompositeMapper = {
           className: "DatabasePropertiesGeoReplication",
         },
       },
-      redisVersion: {
-        serializedName: "properties.redisVersion",
-        readOnly: true,
-        type: {
-          name: "String",
-        },
-      },
-      deferUpgrade: {
-        serializedName: "properties.deferUpgrade",
-        type: {
-          name: "String",
-        },
-      },
-      accessKeysAuthentication: {
-        serializedName: "properties.accessKeysAuthentication",
-        type: {
-          name: "String",
-        },
-      },
     },
   },
 };
@@ -995,50 +881,6 @@ export const ExportClusterParameters: coreClient.CompositeMapper = {
   },
 };
 
-export const AccessPolicyAssignmentPropertiesUser: coreClient.CompositeMapper =
-  {
-    type: {
-      name: "Composite",
-      className: "AccessPolicyAssignmentPropertiesUser",
-      modelProperties: {
-        objectId: {
-          serializedName: "objectId",
-          type: {
-            name: "String",
-          },
-        },
-      },
-    },
-  };
-
-export const AccessPolicyAssignmentList: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "AccessPolicyAssignmentList",
-    modelProperties: {
-      value: {
-        serializedName: "value",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "AccessPolicyAssignment",
-            },
-          },
-        },
-      },
-      nextLink: {
-        serializedName: "nextLink",
-        readOnly: true,
-        type: {
-          name: "String",
-        },
-      },
-    },
-  },
-};
-
 export const PrivateEndpointConnectionListResult: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
@@ -1106,17 +948,31 @@ export const ForceLinkParameters: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "ForceLinkParameters",
+    modelProperties: {
+      geoReplication: {
+        serializedName: "geoReplication",
+        type: {
+          name: "Composite",
+          className: "ForceLinkParametersGeoReplication",
+        },
+      },
+    },
+  },
+};
+
+export const ForceLinkParametersGeoReplication: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "ForceLinkParametersGeoReplication",
     modelProperties: {
       groupNickname: {
         serializedName: "groupNickname",
-        required: true,
         type: {
           name: "String",
         },
       },
       linkedDatabases: {
         serializedName: "linkedDatabases",
-        required: true,
         type: {
           name: "Sequence",
           element: {
@@ -1131,6 +987,78 @@ export const ForceLinkParameters: coreClient.CompositeMapper = {
   },
 };
 
+export const ErrorResponseAutoGenerated: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "ErrorResponseAutoGenerated",
+    modelProperties: {
+      error: {
+        serializedName: "error",
+        type: {
+          name: "Composite",
+          className: "ErrorDetailAutoGenerated",
+        },
+      },
+    },
+  },
+};
+
+export const ErrorDetailAutoGenerated: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "ErrorDetailAutoGenerated",
+    modelProperties: {
+      code: {
+        serializedName: "code",
+        readOnly: true,
+        type: {
+          name: "String",
+        },
+      },
+      message: {
+        serializedName: "message",
+        readOnly: true,
+        type: {
+          name: "String",
+        },
+      },
+      target: {
+        serializedName: "target",
+        readOnly: true,
+        type: {
+          name: "String",
+        },
+      },
+      details: {
+        serializedName: "details",
+        readOnly: true,
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "ErrorDetailAutoGenerated",
+            },
+          },
+        },
+      },
+      additionalInfo: {
+        serializedName: "additionalInfo",
+        readOnly: true,
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "ErrorAdditionalInfo",
+            },
+          },
+        },
+      },
+    },
+  },
+};
+
 export const FlushParameters: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
@@ -1206,10 +1134,10 @@ export const TrackedResource: coreClient.CompositeMapper = {
   },
 };
 
-export const ProxyResourceAutoGenerated: coreClient.CompositeMapper = {
+export const ProxyResource: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "ProxyResourceAutoGenerated",
+    className: "ProxyResource",
     modelProperties: {
       ...Resource.type.modelProperties,
     },
@@ -1256,16 +1184,6 @@ export const PrivateLinkResource: coreClient.CompositeMapper = {
   },
 };
 
-export const ProxyResource: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "ProxyResource",
-    modelProperties: {
-      ...ResourceAutoGenerated.type.modelProperties,
-    },
-  },
-};
-
 export const Cluster: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
@@ -1297,12 +1215,6 @@ export const Cluster: coreClient.CompositeMapper = {
           className: "ManagedServiceIdentity",
         },
       },
-      highAvailability: {
-        serializedName: "properties.highAvailability",
-        type: {
-          name: "String",
-        },
-      },
       minimumTlsVersion: {
         serializedName: "properties.minimumTlsVersion",
         type: {
@@ -1330,13 +1242,6 @@ export const Cluster: coreClient.CompositeMapper = {
           name: "String",
         },
       },
-      redundancyMode: {
-        serializedName: "properties.redundancyMode",
-        readOnly: true,
-        type: {
-          name: "String",
-        },
-      },
       resourceState: {
         serializedName: "properties.resourceState",
         readOnly: true,
@@ -1368,41 +1273,6 @@ export const Cluster: coreClient.CompositeMapper = {
   },
 };
 
-export const AccessPolicyAssignment: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "AccessPolicyAssignment",
-    modelProperties: {
-      ...ProxyResourceAutoGenerated.type.modelProperties,
-      provisioningState: {
-        serializedName: "properties.provisioningState",
-        readOnly: true,
-        type: {
-          name: "String",
-        },
-      },
-      accessPolicyName: {
-        constraints: {
-          Pattern: new RegExp(
-            "^([a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]|[a-zA-Z0-9])$",
-          ),
-        },
-        serializedName: "properties.accessPolicyName",
-        type: {
-          name: "String",
-        },
-      },
-      user: {
-        serializedName: "properties.user",
-        type: {
-          name: "Composite",
-          className: "AccessPolicyAssignmentPropertiesUser",
-        },
-      },
-    },
-  },
-};
-
 export const Database: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
@@ -1473,25 +1343,6 @@ export const Database: coreClient.CompositeMapper = {
           className: "DatabasePropertiesGeoReplication",
         },
       },
-      redisVersion: {
-        serializedName: "properties.redisVersion",
-        readOnly: true,
-        type: {
-          name: "String",
-        },
-      },
-      deferUpgrade: {
-        serializedName: "properties.deferUpgrade",
-        type: {
-          name: "String",
-        },
-      },
-      accessKeysAuthentication: {
-        serializedName: "properties.accessKeysAuthentication",
-        type: {
-          name: "String",
-        },
-      },
     },
   },
 };
@@ -1707,49 +1558,6 @@ export const DatabasesFlushHeaders: coreClient.CompositeMapper = {
   },
 };
 
-export const DatabasesUpgradeDBRedisVersionHeaders: coreClient.CompositeMapper =
-  {
-    type: {
-      name: "Composite",
-      className: "DatabasesUpgradeDBRedisVersionHeaders",
-      modelProperties: {
-        location: {
-          serializedName: "location",
-          type: {
-            name: "String",
-          },
-        },
-        azureAsyncOperation: {
-          serializedName: "azure-asyncoperation",
-          type: {
-            name: "String",
-          },
-        },
-      },
-    },
-  };
-
-export const AccessPolicyAssignmentDeleteHeaders: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "AccessPolicyAssignmentDeleteHeaders",
-    modelProperties: {
-      location: {
-        serializedName: "location",
-        type: {
-          name: "String",
-        },
-      },
-      azureAsyncOperation: {
-        serializedName: "azure-asyncoperation",
-        type: {
-          name: "String",
-        },
-      },
-    },
-  },
-};
-
 export const PrivateEndpointConnectionsDeleteHeaders: coreClient.CompositeMapper =
   {
     type: {
diff --git a/sdk/redisenterprise/arm-redisenterprisecache/src/models/parameters.ts b/sdk/redisenterprise/arm-redisenterprisecache/src/models/parameters.ts
index 2649de6bf0d7..bbb34be74290 100644
--- a/sdk/redisenterprise/arm-redisenterprisecache/src/models/parameters.ts
+++ b/sdk/redisenterprise/arm-redisenterprisecache/src/models/parameters.ts
@@ -22,7 +22,6 @@ import {
   ForceUnlinkParameters as ForceUnlinkParametersMapper,
   ForceLinkParameters as ForceLinkParametersMapper,
   FlushParameters as FlushParametersMapper,
-  AccessPolicyAssignment as AccessPolicyAssignmentMapper,
   PrivateEndpointConnection as PrivateEndpointConnectionMapper,
 } from "../models/mappers.js";
 
@@ -53,7 +52,7 @@ export const $host: OperationURLParameter = {
 export const apiVersion: OperationQueryParameter = {
   parameterPath: "apiVersion",
   mapper: {
-    defaultValue: "2024-09-01-preview",
+    defaultValue: "2025-04-01",
     isConstant: true,
     serializedName: "api-version",
     type: {
@@ -152,7 +151,7 @@ export const clusterName: OperationURLParameter = {
   parameterPath: "clusterName",
   mapper: {
     constraints: {
-      Pattern: new RegExp("^[A-Za-z0-9]{1,60}$"),
+      Pattern: new RegExp("^(?=.{1,60}$)[A-Za-z0-9]+(-[A-Za-z0-9]+)*$"),
     },
     serializedName: "clusterName",
     required: true,
@@ -176,7 +175,7 @@ export const databaseName: OperationURLParameter = {
   parameterPath: "databaseName",
   mapper: {
     constraints: {
-      Pattern: new RegExp("^[A-Za-z0-9]{1,60}$"),
+      Pattern: new RegExp("^(?=.{1,60}$)[A-Za-z0-9]+(-[A-Za-z0-9]+)*$"),
     },
     serializedName: "databaseName",
     required: true,
@@ -221,25 +220,6 @@ export const parameters9: OperationParameter = {
   mapper: FlushParametersMapper,
 };
 
-export const parameters10: OperationParameter = {
-  parameterPath: "parameters",
-  mapper: AccessPolicyAssignmentMapper,
-};
-
-export const accessPolicyAssignmentName: OperationURLParameter = {
-  parameterPath: "accessPolicyAssignmentName",
-  mapper: {
-    constraints: {
-      Pattern: new RegExp("^[A-Za-z0-9]{1,60}$"),
-    },
-    serializedName: "accessPolicyAssignmentName",
-    required: true,
-    type: {
-      name: "String",
-    },
-  },
-};
-
 export const privateEndpointConnectionName: OperationURLParameter = {
   parameterPath: "privateEndpointConnectionName",
   mapper: {
diff --git a/sdk/redisenterprise/arm-redisenterprisecache/src/operations/accessPolicyAssignmentOperations.ts b/sdk/redisenterprise/arm-redisenterprisecache/src/operations/accessPolicyAssignmentOperations.ts
deleted file mode 100644
index adbc08eeb0d3..000000000000
--- a/sdk/redisenterprise/arm-redisenterprisecache/src/operations/accessPolicyAssignmentOperations.ts
+++ /dev/null
@@ -1,569 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT License.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- * Changes may cause incorrect behavior and will be lost if the code is regenerated.
- */
-
-import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
-import { setContinuationToken } from "../pagingHelper.js";
-import { AccessPolicyAssignmentOperations } from "../operationsInterfaces/index.js";
-import * as coreClient from "@azure/core-client";
-import * as Mappers from "../models/mappers.js";
-import * as Parameters from "../models/parameters.js";
-import { RedisEnterpriseManagementClient } from "../redisEnterpriseManagementClient.js";
-import {
-  SimplePollerLike,
-  OperationState,
-  createHttpPoller,
-} from "@azure/core-lro";
-import { createLroSpec } from "../lroImpl.js";
-import {
-  AccessPolicyAssignment,
-  AccessPolicyAssignmentListNextOptionalParams,
-  AccessPolicyAssignmentListOptionalParams,
-  AccessPolicyAssignmentListResponse,
-  AccessPolicyAssignmentCreateUpdateOptionalParams,
-  AccessPolicyAssignmentCreateUpdateResponse,
-  AccessPolicyAssignmentGetOptionalParams,
-  AccessPolicyAssignmentGetResponse,
-  AccessPolicyAssignmentDeleteOptionalParams,
-  AccessPolicyAssignmentDeleteResponse,
-  AccessPolicyAssignmentListNextResponse,
-} from "../models/index.js";
-
-/// <reference lib="esnext.asynciterable" />
-/** Class containing AccessPolicyAssignmentOperations operations. */
-export class AccessPolicyAssignmentOperationsImpl
-  implements AccessPolicyAssignmentOperations
-{
-  private readonly client: RedisEnterpriseManagementClient;
-
-  /**
-   * Initialize a new instance of the class AccessPolicyAssignmentOperations class.
-   * @param client Reference to the service client
-   */
-  constructor(client: RedisEnterpriseManagementClient) {
-    this.client = client;
-  }
-
-  /**
-   * Gets all access policy assignments..
-   * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
-   * @param databaseName The name of the Redis Enterprise database.
-   * @param options The options parameters.
-   */
-  public list(
-    resourceGroupName: string,
-    clusterName: string,
-    databaseName: string,
-    options?: AccessPolicyAssignmentListOptionalParams,
-  ): PagedAsyncIterableIterator<AccessPolicyAssignment> {
-    const iter = this.listPagingAll(
-      resourceGroupName,
-      clusterName,
-      databaseName,
-      options,
-    );
-    return {
-      next() {
-        return iter.next();
-      },
-      [Symbol.asyncIterator]() {
-        return this;
-      },
-      byPage: (settings?: PageSettings) => {
-        if (settings?.maxPageSize) {
-          throw new Error("maxPageSize is not supported by this operation.");
-        }
-        return this.listPagingPage(
-          resourceGroupName,
-          clusterName,
-          databaseName,
-          options,
-          settings,
-        );
-      },
-    };
-  }
-
-  private async *listPagingPage(
-    resourceGroupName: string,
-    clusterName: string,
-    databaseName: string,
-    options?: AccessPolicyAssignmentListOptionalParams,
-    settings?: PageSettings,
-  ): AsyncIterableIterator<AccessPolicyAssignment[]> {
-    let result: AccessPolicyAssignmentListResponse;
-    let continuationToken = settings?.continuationToken;
-    if (!continuationToken) {
-      result = await this._list(
-        resourceGroupName,
-        clusterName,
-        databaseName,
-        options,
-      );
-      let page = result.value || [];
-      continuationToken = result.nextLink;
-      setContinuationToken(page, continuationToken);
-      yield page;
-    }
-    while (continuationToken) {
-      result = await this._listNext(
-        resourceGroupName,
-        clusterName,
-        databaseName,
-        continuationToken,
-        options,
-      );
-      continuationToken = result.nextLink;
-      let page = result.value || [];
-      setContinuationToken(page, continuationToken);
-      yield page;
-    }
-  }
-
-  private async *listPagingAll(
-    resourceGroupName: string,
-    clusterName: string,
-    databaseName: string,
-    options?: AccessPolicyAssignmentListOptionalParams,
-  ): AsyncIterableIterator<AccessPolicyAssignment> {
-    for await (const page of this.listPagingPage(
-      resourceGroupName,
-      clusterName,
-      databaseName,
-      options,
-    )) {
-      yield* page;
-    }
-  }
-
-  /**
-   * Creates/Updates a particular access policy assignment for a database
-   * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
-   * @param databaseName The name of the Redis Enterprise database.
-   * @param accessPolicyAssignmentName The name of the Redis Enterprise database access policy
-   *                                   assignment.
-   * @param parameters Parameters supplied to the create access policy assignment for database.
-   * @param options The options parameters.
-   */
-  async beginCreateUpdate(
-    resourceGroupName: string,
-    clusterName: string,
-    databaseName: string,
-    accessPolicyAssignmentName: string,
-    parameters: AccessPolicyAssignment,
-    options?: AccessPolicyAssignmentCreateUpdateOptionalParams,
-  ): Promise<
-    SimplePollerLike<
-      OperationState<AccessPolicyAssignmentCreateUpdateResponse>,
-      AccessPolicyAssignmentCreateUpdateResponse
-    >
-  > {
-    const directSendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec,
-    ): Promise<AccessPolicyAssignmentCreateUpdateResponse> => {
-      return this.client.sendOperationRequest(args, spec);
-    };
-    const sendOperationFn = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec,
-    ) => {
-      let currentRawResponse: coreClient.FullOperationResponse | undefined =
-        undefined;
-      const providedCallback = args.options?.onResponse;
-      const callback: coreClient.RawResponseCallback = (
-        rawResponse: coreClient.FullOperationResponse,
-        flatResponse: unknown,
-      ) => {
-        currentRawResponse = rawResponse;
-        providedCallback?.(rawResponse, flatResponse);
-      };
-      const updatedArgs = {
-        ...args,
-        options: {
-          ...args.options,
-          onResponse: callback,
-        },
-      };
-      const flatResponse = await directSendOperation(updatedArgs, spec);
-      return {
-        flatResponse,
-        rawResponse: {
-          statusCode: currentRawResponse!.status,
-          body: currentRawResponse!.parsedBody,
-          headers: currentRawResponse!.headers.toJSON(),
-        },
-      };
-    };
-
-    const lro = createLroSpec({
-      sendOperationFn,
-      args: {
-        resourceGroupName,
-        clusterName,
-        databaseName,
-        accessPolicyAssignmentName,
-        parameters,
-        options,
-      },
-      spec: createUpdateOperationSpec,
-    });
-    const poller = await createHttpPoller<
-      AccessPolicyAssignmentCreateUpdateResponse,
-      OperationState<AccessPolicyAssignmentCreateUpdateResponse>
-    >(lro, {
-      restoreFrom: options?.resumeFrom,
-      intervalInMs: options?.updateIntervalInMs,
-      resourceLocationConfig: "original-uri",
-    });
-    await poller.poll();
-    return poller;
-  }
-
-  /**
-   * Creates/Updates a particular access policy assignment for a database
-   * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
-   * @param databaseName The name of the Redis Enterprise database.
-   * @param accessPolicyAssignmentName The name of the Redis Enterprise database access policy
-   *                                   assignment.
-   * @param parameters Parameters supplied to the create access policy assignment for database.
-   * @param options The options parameters.
-   */
-  async beginCreateUpdateAndWait(
-    resourceGroupName: string,
-    clusterName: string,
-    databaseName: string,
-    accessPolicyAssignmentName: string,
-    parameters: AccessPolicyAssignment,
-    options?: AccessPolicyAssignmentCreateUpdateOptionalParams,
-  ): Promise<AccessPolicyAssignmentCreateUpdateResponse> {
-    const poller = await this.beginCreateUpdate(
-      resourceGroupName,
-      clusterName,
-      databaseName,
-      accessPolicyAssignmentName,
-      parameters,
-      options,
-    );
-    return poller.pollUntilDone();
-  }
-
-  /**
-   * Gets information about access policy assignment for database.
-   * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
-   * @param databaseName The name of the Redis Enterprise database.
-   * @param accessPolicyAssignmentName The name of the Redis Enterprise database access policy
-   *                                   assignment.
-   * @param options The options parameters.
-   */
-  get(
-    resourceGroupName: string,
-    clusterName: string,
-    databaseName: string,
-    accessPolicyAssignmentName: string,
-    options?: AccessPolicyAssignmentGetOptionalParams,
-  ): Promise<AccessPolicyAssignmentGetResponse> {
-    return this.client.sendOperationRequest(
-      {
-        resourceGroupName,
-        clusterName,
-        databaseName,
-        accessPolicyAssignmentName,
-        options,
-      },
-      getOperationSpec,
-    );
-  }
-
-  /**
-   * Deletes a single access policy assignment.
-   * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
-   * @param databaseName The name of the Redis Enterprise database.
-   * @param accessPolicyAssignmentName The name of the Redis Enterprise database access policy
-   *                                   assignment.
-   * @param options The options parameters.
-   */
-  async beginDelete(
-    resourceGroupName: string,
-    clusterName: string,
-    databaseName: string,
-    accessPolicyAssignmentName: string,
-    options?: AccessPolicyAssignmentDeleteOptionalParams,
-  ): Promise<
-    SimplePollerLike<
-      OperationState<AccessPolicyAssignmentDeleteResponse>,
-      AccessPolicyAssignmentDeleteResponse
-    >
-  > {
-    const directSendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec,
-    ): Promise<AccessPolicyAssignmentDeleteResponse> => {
-      return this.client.sendOperationRequest(args, spec);
-    };
-    const sendOperationFn = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec,
-    ) => {
-      let currentRawResponse: coreClient.FullOperationResponse | undefined =
-        undefined;
-      const providedCallback = args.options?.onResponse;
-      const callback: coreClient.RawResponseCallback = (
-        rawResponse: coreClient.FullOperationResponse,
-        flatResponse: unknown,
-      ) => {
-        currentRawResponse = rawResponse;
-        providedCallback?.(rawResponse, flatResponse);
-      };
-      const updatedArgs = {
-        ...args,
-        options: {
-          ...args.options,
-          onResponse: callback,
-        },
-      };
-      const flatResponse = await directSendOperation(updatedArgs, spec);
-      return {
-        flatResponse,
-        rawResponse: {
-          statusCode: currentRawResponse!.status,
-          body: currentRawResponse!.parsedBody,
-          headers: currentRawResponse!.headers.toJSON(),
-        },
-      };
-    };
-
-    const lro = createLroSpec({
-      sendOperationFn,
-      args: {
-        resourceGroupName,
-        clusterName,
-        databaseName,
-        accessPolicyAssignmentName,
-        options,
-      },
-      spec: deleteOperationSpec,
-    });
-    const poller = await createHttpPoller<
-      AccessPolicyAssignmentDeleteResponse,
-      OperationState<AccessPolicyAssignmentDeleteResponse>
-    >(lro, {
-      restoreFrom: options?.resumeFrom,
-      intervalInMs: options?.updateIntervalInMs,
-      resourceLocationConfig: "azure-async-operation",
-    });
-    await poller.poll();
-    return poller;
-  }
-
-  /**
-   * Deletes a single access policy assignment.
-   * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
-   * @param databaseName The name of the Redis Enterprise database.
-   * @param accessPolicyAssignmentName The name of the Redis Enterprise database access policy
-   *                                   assignment.
-   * @param options The options parameters.
-   */
-  async beginDeleteAndWait(
-    resourceGroupName: string,
-    clusterName: string,
-    databaseName: string,
-    accessPolicyAssignmentName: string,
-    options?: AccessPolicyAssignmentDeleteOptionalParams,
-  ): Promise<AccessPolicyAssignmentDeleteResponse> {
-    const poller = await this.beginDelete(
-      resourceGroupName,
-      clusterName,
-      databaseName,
-      accessPolicyAssignmentName,
-      options,
-    );
-    return poller.pollUntilDone();
-  }
-
-  /**
-   * Gets all access policy assignments..
-   * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
-   * @param databaseName The name of the Redis Enterprise database.
-   * @param options The options parameters.
-   */
-  private _list(
-    resourceGroupName: string,
-    clusterName: string,
-    databaseName: string,
-    options?: AccessPolicyAssignmentListOptionalParams,
-  ): Promise<AccessPolicyAssignmentListResponse> {
-    return this.client.sendOperationRequest(
-      { resourceGroupName, clusterName, databaseName, options },
-      listOperationSpec,
-    );
-  }
-
-  /**
-   * ListNext
-   * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
-   * @param databaseName The name of the Redis Enterprise database.
-   * @param nextLink The nextLink from the previous successful call to the List method.
-   * @param options The options parameters.
-   */
-  private _listNext(
-    resourceGroupName: string,
-    clusterName: string,
-    databaseName: string,
-    nextLink: string,
-    options?: AccessPolicyAssignmentListNextOptionalParams,
-  ): Promise<AccessPolicyAssignmentListNextResponse> {
-    return this.client.sendOperationRequest(
-      { resourceGroupName, clusterName, databaseName, nextLink, options },
-      listNextOperationSpec,
-    );
-  }
-}
-// Operation Specifications
-const serializer = coreClient.createSerializer(Mappers, /* isXml */ false);
-
-const createUpdateOperationSpec: coreClient.OperationSpec = {
-  path: "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/accessPolicyAssignments/{accessPolicyAssignmentName}",
-  httpMethod: "PUT",
-  responses: {
-    200: {
-      bodyMapper: Mappers.AccessPolicyAssignment,
-    },
-    201: {
-      bodyMapper: Mappers.AccessPolicyAssignment,
-    },
-    202: {
-      bodyMapper: Mappers.AccessPolicyAssignment,
-    },
-    204: {
-      bodyMapper: Mappers.AccessPolicyAssignment,
-    },
-    default: {
-      bodyMapper: Mappers.ErrorResponse,
-    },
-  },
-  requestBody: Parameters.parameters10,
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.clusterName,
-    Parameters.databaseName,
-    Parameters.accessPolicyAssignmentName,
-  ],
-  headerParameters: [Parameters.accept, Parameters.contentType],
-  mediaType: "json",
-  serializer,
-};
-const getOperationSpec: coreClient.OperationSpec = {
-  path: "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/accessPolicyAssignments/{accessPolicyAssignmentName}",
-  httpMethod: "GET",
-  responses: {
-    200: {
-      bodyMapper: Mappers.AccessPolicyAssignment,
-    },
-    default: {
-      bodyMapper: Mappers.ErrorResponse,
-    },
-  },
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.clusterName,
-    Parameters.databaseName,
-    Parameters.accessPolicyAssignmentName,
-  ],
-  headerParameters: [Parameters.accept],
-  serializer,
-};
-const deleteOperationSpec: coreClient.OperationSpec = {
-  path: "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/accessPolicyAssignments/{accessPolicyAssignmentName}",
-  httpMethod: "DELETE",
-  responses: {
-    200: {
-      headersMapper: Mappers.AccessPolicyAssignmentDeleteHeaders,
-    },
-    201: {
-      headersMapper: Mappers.AccessPolicyAssignmentDeleteHeaders,
-    },
-    202: {
-      headersMapper: Mappers.AccessPolicyAssignmentDeleteHeaders,
-    },
-    204: {
-      headersMapper: Mappers.AccessPolicyAssignmentDeleteHeaders,
-    },
-    default: {
-      bodyMapper: Mappers.ErrorResponse,
-    },
-  },
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.clusterName,
-    Parameters.databaseName,
-    Parameters.accessPolicyAssignmentName,
-  ],
-  headerParameters: [Parameters.accept],
-  serializer,
-};
-const listOperationSpec: coreClient.OperationSpec = {
-  path: "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/accessPolicyAssignments",
-  httpMethod: "GET",
-  responses: {
-    200: {
-      bodyMapper: Mappers.AccessPolicyAssignmentList,
-    },
-    default: {
-      bodyMapper: Mappers.ErrorResponse,
-    },
-  },
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.clusterName,
-    Parameters.databaseName,
-  ],
-  headerParameters: [Parameters.accept],
-  serializer,
-};
-const listNextOperationSpec: coreClient.OperationSpec = {
-  path: "{nextLink}",
-  httpMethod: "GET",
-  responses: {
-    200: {
-      bodyMapper: Mappers.AccessPolicyAssignmentList,
-    },
-    default: {
-      bodyMapper: Mappers.ErrorResponse,
-    },
-  },
-  urlParameters: [
-    Parameters.$host,
-    Parameters.nextLink,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.clusterName,
-    Parameters.databaseName,
-  ],
-  headerParameters: [Parameters.accept],
-  serializer,
-};
diff --git a/sdk/redisenterprise/arm-redisenterprisecache/src/operations/databases.ts b/sdk/redisenterprise/arm-redisenterprisecache/src/operations/databases.ts
index d5d550a02cf2..cb63b3b526b6 100644
--- a/sdk/redisenterprise/arm-redisenterprisecache/src/operations/databases.ts
+++ b/sdk/redisenterprise/arm-redisenterprisecache/src/operations/databases.ts
@@ -48,8 +48,6 @@ import {
   DatabasesForceLinkToReplicationGroupResponse,
   FlushParameters,
   DatabasesFlushOptionalParams,
-  DatabasesUpgradeDBRedisVersionOptionalParams,
-  DatabasesUpgradeDBRedisVersionResponse,
   DatabasesListByClusterNextResponse,
 } from "../models/index.js";
 
@@ -67,9 +65,11 @@ export class DatabasesImpl implements Databases {
   }
 
   /**
-   * Gets all databases in the specified Redis Enterprise cluster.
+   * Gets all databases in the specified RedisEnterprise cluster.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param options The options parameters.
    */
   public listByCluster(
@@ -151,9 +151,11 @@ export class DatabasesImpl implements Databases {
   }
 
   /**
-   * Gets all databases in the specified Redis Enterprise cluster.
+   * Gets all databases in the specified RedisEnterprise cluster.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param options The options parameters.
    */
   private _listByCluster(
@@ -170,7 +172,9 @@ export class DatabasesImpl implements Databases {
   /**
    * Creates a database
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Parameters supplied to the create or update database operation.
    * @param options The options parameters.
@@ -251,7 +255,9 @@ export class DatabasesImpl implements Databases {
   /**
    * Creates a database
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Parameters supplied to the create or update database operation.
    * @param options The options parameters.
@@ -276,7 +282,9 @@ export class DatabasesImpl implements Databases {
   /**
    * Updates a database
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Parameters supplied to the create or update database operation.
    * @param options The options parameters.
@@ -357,7 +365,9 @@ export class DatabasesImpl implements Databases {
   /**
    * Updates a database
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Parameters supplied to the create or update database operation.
    * @param options The options parameters.
@@ -380,9 +390,11 @@ export class DatabasesImpl implements Databases {
   }
 
   /**
-   * Gets information about a database in a Redis Enterprise cluster.
+   * Gets information about a database in a RedisEnterprise cluster.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param options The options parameters.
    */
@@ -401,7 +413,9 @@ export class DatabasesImpl implements Databases {
   /**
    * Deletes a single database
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param options The options parameters.
    */
@@ -466,7 +480,9 @@ export class DatabasesImpl implements Databases {
   /**
    * Deletes a single database
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param options The options parameters.
    */
@@ -486,9 +502,11 @@ export class DatabasesImpl implements Databases {
   }
 
   /**
-   * Retrieves the access keys for the Redis Enterprise database.
+   * Retrieves the access keys for the RedisEnterprise database.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param options The options parameters.
    */
@@ -505,9 +523,11 @@ export class DatabasesImpl implements Databases {
   }
 
   /**
-   * Regenerates the Redis Enterprise database's access keys.
+   * Regenerates the RedisEnterprise database's access keys.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Specifies which key to regenerate.
    * @param options The options parameters.
@@ -586,9 +606,11 @@ export class DatabasesImpl implements Databases {
   }
 
   /**
-   * Regenerates the Redis Enterprise database's access keys.
+   * Regenerates the RedisEnterprise database's access keys.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Specifies which key to regenerate.
    * @param options The options parameters.
@@ -613,7 +635,9 @@ export class DatabasesImpl implements Databases {
   /**
    * Imports database files to target database.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Storage information for importing into the cluster
    * @param options The options parameters.
@@ -686,7 +710,9 @@ export class DatabasesImpl implements Databases {
   /**
    * Imports database files to target database.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Storage information for importing into the cluster
    * @param options The options parameters.
@@ -711,7 +737,9 @@ export class DatabasesImpl implements Databases {
   /**
    * Exports a database file from target database.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Storage information for exporting into the cluster
    * @param options The options parameters.
@@ -784,7 +812,9 @@ export class DatabasesImpl implements Databases {
   /**
    * Exports a database file from target database.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Storage information for exporting into the cluster
    * @param options The options parameters.
@@ -809,7 +839,9 @@ export class DatabasesImpl implements Databases {
   /**
    * Forcibly removes the link to the specified database resource.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Information identifying the database to be unlinked.
    * @param options The options parameters.
@@ -882,7 +914,9 @@ export class DatabasesImpl implements Databases {
   /**
    * Forcibly removes the link to the specified database resource.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Information identifying the database to be unlinked.
    * @param options The options parameters.
@@ -909,7 +943,9 @@ export class DatabasesImpl implements Databases {
    * replication group. **IMPORTANT NOTE:** All data in this database will be discarded, and the database
    * will temporarily be unavailable while rejoining the replication group.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Information identifying the database to be unlinked.
    * @param options The options parameters.
@@ -992,7 +1028,9 @@ export class DatabasesImpl implements Databases {
    * replication group. **IMPORTANT NOTE:** All data in this database will be discarded, and the database
    * will temporarily be unavailable while rejoining the replication group.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Information identifying the database to be unlinked.
    * @param options The options parameters.
@@ -1017,7 +1055,9 @@ export class DatabasesImpl implements Databases {
   /**
    * Flushes all the keys in this database and also from its linked databases.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Information identifying the databases to be flushed
    * @param options The options parameters.
@@ -1090,7 +1130,9 @@ export class DatabasesImpl implements Databases {
   /**
    * Flushes all the keys in this database and also from its linked databases.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Information identifying the databases to be flushed
    * @param options The options parameters.
@@ -1112,105 +1154,12 @@ export class DatabasesImpl implements Databases {
     return poller.pollUntilDone();
   }
 
-  /**
-   * Upgrades the database Redis version to the latest available.
-   * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
-   * @param databaseName The name of the Redis Enterprise database.
-   * @param options The options parameters.
-   */
-  async beginUpgradeDBRedisVersion(
-    resourceGroupName: string,
-    clusterName: string,
-    databaseName: string,
-    options?: DatabasesUpgradeDBRedisVersionOptionalParams,
-  ): Promise<
-    SimplePollerLike<
-      OperationState<DatabasesUpgradeDBRedisVersionResponse>,
-      DatabasesUpgradeDBRedisVersionResponse
-    >
-  > {
-    const directSendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec,
-    ): Promise<DatabasesUpgradeDBRedisVersionResponse> => {
-      return this.client.sendOperationRequest(args, spec);
-    };
-    const sendOperationFn = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec,
-    ) => {
-      let currentRawResponse: coreClient.FullOperationResponse | undefined =
-        undefined;
-      const providedCallback = args.options?.onResponse;
-      const callback: coreClient.RawResponseCallback = (
-        rawResponse: coreClient.FullOperationResponse,
-        flatResponse: unknown,
-      ) => {
-        currentRawResponse = rawResponse;
-        providedCallback?.(rawResponse, flatResponse);
-      };
-      const updatedArgs = {
-        ...args,
-        options: {
-          ...args.options,
-          onResponse: callback,
-        },
-      };
-      const flatResponse = await directSendOperation(updatedArgs, spec);
-      return {
-        flatResponse,
-        rawResponse: {
-          statusCode: currentRawResponse!.status,
-          body: currentRawResponse!.parsedBody,
-          headers: currentRawResponse!.headers.toJSON(),
-        },
-      };
-    };
-
-    const lro = createLroSpec({
-      sendOperationFn,
-      args: { resourceGroupName, clusterName, databaseName, options },
-      spec: upgradeDBRedisVersionOperationSpec,
-    });
-    const poller = await createHttpPoller<
-      DatabasesUpgradeDBRedisVersionResponse,
-      OperationState<DatabasesUpgradeDBRedisVersionResponse>
-    >(lro, {
-      restoreFrom: options?.resumeFrom,
-      intervalInMs: options?.updateIntervalInMs,
-      resourceLocationConfig: "location",
-    });
-    await poller.poll();
-    return poller;
-  }
-
-  /**
-   * Upgrades the database Redis version to the latest available.
-   * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
-   * @param databaseName The name of the Redis Enterprise database.
-   * @param options The options parameters.
-   */
-  async beginUpgradeDBRedisVersionAndWait(
-    resourceGroupName: string,
-    clusterName: string,
-    databaseName: string,
-    options?: DatabasesUpgradeDBRedisVersionOptionalParams,
-  ): Promise<DatabasesUpgradeDBRedisVersionResponse> {
-    const poller = await this.beginUpgradeDBRedisVersion(
-      resourceGroupName,
-      clusterName,
-      databaseName,
-      options,
-    );
-    return poller.pollUntilDone();
-  }
-
   /**
    * ListByClusterNext
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param nextLink The nextLink from the previous successful call to the ListByCluster method.
    * @param options The options parameters.
    */
@@ -1508,7 +1457,7 @@ const forceLinkToReplicationGroupOperationSpec: coreClient.OperationSpec = {
       headersMapper: Mappers.DatabasesForceLinkToReplicationGroupHeaders,
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse,
+      bodyMapper: Mappers.ErrorResponseAutoGenerated,
     },
   },
   requestBody: Parameters.parameters8,
@@ -1549,37 +1498,6 @@ const flushOperationSpec: coreClient.OperationSpec = {
   mediaType: "json",
   serializer,
 };
-const upgradeDBRedisVersionOperationSpec: coreClient.OperationSpec = {
-  path: "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/upgradeDBRedisVersion",
-  httpMethod: "POST",
-  responses: {
-    200: {
-      headersMapper: Mappers.DatabasesUpgradeDBRedisVersionHeaders,
-    },
-    201: {
-      headersMapper: Mappers.DatabasesUpgradeDBRedisVersionHeaders,
-    },
-    202: {
-      headersMapper: Mappers.DatabasesUpgradeDBRedisVersionHeaders,
-    },
-    204: {
-      headersMapper: Mappers.DatabasesUpgradeDBRedisVersionHeaders,
-    },
-    default: {
-      bodyMapper: Mappers.ErrorResponse,
-    },
-  },
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.clusterName,
-    Parameters.databaseName,
-  ],
-  headerParameters: [Parameters.accept],
-  serializer,
-};
 const listByClusterNextOperationSpec: coreClient.OperationSpec = {
   path: "{nextLink}",
   httpMethod: "GET",
diff --git a/sdk/redisenterprise/arm-redisenterprisecache/src/operations/index.ts b/sdk/redisenterprise/arm-redisenterprisecache/src/operations/index.ts
index b2a63ce6b2f6..48988613f563 100644
--- a/sdk/redisenterprise/arm-redisenterprisecache/src/operations/index.ts
+++ b/sdk/redisenterprise/arm-redisenterprisecache/src/operations/index.ts
@@ -10,6 +10,5 @@ export * from "./operations.js";
 export * from "./operationsStatus.js";
 export * from "./redisEnterprise.js";
 export * from "./databases.js";
-export * from "./accessPolicyAssignmentOperations.js";
 export * from "./privateEndpointConnections.js";
 export * from "./privateLinkResources.js";
diff --git a/sdk/redisenterprise/arm-redisenterprisecache/src/operations/privateEndpointConnections.ts b/sdk/redisenterprise/arm-redisenterprisecache/src/operations/privateEndpointConnections.ts
index 2be27ddea5bb..8df273b14058 100644
--- a/sdk/redisenterprise/arm-redisenterprisecache/src/operations/privateEndpointConnections.ts
+++ b/sdk/redisenterprise/arm-redisenterprisecache/src/operations/privateEndpointConnections.ts
@@ -45,9 +45,11 @@ export class PrivateEndpointConnectionsImpl
   }
 
   /**
-   * Lists all the private endpoint connections associated with the Redis Enterprise cluster.
+   * Lists all the private endpoint connections associated with the RedisEnterprise cluster.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param options The options parameters.
    */
   public list(
@@ -103,9 +105,11 @@ export class PrivateEndpointConnectionsImpl
   }
 
   /**
-   * Lists all the private endpoint connections associated with the Redis Enterprise cluster.
+   * Lists all the private endpoint connections associated with the RedisEnterprise cluster.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param options The options parameters.
    */
   private _list(
@@ -120,9 +124,11 @@ export class PrivateEndpointConnectionsImpl
   }
 
   /**
-   * Gets the specified private endpoint connection associated with the Redis Enterprise cluster.
+   * Gets the specified private endpoint connection associated with the RedisEnterprise cluster.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param privateEndpointConnectionName The name of the private endpoint connection associated with the
    *                                      Azure resource
    * @param options The options parameters.
@@ -145,10 +151,12 @@ export class PrivateEndpointConnectionsImpl
   }
 
   /**
-   * Updates the state of the specified private endpoint connection associated with the Redis Enterprise
+   * Updates the state of the specified private endpoint connection associated with the RedisEnterprise
    * cluster.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param privateEndpointConnectionName The name of the private endpoint connection associated with the
    *                                      Azure resource
    * @param properties The private endpoint connection properties.
@@ -227,10 +235,12 @@ export class PrivateEndpointConnectionsImpl
   }
 
   /**
-   * Updates the state of the specified private endpoint connection associated with the Redis Enterprise
+   * Updates the state of the specified private endpoint connection associated with the RedisEnterprise
    * cluster.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param privateEndpointConnectionName The name of the private endpoint connection associated with the
    *                                      Azure resource
    * @param properties The private endpoint connection properties.
@@ -254,9 +264,11 @@ export class PrivateEndpointConnectionsImpl
   }
 
   /**
-   * Deletes the specified private endpoint connection associated with the Redis Enterprise cluster.
+   * Deletes the specified private endpoint connection associated with the RedisEnterprise cluster.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param privateEndpointConnectionName The name of the private endpoint connection associated with the
    *                                      Azure resource
    * @param options The options parameters.
@@ -325,9 +337,11 @@ export class PrivateEndpointConnectionsImpl
   }
 
   /**
-   * Deletes the specified private endpoint connection associated with the Redis Enterprise cluster.
+   * Deletes the specified private endpoint connection associated with the RedisEnterprise cluster.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param privateEndpointConnectionName The name of the private endpoint connection associated with the
    *                                      Azure resource
    * @param options The options parameters.
diff --git a/sdk/redisenterprise/arm-redisenterprisecache/src/operations/privateLinkResources.ts b/sdk/redisenterprise/arm-redisenterprisecache/src/operations/privateLinkResources.ts
index a3c225ab948a..53eecb4b8854 100644
--- a/sdk/redisenterprise/arm-redisenterprisecache/src/operations/privateLinkResources.ts
+++ b/sdk/redisenterprise/arm-redisenterprisecache/src/operations/privateLinkResources.ts
@@ -32,9 +32,11 @@ export class PrivateLinkResourcesImpl implements PrivateLinkResources {
   }
 
   /**
-   * Gets the private link resources that need to be created for a Redis Enterprise cluster.
+   * Gets the private link resources that need to be created for a RedisEnterprise cluster.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param options The options parameters.
    */
   public listByCluster(
@@ -94,9 +96,11 @@ export class PrivateLinkResourcesImpl implements PrivateLinkResources {
   }
 
   /**
-   * Gets the private link resources that need to be created for a Redis Enterprise cluster.
+   * Gets the private link resources that need to be created for a RedisEnterprise cluster.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param options The options parameters.
    */
   private _listByCluster(
diff --git a/sdk/redisenterprise/arm-redisenterprisecache/src/operations/redisEnterprise.ts b/sdk/redisenterprise/arm-redisenterprisecache/src/operations/redisEnterprise.ts
index 52700841721c..4cd126086d7f 100644
--- a/sdk/redisenterprise/arm-redisenterprisecache/src/operations/redisEnterprise.ts
+++ b/sdk/redisenterprise/arm-redisenterprisecache/src/operations/redisEnterprise.ts
@@ -53,7 +53,7 @@ export class RedisEnterpriseImpl implements RedisEnterprise {
   }
 
   /**
-   * Lists all Redis Enterprise clusters in a resource group.
+   * Lists all RedisEnterprise clusters in a resource group.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
    * @param options The options parameters.
    */
@@ -122,7 +122,7 @@ export class RedisEnterpriseImpl implements RedisEnterprise {
   }
 
   /**
-   * Lists all Redis Enterprise clusters in the specified subscription.
+   * Gets all RedisEnterprise clusters in the specified subscription.
    * @param options The options parameters.
    */
   public list(
@@ -178,8 +178,10 @@ export class RedisEnterpriseImpl implements RedisEnterprise {
   /**
    * Creates or updates an existing (overwrite/recreate, with potential downtime) cache cluster
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
-   * @param parameters Parameters supplied to the Create Redis Enterprise operation.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
+   * @param parameters Parameters supplied to the Create RedisEnterprise operation.
    * @param options The options parameters.
    */
   async beginCreate(
@@ -251,8 +253,10 @@ export class RedisEnterpriseImpl implements RedisEnterprise {
   /**
    * Creates or updates an existing (overwrite/recreate, with potential downtime) cache cluster
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
-   * @param parameters Parameters supplied to the Create Redis Enterprise operation.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
+   * @param parameters Parameters supplied to the Create RedisEnterprise operation.
    * @param options The options parameters.
    */
   async beginCreateAndWait(
@@ -271,10 +275,12 @@ export class RedisEnterpriseImpl implements RedisEnterprise {
   }
 
   /**
-   * Updates an existing Redis Enterprise cluster
+   * Updates an existing RedisEnterprise cluster
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
-   * @param parameters Parameters supplied to the Update Redis Enterprise operation.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
+   * @param parameters Parameters supplied to the Update RedisEnterprise operation.
    * @param options The options parameters.
    */
   async beginUpdate(
@@ -344,10 +350,12 @@ export class RedisEnterpriseImpl implements RedisEnterprise {
   }
 
   /**
-   * Updates an existing Redis Enterprise cluster
+   * Updates an existing RedisEnterprise cluster
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
-   * @param parameters Parameters supplied to the Update Redis Enterprise operation.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
+   * @param parameters Parameters supplied to the Update RedisEnterprise operation.
    * @param options The options parameters.
    */
   async beginUpdateAndWait(
@@ -366,9 +374,11 @@ export class RedisEnterpriseImpl implements RedisEnterprise {
   }
 
   /**
-   * Deletes a Redis Enterprise cache cluster.
+   * Deletes a RedisEnterprise cache cluster.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param options The options parameters.
    */
   async beginDelete(
@@ -429,9 +439,11 @@ export class RedisEnterpriseImpl implements RedisEnterprise {
   }
 
   /**
-   * Deletes a Redis Enterprise cache cluster.
+   * Deletes a RedisEnterprise cache cluster.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param options The options parameters.
    */
   async beginDeleteAndWait(
@@ -448,9 +460,11 @@ export class RedisEnterpriseImpl implements RedisEnterprise {
   }
 
   /**
-   * Gets information about a Redis Enterprise cluster
+   * Gets information about a RedisEnterprise cluster
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param options The options parameters.
    */
   get(
@@ -465,7 +479,7 @@ export class RedisEnterpriseImpl implements RedisEnterprise {
   }
 
   /**
-   * Lists all Redis Enterprise clusters in a resource group.
+   * Lists all RedisEnterprise clusters in a resource group.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
    * @param options The options parameters.
    */
@@ -480,7 +494,7 @@ export class RedisEnterpriseImpl implements RedisEnterprise {
   }
 
   /**
-   * Lists all Redis Enterprise clusters in the specified subscription.
+   * Gets all RedisEnterprise clusters in the specified subscription.
    * @param options The options parameters.
    */
   private _list(
diff --git a/sdk/redisenterprise/arm-redisenterprisecache/src/operationsInterfaces/accessPolicyAssignmentOperations.ts b/sdk/redisenterprise/arm-redisenterprisecache/src/operationsInterfaces/accessPolicyAssignmentOperations.ts
deleted file mode 100644
index 316c7f38336b..000000000000
--- a/sdk/redisenterprise/arm-redisenterprisecache/src/operationsInterfaces/accessPolicyAssignmentOperations.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT License.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- * Changes may cause incorrect behavior and will be lost if the code is regenerated.
- */
-
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
-import { SimplePollerLike, OperationState } from "@azure/core-lro";
-import {
-  AccessPolicyAssignment,
-  AccessPolicyAssignmentListOptionalParams,
-  AccessPolicyAssignmentCreateUpdateOptionalParams,
-  AccessPolicyAssignmentCreateUpdateResponse,
-  AccessPolicyAssignmentGetOptionalParams,
-  AccessPolicyAssignmentGetResponse,
-  AccessPolicyAssignmentDeleteOptionalParams,
-  AccessPolicyAssignmentDeleteResponse,
-} from "../models/index.js";
-
-/// <reference lib="esnext.asynciterable" />
-/** Interface representing a AccessPolicyAssignmentOperations. */
-export interface AccessPolicyAssignmentOperations {
-  /**
-   * Gets all access policy assignments..
-   * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
-   * @param databaseName The name of the Redis Enterprise database.
-   * @param options The options parameters.
-   */
-  list(
-    resourceGroupName: string,
-    clusterName: string,
-    databaseName: string,
-    options?: AccessPolicyAssignmentListOptionalParams,
-  ): PagedAsyncIterableIterator<AccessPolicyAssignment>;
-  /**
-   * Creates/Updates a particular access policy assignment for a database
-   * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
-   * @param databaseName The name of the Redis Enterprise database.
-   * @param accessPolicyAssignmentName The name of the Redis Enterprise database access policy
-   *                                   assignment.
-   * @param parameters Parameters supplied to the create access policy assignment for database.
-   * @param options The options parameters.
-   */
-  beginCreateUpdate(
-    resourceGroupName: string,
-    clusterName: string,
-    databaseName: string,
-    accessPolicyAssignmentName: string,
-    parameters: AccessPolicyAssignment,
-    options?: AccessPolicyAssignmentCreateUpdateOptionalParams,
-  ): Promise<
-    SimplePollerLike<
-      OperationState<AccessPolicyAssignmentCreateUpdateResponse>,
-      AccessPolicyAssignmentCreateUpdateResponse
-    >
-  >;
-  /**
-   * Creates/Updates a particular access policy assignment for a database
-   * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
-   * @param databaseName The name of the Redis Enterprise database.
-   * @param accessPolicyAssignmentName The name of the Redis Enterprise database access policy
-   *                                   assignment.
-   * @param parameters Parameters supplied to the create access policy assignment for database.
-   * @param options The options parameters.
-   */
-  beginCreateUpdateAndWait(
-    resourceGroupName: string,
-    clusterName: string,
-    databaseName: string,
-    accessPolicyAssignmentName: string,
-    parameters: AccessPolicyAssignment,
-    options?: AccessPolicyAssignmentCreateUpdateOptionalParams,
-  ): Promise<AccessPolicyAssignmentCreateUpdateResponse>;
-  /**
-   * Gets information about access policy assignment for database.
-   * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
-   * @param databaseName The name of the Redis Enterprise database.
-   * @param accessPolicyAssignmentName The name of the Redis Enterprise database access policy
-   *                                   assignment.
-   * @param options The options parameters.
-   */
-  get(
-    resourceGroupName: string,
-    clusterName: string,
-    databaseName: string,
-    accessPolicyAssignmentName: string,
-    options?: AccessPolicyAssignmentGetOptionalParams,
-  ): Promise<AccessPolicyAssignmentGetResponse>;
-  /**
-   * Deletes a single access policy assignment.
-   * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
-   * @param databaseName The name of the Redis Enterprise database.
-   * @param accessPolicyAssignmentName The name of the Redis Enterprise database access policy
-   *                                   assignment.
-   * @param options The options parameters.
-   */
-  beginDelete(
-    resourceGroupName: string,
-    clusterName: string,
-    databaseName: string,
-    accessPolicyAssignmentName: string,
-    options?: AccessPolicyAssignmentDeleteOptionalParams,
-  ): Promise<
-    SimplePollerLike<
-      OperationState<AccessPolicyAssignmentDeleteResponse>,
-      AccessPolicyAssignmentDeleteResponse
-    >
-  >;
-  /**
-   * Deletes a single access policy assignment.
-   * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
-   * @param databaseName The name of the Redis Enterprise database.
-   * @param accessPolicyAssignmentName The name of the Redis Enterprise database access policy
-   *                                   assignment.
-   * @param options The options parameters.
-   */
-  beginDeleteAndWait(
-    resourceGroupName: string,
-    clusterName: string,
-    databaseName: string,
-    accessPolicyAssignmentName: string,
-    options?: AccessPolicyAssignmentDeleteOptionalParams,
-  ): Promise<AccessPolicyAssignmentDeleteResponse>;
-}
diff --git a/sdk/redisenterprise/arm-redisenterprisecache/src/operationsInterfaces/databases.ts b/sdk/redisenterprise/arm-redisenterprisecache/src/operationsInterfaces/databases.ts
index 45b937db9414..2f7131404605 100644
--- a/sdk/redisenterprise/arm-redisenterprisecache/src/operationsInterfaces/databases.ts
+++ b/sdk/redisenterprise/arm-redisenterprisecache/src/operationsInterfaces/databases.ts
@@ -35,17 +35,17 @@ import {
   DatabasesForceLinkToReplicationGroupResponse,
   FlushParameters,
   DatabasesFlushOptionalParams,
-  DatabasesUpgradeDBRedisVersionOptionalParams,
-  DatabasesUpgradeDBRedisVersionResponse,
 } from "../models/index.js";
 
 /// <reference lib="esnext.asynciterable" />
 /** Interface representing a Databases. */
 export interface Databases {
   /**
-   * Gets all databases in the specified Redis Enterprise cluster.
+   * Gets all databases in the specified RedisEnterprise cluster.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param options The options parameters.
    */
   listByCluster(
@@ -56,7 +56,9 @@ export interface Databases {
   /**
    * Creates a database
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Parameters supplied to the create or update database operation.
    * @param options The options parameters.
@@ -76,7 +78,9 @@ export interface Databases {
   /**
    * Creates a database
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Parameters supplied to the create or update database operation.
    * @param options The options parameters.
@@ -91,7 +95,9 @@ export interface Databases {
   /**
    * Updates a database
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Parameters supplied to the create or update database operation.
    * @param options The options parameters.
@@ -111,7 +117,9 @@ export interface Databases {
   /**
    * Updates a database
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Parameters supplied to the create or update database operation.
    * @param options The options parameters.
@@ -124,9 +132,11 @@ export interface Databases {
     options?: DatabasesUpdateOptionalParams,
   ): Promise<DatabasesUpdateResponse>;
   /**
-   * Gets information about a database in a Redis Enterprise cluster.
+   * Gets information about a database in a RedisEnterprise cluster.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param options The options parameters.
    */
@@ -139,7 +149,9 @@ export interface Databases {
   /**
    * Deletes a single database
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param options The options parameters.
    */
@@ -152,7 +164,9 @@ export interface Databases {
   /**
    * Deletes a single database
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param options The options parameters.
    */
@@ -163,9 +177,11 @@ export interface Databases {
     options?: DatabasesDeleteOptionalParams,
   ): Promise<void>;
   /**
-   * Retrieves the access keys for the Redis Enterprise database.
+   * Retrieves the access keys for the RedisEnterprise database.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param options The options parameters.
    */
@@ -176,9 +192,11 @@ export interface Databases {
     options?: DatabasesListKeysOptionalParams,
   ): Promise<DatabasesListKeysResponse>;
   /**
-   * Regenerates the Redis Enterprise database's access keys.
+   * Regenerates the RedisEnterprise database's access keys.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Specifies which key to regenerate.
    * @param options The options parameters.
@@ -196,9 +214,11 @@ export interface Databases {
     >
   >;
   /**
-   * Regenerates the Redis Enterprise database's access keys.
+   * Regenerates the RedisEnterprise database's access keys.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Specifies which key to regenerate.
    * @param options The options parameters.
@@ -213,7 +233,9 @@ export interface Databases {
   /**
    * Imports database files to target database.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Storage information for importing into the cluster
    * @param options The options parameters.
@@ -228,7 +250,9 @@ export interface Databases {
   /**
    * Imports database files to target database.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Storage information for importing into the cluster
    * @param options The options parameters.
@@ -243,7 +267,9 @@ export interface Databases {
   /**
    * Exports a database file from target database.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Storage information for exporting into the cluster
    * @param options The options parameters.
@@ -258,7 +284,9 @@ export interface Databases {
   /**
    * Exports a database file from target database.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Storage information for exporting into the cluster
    * @param options The options parameters.
@@ -273,7 +301,9 @@ export interface Databases {
   /**
    * Forcibly removes the link to the specified database resource.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Information identifying the database to be unlinked.
    * @param options The options parameters.
@@ -288,7 +318,9 @@ export interface Databases {
   /**
    * Forcibly removes the link to the specified database resource.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Information identifying the database to be unlinked.
    * @param options The options parameters.
@@ -305,7 +337,9 @@ export interface Databases {
    * replication group. **IMPORTANT NOTE:** All data in this database will be discarded, and the database
    * will temporarily be unavailable while rejoining the replication group.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Information identifying the database to be unlinked.
    * @param options The options parameters.
@@ -327,7 +361,9 @@ export interface Databases {
    * replication group. **IMPORTANT NOTE:** All data in this database will be discarded, and the database
    * will temporarily be unavailable while rejoining the replication group.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Information identifying the database to be unlinked.
    * @param options The options parameters.
@@ -342,7 +378,9 @@ export interface Databases {
   /**
    * Flushes all the keys in this database and also from its linked databases.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Information identifying the databases to be flushed
    * @param options The options parameters.
@@ -357,7 +395,9 @@ export interface Databases {
   /**
    * Flushes all the keys in this database and also from its linked databases.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param databaseName The name of the Redis Enterprise database.
    * @param parameters Information identifying the databases to be flushed
    * @param options The options parameters.
@@ -369,35 +409,4 @@ export interface Databases {
     parameters: FlushParameters,
     options?: DatabasesFlushOptionalParams,
   ): Promise<void>;
-  /**
-   * Upgrades the database Redis version to the latest available.
-   * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
-   * @param databaseName The name of the Redis Enterprise database.
-   * @param options The options parameters.
-   */
-  beginUpgradeDBRedisVersion(
-    resourceGroupName: string,
-    clusterName: string,
-    databaseName: string,
-    options?: DatabasesUpgradeDBRedisVersionOptionalParams,
-  ): Promise<
-    SimplePollerLike<
-      OperationState<DatabasesUpgradeDBRedisVersionResponse>,
-      DatabasesUpgradeDBRedisVersionResponse
-    >
-  >;
-  /**
-   * Upgrades the database Redis version to the latest available.
-   * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
-   * @param databaseName The name of the Redis Enterprise database.
-   * @param options The options parameters.
-   */
-  beginUpgradeDBRedisVersionAndWait(
-    resourceGroupName: string,
-    clusterName: string,
-    databaseName: string,
-    options?: DatabasesUpgradeDBRedisVersionOptionalParams,
-  ): Promise<DatabasesUpgradeDBRedisVersionResponse>;
 }
diff --git a/sdk/redisenterprise/arm-redisenterprisecache/src/operationsInterfaces/index.ts b/sdk/redisenterprise/arm-redisenterprisecache/src/operationsInterfaces/index.ts
index b2a63ce6b2f6..48988613f563 100644
--- a/sdk/redisenterprise/arm-redisenterprisecache/src/operationsInterfaces/index.ts
+++ b/sdk/redisenterprise/arm-redisenterprisecache/src/operationsInterfaces/index.ts
@@ -10,6 +10,5 @@ export * from "./operations.js";
 export * from "./operationsStatus.js";
 export * from "./redisEnterprise.js";
 export * from "./databases.js";
-export * from "./accessPolicyAssignmentOperations.js";
 export * from "./privateEndpointConnections.js";
 export * from "./privateLinkResources.js";
diff --git a/sdk/redisenterprise/arm-redisenterprisecache/src/operationsInterfaces/privateEndpointConnections.ts b/sdk/redisenterprise/arm-redisenterprisecache/src/operationsInterfaces/privateEndpointConnections.ts
index 8f154a5913b6..1bb04a499c5b 100644
--- a/sdk/redisenterprise/arm-redisenterprisecache/src/operationsInterfaces/privateEndpointConnections.ts
+++ b/sdk/redisenterprise/arm-redisenterprisecache/src/operationsInterfaces/privateEndpointConnections.ts
@@ -22,9 +22,11 @@ import {
 /** Interface representing a PrivateEndpointConnections. */
 export interface PrivateEndpointConnections {
   /**
-   * Lists all the private endpoint connections associated with the Redis Enterprise cluster.
+   * Lists all the private endpoint connections associated with the RedisEnterprise cluster.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param options The options parameters.
    */
   list(
@@ -33,9 +35,11 @@ export interface PrivateEndpointConnections {
     options?: PrivateEndpointConnectionsListOptionalParams,
   ): PagedAsyncIterableIterator<PrivateEndpointConnection>;
   /**
-   * Gets the specified private endpoint connection associated with the Redis Enterprise cluster.
+   * Gets the specified private endpoint connection associated with the RedisEnterprise cluster.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param privateEndpointConnectionName The name of the private endpoint connection associated with the
    *                                      Azure resource
    * @param options The options parameters.
@@ -47,10 +51,12 @@ export interface PrivateEndpointConnections {
     options?: PrivateEndpointConnectionsGetOptionalParams,
   ): Promise<PrivateEndpointConnectionsGetResponse>;
   /**
-   * Updates the state of the specified private endpoint connection associated with the Redis Enterprise
+   * Updates the state of the specified private endpoint connection associated with the RedisEnterprise
    * cluster.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param privateEndpointConnectionName The name of the private endpoint connection associated with the
    *                                      Azure resource
    * @param properties The private endpoint connection properties.
@@ -69,10 +75,12 @@ export interface PrivateEndpointConnections {
     >
   >;
   /**
-   * Updates the state of the specified private endpoint connection associated with the Redis Enterprise
+   * Updates the state of the specified private endpoint connection associated with the RedisEnterprise
    * cluster.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param privateEndpointConnectionName The name of the private endpoint connection associated with the
    *                                      Azure resource
    * @param properties The private endpoint connection properties.
@@ -86,9 +94,11 @@ export interface PrivateEndpointConnections {
     options?: PrivateEndpointConnectionsPutOptionalParams,
   ): Promise<PrivateEndpointConnectionsPutResponse>;
   /**
-   * Deletes the specified private endpoint connection associated with the Redis Enterprise cluster.
+   * Deletes the specified private endpoint connection associated with the RedisEnterprise cluster.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param privateEndpointConnectionName The name of the private endpoint connection associated with the
    *                                      Azure resource
    * @param options The options parameters.
@@ -100,9 +110,11 @@ export interface PrivateEndpointConnections {
     options?: PrivateEndpointConnectionsDeleteOptionalParams,
   ): Promise<SimplePollerLike<OperationState<void>, void>>;
   /**
-   * Deletes the specified private endpoint connection associated with the Redis Enterprise cluster.
+   * Deletes the specified private endpoint connection associated with the RedisEnterprise cluster.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param privateEndpointConnectionName The name of the private endpoint connection associated with the
    *                                      Azure resource
    * @param options The options parameters.
diff --git a/sdk/redisenterprise/arm-redisenterprisecache/src/operationsInterfaces/privateLinkResources.ts b/sdk/redisenterprise/arm-redisenterprisecache/src/operationsInterfaces/privateLinkResources.ts
index ade234d241ca..a54daa92fc32 100644
--- a/sdk/redisenterprise/arm-redisenterprisecache/src/operationsInterfaces/privateLinkResources.ts
+++ b/sdk/redisenterprise/arm-redisenterprisecache/src/operationsInterfaces/privateLinkResources.ts
@@ -16,9 +16,11 @@ import {
 /** Interface representing a PrivateLinkResources. */
 export interface PrivateLinkResources {
   /**
-   * Gets the private link resources that need to be created for a Redis Enterprise cluster.
+   * Gets the private link resources that need to be created for a RedisEnterprise cluster.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param options The options parameters.
    */
   listByCluster(
diff --git a/sdk/redisenterprise/arm-redisenterprisecache/src/operationsInterfaces/redisEnterprise.ts b/sdk/redisenterprise/arm-redisenterprisecache/src/operationsInterfaces/redisEnterprise.ts
index 01f989ae2112..56c868f5d167 100644
--- a/sdk/redisenterprise/arm-redisenterprisecache/src/operationsInterfaces/redisEnterprise.ts
+++ b/sdk/redisenterprise/arm-redisenterprisecache/src/operationsInterfaces/redisEnterprise.ts
@@ -26,7 +26,7 @@ import {
 /** Interface representing a RedisEnterprise. */
 export interface RedisEnterprise {
   /**
-   * Lists all Redis Enterprise clusters in a resource group.
+   * Lists all RedisEnterprise clusters in a resource group.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
    * @param options The options parameters.
    */
@@ -35,7 +35,7 @@ export interface RedisEnterprise {
     options?: RedisEnterpriseListByResourceGroupOptionalParams,
   ): PagedAsyncIterableIterator<Cluster>;
   /**
-   * Lists all Redis Enterprise clusters in the specified subscription.
+   * Gets all RedisEnterprise clusters in the specified subscription.
    * @param options The options parameters.
    */
   list(
@@ -44,8 +44,10 @@ export interface RedisEnterprise {
   /**
    * Creates or updates an existing (overwrite/recreate, with potential downtime) cache cluster
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
-   * @param parameters Parameters supplied to the Create Redis Enterprise operation.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
+   * @param parameters Parameters supplied to the Create RedisEnterprise operation.
    * @param options The options parameters.
    */
   beginCreate(
@@ -62,8 +64,10 @@ export interface RedisEnterprise {
   /**
    * Creates or updates an existing (overwrite/recreate, with potential downtime) cache cluster
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
-   * @param parameters Parameters supplied to the Create Redis Enterprise operation.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
+   * @param parameters Parameters supplied to the Create RedisEnterprise operation.
    * @param options The options parameters.
    */
   beginCreateAndWait(
@@ -73,10 +77,12 @@ export interface RedisEnterprise {
     options?: RedisEnterpriseCreateOptionalParams,
   ): Promise<RedisEnterpriseCreateResponse>;
   /**
-   * Updates an existing Redis Enterprise cluster
+   * Updates an existing RedisEnterprise cluster
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
-   * @param parameters Parameters supplied to the Update Redis Enterprise operation.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
+   * @param parameters Parameters supplied to the Update RedisEnterprise operation.
    * @param options The options parameters.
    */
   beginUpdate(
@@ -91,10 +97,12 @@ export interface RedisEnterprise {
     >
   >;
   /**
-   * Updates an existing Redis Enterprise cluster
+   * Updates an existing RedisEnterprise cluster
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
-   * @param parameters Parameters supplied to the Update Redis Enterprise operation.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
+   * @param parameters Parameters supplied to the Update RedisEnterprise operation.
    * @param options The options parameters.
    */
   beginUpdateAndWait(
@@ -104,9 +112,11 @@ export interface RedisEnterprise {
     options?: RedisEnterpriseUpdateOptionalParams,
   ): Promise<RedisEnterpriseUpdateResponse>;
   /**
-   * Deletes a Redis Enterprise cache cluster.
+   * Deletes a RedisEnterprise cache cluster.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param options The options parameters.
    */
   beginDelete(
@@ -115,9 +125,11 @@ export interface RedisEnterprise {
     options?: RedisEnterpriseDeleteOptionalParams,
   ): Promise<SimplePollerLike<OperationState<void>, void>>;
   /**
-   * Deletes a Redis Enterprise cache cluster.
+   * Deletes a RedisEnterprise cache cluster.
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param options The options parameters.
    */
   beginDeleteAndWait(
@@ -126,9 +138,11 @@ export interface RedisEnterprise {
     options?: RedisEnterpriseDeleteOptionalParams,
   ): Promise<void>;
   /**
-   * Gets information about a Redis Enterprise cluster
+   * Gets information about a RedisEnterprise cluster
    * @param resourceGroupName The name of the resource group. The name is case insensitive.
-   * @param clusterName The name of the Redis Enterprise cluster.
+   * @param clusterName The name of the Redis Enterprise cluster. Name must be 1-60 characters long.
+   *                    Allowed characters(A-Z, a-z, 0-9) and hyphen(-). There can be no leading nor trailing nor
+   *                    consecutive hyphens
    * @param options The options parameters.
    */
   get(
diff --git a/sdk/redisenterprise/arm-redisenterprisecache/src/redisEnterpriseManagementClient.ts b/sdk/redisenterprise/arm-redisenterprisecache/src/redisEnterpriseManagementClient.ts
index 64b0c54be1f5..7def7eb3dd6d 100644
--- a/sdk/redisenterprise/arm-redisenterprisecache/src/redisEnterpriseManagementClient.ts
+++ b/sdk/redisenterprise/arm-redisenterprisecache/src/redisEnterpriseManagementClient.ts
@@ -19,7 +19,6 @@ import {
   OperationsStatusImpl,
   RedisEnterpriseImpl,
   DatabasesImpl,
-  AccessPolicyAssignmentOperationsImpl,
   PrivateEndpointConnectionsImpl,
   PrivateLinkResourcesImpl,
 } from "./operations/index.js";
@@ -28,7 +27,6 @@ import {
   OperationsStatus,
   RedisEnterprise,
   Databases,
-  AccessPolicyAssignmentOperations,
   PrivateEndpointConnections,
   PrivateLinkResources,
 } from "./operationsInterfaces/index.js";
@@ -66,7 +64,7 @@ export class RedisEnterpriseManagementClient extends coreClient.ServiceClient {
       credential: credentials,
     };
 
-    const packageDetails = `azsdk-js-arm-redisenterprisecache/3.1.0-beta.3`;
+    const packageDetails = `azsdk-js-arm-redisenterprisecache/3.1.0`;
     const userAgentPrefix =
       options.userAgentOptions && options.userAgentOptions.userAgentPrefix
         ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
@@ -120,13 +118,11 @@ export class RedisEnterpriseManagementClient extends coreClient.ServiceClient {
 
     // Assigning values to Constant parameters
     this.$host = options.$host || "https://management.azure.com";
-    this.apiVersion = options.apiVersion || "2024-09-01-preview";
+    this.apiVersion = options.apiVersion || "2025-04-01";
     this.operations = new OperationsImpl(this);
     this.operationsStatus = new OperationsStatusImpl(this);
     this.redisEnterprise = new RedisEnterpriseImpl(this);
     this.databases = new DatabasesImpl(this);
-    this.accessPolicyAssignmentOperations =
-      new AccessPolicyAssignmentOperationsImpl(this);
     this.privateEndpointConnections = new PrivateEndpointConnectionsImpl(this);
     this.privateLinkResources = new PrivateLinkResourcesImpl(this);
     this.addCustomApiVersionPolicy(options.apiVersion);
@@ -164,7 +160,6 @@ export class RedisEnterpriseManagementClient extends coreClient.ServiceClient {
   operationsStatus: OperationsStatus;
   redisEnterprise: RedisEnterprise;
   databases: Databases;
-  accessPolicyAssignmentOperations: AccessPolicyAssignmentOperations;
   privateEndpointConnections: PrivateEndpointConnections;
   privateLinkResources: PrivateLinkResources;
 }
diff --git a/sdk/redisenterprise/arm-redisenterprisecache/test/sampleTest.ts b/sdk/redisenterprise/arm-redisenterprisecache/test/sampleTest.ts
new file mode 100644
index 000000000000..a1cf7c25afd2
--- /dev/null
+++ b/sdk/redisenterprise/arm-redisenterprisecache/test/sampleTest.ts
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is regenerated.
+ */
+
+import {
+  Recorder,
+  RecorderStartOptions,
+} from "@azure-tools/test-recorder";
+
+const replaceableVariables: Record<string, string> = {
+  AZURE_CLIENT_ID: "azure_client_id",
+  AZURE_CLIENT_SECRET: "azure_client_secret",
+  AZURE_TENANT_ID: "88888888-8888-8888-8888-888888888888",
+  SUBSCRIPTION_ID: "azure_subscription_id",
+};
+
+const recorderOptions: RecorderStartOptions = {
+  envSetupForPlayback: replaceableVariables,
+};
+
+describe("My test", () => {
+  let recorder: Recorder;
+
+  beforeEach(async (ctx) => {
+      recorder = new Recorder(ctx);
+      await recorder.start(recorderOptions);
+    });
+
+  afterEach(async () => {
+      await recorder.stop();
+    });
+
+  it("sample test", async function () {
+    console.log("Hi, I'm a test!");
+  });
+});
diff --git a/sdk/redisenterprise/arm-redisenterprisecache/test/snippets.spec.ts b/sdk/redisenterprise/arm-redisenterprisecache/test/snippets.spec.ts
index c9f9f3de0d7d..da851cac60a2 100644
--- a/sdk/redisenterprise/arm-redisenterprisecache/test/snippets.spec.ts
+++ b/sdk/redisenterprise/arm-redisenterprisecache/test/snippets.spec.ts
@@ -1,8 +1,19 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is regenerated.
+ */
+
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
 import { RedisEnterpriseManagementClient } from "../src/index.js";
-import { DefaultAzureCredential, InteractiveBrowserCredential } from "@azure/identity";
+import {
+  DefaultAzureCredential,
+  InteractiveBrowserCredential,
+} from "@azure/identity";
 import { setLogLevel } from "@azure/logger";
 import { describe, it } from "vitest";
 
@@ -21,7 +32,10 @@ describe("snippets", () => {
       tenantId: "<YOUR_TENANT_ID>",
       clientId: "<YOUR_CLIENT_ID>",
     });
-    const client = new RedisEnterpriseManagementClient(credential, subscriptionId);
+    const client = new RedisEnterpriseManagementClient(
+      credential,
+      subscriptionId,
+    );
   });
 
   it("SetLogLevel", async () => {
diff --git a/sdk/redisenterprise/arm-redisenterprisecache/tsconfig.json b/sdk/redisenterprise/arm-redisenterprisecache/tsconfig.json
index 19ceb382b521..b35d05ad6e9d 100644
--- a/sdk/redisenterprise/arm-redisenterprisecache/tsconfig.json
+++ b/sdk/redisenterprise/arm-redisenterprisecache/tsconfig.json
@@ -1,13 +1,27 @@
 {
-  "references": [
-    {
-      "path": "./tsconfig.src.json"
-    },
-    {
-      "path": "./tsconfig.samples.json"
-    },
-    {
-      "path": "./tsconfig.test.json"
-    }
+  "compilerOptions": {
+    "module": "es6",
+    "moduleResolution": "node",
+    "strict": true,
+    "target": "es6",
+    "sourceMap": true,
+    "declarationMap": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "forceConsistentCasingInFileNames": true,
+    "lib": [
+      "es6",
+      "dom"
+    ],
+    "declaration": true,
+    "outDir": "./dist-esm",
+    "importHelpers": true
+  },
+  "include": [
+    "src/**/*.ts",
+    "test/**/*.ts"
+  ],
+  "exclude": [
+    "node_modules"
   ]
-}
+}
\ No newline at end of file